Rooba
/
scapy
mirror of https://github.com/secdev/scapy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,325 Commits 5 Branches 533 Tags 138 MiB
Commit Graph

3325 Commits

Author SHA1 Message Date
Guillaume Valadon 3f6e47df9e
Merge pull request #1271 from karpierz/PacketMetadata_as_inner_class 
PacketMetadata is now an inner class of RawPcapReader, RawPcapNgReader
 2018-03-21 10:38:06 +01:00
Adam Karpierz 7c960dab03 PacketMetadata is now an inner class of RawPcapReader, RawPcapNgReader 2018-03-21 03:45:36 +01:00
Guillaume Valadon aa2f10e27d
Merge pull request #1268 from guedou/Issue_#1263 
Ack Policy field renamed
 2018-03-20 14:39:10 +01:00
Guillaume Valadon f7e675d3ba Ack Policy field renamed 2018-03-20 14:05:25 +01:00
Guillaume Valadon f89055dac1
Merge pull request #1236 from karpierz/fix_file_handle_inheritance_for_py27 
Fix handle inheritance for Python2 (more appropriate and safe version of #1138 hack, fixes #1136)
 2018-03-18 21:49:43 +01:00
Guillaume Valadon 84b9718651
Merge pull request #1231 from gpotter2/lldp-length 
LLDP: support complex ID types
 2018-03-18 20:50:38 +01:00
Pierre Lalet bd60cd147b
Merge pull request #1255 from p-l-/fix-progs-pdfps 
Use xdg-open (Linux / *BSD) or open (MacOS) to open PDF & PS files by default
 2018-03-18 20:20:40 +01:00
Guillaume Valadon f05c8ba395
Merge pull request #1261 from gpotter2/hunterbuster 
Fix IPv6 multicast address record
 2018-03-18 18:42:20 +01:00
gpotter2 774fb290a0 Fix IPv6 multicast address record 2018-03-17 16:43:29 +01:00
gpotter2 3935d91f73 LLDP: support complex ID types 2018-03-17 13:41:01 +01:00
Pierre Lalet 2c5bf915ee
Merge pull request #1257 from guedou/disable_snmpwalk_test 
snmpwalk() tests commented
 2018-03-16 17:44:39 +01:00
Guillaume Valadon d08be3be18 snmpwalk() tests commented 2018-03-16 17:23:29 +01:00
Pierre LALET 04584eaa33 Use xdg-open (or open for MacOS) to open PDF & PS files by default 2018-03-16 08:18:12 +01:00
Pierre LALET 4f7b6e5f36 Fix regression introduced in 4ac969c8a8 2018-03-16 08:17:06 +01:00
Pierre LALET 8d8aa2e95d Fix a wildcard import 2018-03-16 08:15:56 +01:00
Guillaume Valadon bef68d1e45
Merge pull request #1238 from karpierz/fix_a_bug_in_snmpwalk 
Scapy 2.4.0: fix a bug in 'snmpwalk()'
 2018-03-15 16:32:48 +01:00
Guillaume Valadon 2c9361b56b
Merge pull request #1244 from guedou/dojo_in6_addrtovendor 
Don't crash on empty manufdb
 2018-03-15 16:30:29 +01:00
Guillaume Valadon 17be1dd789
Merge pull request #1215 from guedou/osx_802.11_monitor 
801.11 monitor mode for OSX
 2018-03-15 16:24:42 +01:00
Adam Karpierz aa4ef5707d fix a bug in snmpwalk() 2018-03-14 23:49:50 +01:00
Guillaume Valadon d08d9db212 Don't crash on empty manufdb 2018-03-14 15:37:16 +01:00
Pierre Lalet 89a077139b
Merge pull request #1088 from gpotter2/ipv6-fixes 
SEND module fixes & Stuff
 2018-03-11 14:34:48 +01:00
Pierre Lalet 1350ca2d69
Merge pull request #1212 from guedou/plist_ipv6 
PacketList: sessions() and conversations() IPv6 support
 2018-03-11 14:20:42 +01:00
Guillaume Valadon c2acc60e98
Merge pull request #1213 from bluhm/route-locked 
Handle OpenBSD routes with locked MTU.
 2018-03-10 16:53:14 +01:00
Adam Karpierz 00f66f1808 Fix handle inheritance for Python2 (more appropriate and safe version of #1138 hack, fixes #1136) 
Fix an error of '_windows_title()' for Py2
 2018-03-10 16:43:14 +01:00
Alexander Bluhm 438f4cee70 Add regression test for OpenBSD routing table 
Parse an OpenBSD 6.3 routing table that contains a locked MTU value.
Test that the parser in read_routes() recognizes this netstart -r
output line correctly.
 2018-03-10 01:21:41 +01:00
Alexander Bluhm bd10cf56c4 Handle OpenBSD routes with locked MTU. 
In OpenBSD the MTU value of a route may be locked.  This is indicated
by an ' L' in the netstat -r output.  For scapy's read_routes()
this looks like an additional column.  Make the parser aware of
this possibility when finding the network interface.
 2018-03-10 01:21:41 +01:00
Guillaume Valadon 71c23dafef
Merge pull request #1204 from gpotter2/bind-udp 
Additional Loopback bind + LLMNR bind + SNMP bind
 2018-03-09 21:37:09 +01:00
Gabriel Potter 55d712088d Support terminal title (#1193) 
* Support terminal title

* Docstring
 2018-03-09 20:58:29 +01:00
hecke 71ac3578f3 Fix lldp org specific dissection clean #1151 (#1154) 
* add a 3 byte enum field #1151

required to show the names of the
organizations used in LLDP org specific TLVs

* add generic organization specific LLDP type #1151

implements generic encoding of org specific TLVs and
dumps the payload as hex-string

* sanitize guess_payload for LLDPDUs #1151

* cleanup guess_payload_class() #1151

* keep ThreeBytesEnumField local in lldp  #1151

as it is not used yet anywhere else.

* use raw layer given by conf #1151

* remove unused imports #1151
 2018-03-09 20:52:37 +01:00
Guillaume Valadon 865300daa0
Merge pull request #1226 from karpierz/little_but_obvious_code_improvements 
Scapy 2.4.0: Little but obvious code improvements
 2018-03-09 15:28:36 +01:00
Guillaume Valadon e467c73c03
Merge pull request #1220 from gpotter2/doc-remaster 
Doc fixes & sphinx update
 2018-03-09 14:48:39 +01:00
Guillaume Valadon 32e122b224
Merge pull request #1225 from karpierz/fix_haslayer_bug 
Allow non-matching string arguments in haslayer methods (covers #1223, #1186 and other/all layers).
 2018-03-09 14:23:05 +01:00
Adam Karpierz f8f1d762f3 fix haslayer() bug(s) 2018-03-09 13:01:29 +01:00
Adam Karpierz c49a6d7ef5 Little but obvious code improvements 2018-03-09 12:46:53 +01:00
gpotter2 d5a50015d5 Doc fixes & sphinx update 2018-03-08 19:10:14 +01:00
Neurocinetics 617920fddb Fixed a TypeError that triggered when reading a pcap file containing a NTP packet. (#1186) 
* Fixed an error (TypeError) that triggered when reading a pcap file that
contained ntp packets. The type of variable "cls" was string not a class
type (invalid argument for method: issubclass()). By importing the type
'TCP' from 'scapy.layers.inet' and by converting cls to a classtype by
reading the key from globals, the TypeError is mitigated.

* Added test to provide insight into the cls variable inconsistencies.
Fixed a small mistake

* d0a2544ae1

* Moved tests.

* fix backward incompatibility of scapy.utils.RawPcapReader.read_packet() for scapy's v2.4 againts v2.3.2 & v2.3.3
named tuple instead of tuple as result of RawPcap[Ng]Reader.read_block_???()/read_packet():

* Fixed an error (TypeError) that triggered when calling sessions() on a PacketList that
contained ntp packets. The type of variable "cls" was a string not a class
type (invalid argument for method: issubclass()).

* Added test to provide insight into the cls variable inconsistencies.
Fixed a small mistake

* d0a2544ae1

* Forgot to delete ntp.uts during rebase...
 2018-03-08 12:44:44 +01:00
Guillaume Valadon 5d9eecd568 801.11 monitor mode for OSX 2018-03-08 08:49:45 +01:00
Guillaume Valadon f61f98f807
Merge pull request #1216 from bluhm/sh-source 
Use . instead of source shell command.
 2018-03-08 08:40:45 +01:00
Guillaume Valadon 14faefb167
Merge pull request #1222 from gpotter2/hotfix1 
Fix scapy used with Winpcap on Windows
 2018-03-08 08:39:19 +01:00
gpotter2 f872f1be2a Fix scapy used with Winpcap on Windows 2018-03-07 22:54:14 +01:00
Alexander Bluhm 036ffa82e5
Use . instead of source shell command. 
The source keyword is a bash extension that is not recognized by
every bourne shell.  The . command works everywhere.
 2018-03-07 16:50:09 +01:00
Guillaume Valadon 7eebded56d PacketList: sessions() and conversations() IPv6 support 2018-03-07 11:55:17 +01:00
Guillaume Valadon faeeef0026
Merge pull request #1198 from karpierz/fix_bug_in_open_pcap_on_windows 
Fix a backward compatibility bug in open_pcap (on Windows)
 2018-03-06 22:03:57 +01:00
gpotter2 20a7d50020 Loopback binds + LLMNR bind + SNMP bind 2018-03-05 19:47:03 +01:00
Guillaume Valadon b5b88278e5
Merge pull request #1207 from guedou/travis_ox_py36 
[Travis] Python 3.6 osx builds are broken
 2018-03-05 14:16:22 +01:00
Guillaume Valadon 09098050d4 travis/osx - Python3 and tox installations fixed 2018-03-05 13:39:42 +01:00
Adam Karpierz f2f243c77f Fix a backward compatibility bug in open_pcap (on Windows) 
Now scapy 2.4.x correctly works also if iface is of a different
type than NetworkInterface (e.g. string).
 2018-03-05 01:09:33 +01:00
Guillaume Valadon 6d5c078b8e
Merge pull request #1203 from gpotter2/tests-cert 
[coverage] Various tests (tls, openflow)
 2018-03-04 20:56:10 +01:00
gpotter2 d80bb3dc80 More Openflow tests 2018-03-03 15:24:05 +01:00
gpotter2 2b29648592 OpenflowV3 tests 2018-03-03 09:21:41 +01:00