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

1877 Commits

Author SHA1 Message Date
Pierre Lalet bd4bf54099 Merge pull request #124 from pebble/pebble-master 
Bluetooth: add EIR / BLE Advertising packet classes
 2016-04-13 14:41:35 +00:00
Martijn Thé db75882594
Bluetooth: add EIR / BLE Advertising packet classes 2016-04-13 16:24:21 +02:00
Pierre Lalet 98d3ff4225 PacketList.conversations(): add labels, support ARP by default (#122) 
* PacketList.conversations(): include ARP packets by default

* PacketList.conversations(): accept a label instead of counting

* PacketList.conversations(): display the label in the graph
 2016-04-13 11:51:24 +02:00
Guillaume Valadon a4285ed01e Merge pull request #120 from p-l-/fix-crypto-import 
Python 2.5: fallback implementation for gcd() without pycrypto
 2016-04-07 13:09:27 +02:00
Pierre LALET b977886d8c Python 2.5: fallback implementation for gcd() without pycrypto 
This was reported by @AmedeoSapio in #68
 2016-04-07 10:27:40 +02:00
Pierre Lalet 73361674b8 Merge pull request #118 from guedou/Issue_#115 
Fix Issue #115
 2016-04-06 10:41:25 +00:00
Guillaume Valadon 66439f18dc Explicitly import the function to remove the circular dependency 2016-04-06 10:31:05 +02:00
Guillaume Valadon 2ec520aa44 Scapy can now use dumbnet 2016-04-05 11:52:49 +00:00
Pierre Lalet 5a5bea6ac0 Merge pull request #113 from guedou/arch_refactoring 
scapy/arch refactoring
 2016-03-31 14:41:25 +00:00
Guillaume Valadon 6d6dba2225 Functions from the unix module can be imported without importing pcapdnet 
Replacing | with or

Useless line break
 2016-03-31 09:04:04 +02:00
Guillaume Valadon 1689f5f162 Merge pull request #108 from p-l-/fix-cksum 
Fix TCP & UDP checksums when IP layer has options
 2016-03-30 19:02:34 +02:00
Pierre Lalet acca0d5289 Merge pull request #112 from guedou/run_tests_binsh 
Don't use /bin/bash in run_tests
 2016-03-30 15:26:34 +00:00
Pierre Lalet acbf4a2388 Merge pull request #114 from guedou/Issue_#110_bis 
Issue #110 fixes
 2016-03-30 15:26:09 +00:00
Guillaume Valadon d073ac32e8 Issue #110 fixes 2016-03-30 15:34:01 +02:00
Guillaume Valadon 0d5cc45176 Don't use /bin/bash 2016-03-30 12:27:32 +02:00
Guillaume Valadon 56d488b4e6 Merge pull request #105 from p-l-/feature-hist-envvar 
Accept SCAPY_HISTFILE env var to set scapy hitory file (fixes #103)
 2016-03-29 10:45:49 +02:00
Guillaume Valadon 737dc84e47 Merge pull request #106 from p-l-/fix-101 
python --version may output to stderr (fixes #101)
 2016-03-29 10:44:34 +02:00
Pierre LALET 7dff6c4fd0 Add regression tests for IP, TCP & UDP checksums 2016-03-28 20:50:30 +02:00
Pierre LALET b5d7f091ef Fix TCP & UDP checksums when IP layer has options 
Reported by Runa Barik on Scapy ML.
 2016-03-28 20:12:51 +02:00
Pierre LALET 37cc56cfa5 python --version may output to stderr (fixes #101) 2016-03-26 12:39:20 +01:00
Pierre LALET ec37cbca28 Accept SCAPY_HISTFILE env var to set scapy hitory file (fixes #103) 2016-03-26 12:22:53 +01:00
Pierre Lalet 66064db6bd Merge pull request #73 from AmedeoSapio/master 
Sniff can accept a list of interfaces (+ fixed bug)
 2016-03-25 13:11:39 +00:00
Amedeo 3dc7c113d1 Fixed count and stop_filter in sniff() (plus minor changes) 2016-03-25 13:58:17 +01:00
Pierre Lalet 0a31dc9fc4 Merge pull request #102 from guedou/arch_common 
Move get_if() to scapy/arch/common.py
 2016-03-25 12:38:08 +00:00
Guillaume Valadon b9613b738a get_if() moved to common.py 2016-03-25 13:19:22 +01:00
Guillaume Valadon 40d37f96bd Merge pull request #91 from p-l-/fix-90 
Pad packet when needed
 2016-03-24 09:33:57 +01:00
Pierre LALET e211d70e1c Tiny code cleanup 2016-03-24 08:17:10 +01:00
Pierre LALET c2ff2ce970 Pad packet when needed (fixes #90) 2016-03-24 08:14:38 +01:00
Guillaume Valadon 7a8d268307 Merge pull request #96 from walintonc/RA_options 
Update IANA Router Alert Options
 2016-03-23 10:42:23 +01:00
Walinton Cambronero f256891447 Update IANA Router Alert Options 
Signed-off-by: Walinton Cambronero <walinton.cambronero@hpe.com>
 2016-03-21 18:02:14 -07:00
Guillaume Valadon 9e063c06ee Merge pull request #89 from p-l-/update-contributing 
Add section about "contributions wanted"
 2016-03-21 14:59:05 -07:00
Amedeo 1d2ebbf111 Fixed bug in bridge_and_sniff 
Sniff() optionally accepts an interface or a list of interfaces

Added "direction" attribute to pkt when received by L2ListenSocket

Patch PEP08'ified

Do not force to print interface

Updated usage.rst with multi-interfaces sniffing

Fixed missing pic in usage.rst

tethereal -> tshark
 2016-03-21 19:34:49 +01:00
Pierre Lalet 60ed0c8d46 Merge pull request #93 from rainmanwy/master 
fix unicode problem for IPField
 2016-03-21 08:13:30 +00:00
Rainmanwy 88705121fe fix unicode problem for IPField 2016-03-21 13:12:59 +08:00
Pierre LALET 94bfc646b6 Add section about "contributions wanted" 2016-03-20 15:04:27 +01:00
Guillaume Valadon 9434f75b67 Merge pull request #85 from p-l-/fix-python2 
Update scripts to call python2 instead of python
 2016-03-16 09:28:38 -07:00
Pierre LALET 6dcd891468 Update scripts to call python2 instead of python when python is not version 2 2016-03-15 23:55:43 +01:00
Guillaume Valadon 602a1b23f7 Merge pull request #86 from p-l-/feature-ls 
Update ls() to display more info about enum fields
 2016-03-15 12:10:15 -07:00
Pierre LALET b74e7fb480 ls(): add missing imports 2016-03-15 10:22:33 +01:00
Pierre LALET fd6960de30 ls(): do not display very large enums in verbose mode 2016-03-15 10:18:47 +01:00
Pierre LALET 0b3dee842b ls(): support FlagsField in verbose mode 2016-03-15 10:17:49 +01:00
Pierre LALET a425022b9f Update ls() to display more info about enum fields 2016-03-15 09:42:14 +01:00
Pierre Lalet 7a546611c3 Merge pull request #82 from vorotnikovdk/getlayer_with_strings 
Packet.getlayer() method can work with string layer name
 2016-03-14 09:50:13 +00:00
Pierre Lalet 199d839bcf Merge pull request #76 from H1ghl4nd3r/UTO 
add TCP User Timeout Option (RFC 5482)
 2016-03-13 20:57:01 +00:00
Dmitriy Vorotnikov 8f7ab5d636 Packet.getlayer() method can work with string layer name 2016-03-14 02:37:59 +06:00
Jeffrey Bencteux 3e53fe5da3 add TCP User Timout Option (RFC 5482) 
Allow one to send the TCP User Timeout Option described in RFC 5482 in
a crafted TCP segment.
Also added unit tests in new "TCP options" section of
test/regression.uts
 2016-03-13 20:08:02 +01:00
Pierre Lalet 77a5997002 Merge pull request #75 from vorotnikovdk/issue74 
Allow L2pcapListenSocket to return None if where is no packets (issue #74)
 2016-03-11 09:32:20 +00:00
Guillaume Valadon c76ea101a1 Merge pull request #77 from p-l-/feature-write-fdesc 
Allow the use of file-like objects with wrpcap() (and (Raw)PcapWriter())
 2016-03-10 13:16:00 +01:00
Guillaume Valadon 358d1ca2f1 Merge pull request #80 from p-l-/fix-79 
IKEv2: fix fields overload (fixes #79)
 2016-03-10 13:15:49 +01:00
Pierre LALET 5497e4cd4e wrpcap() / (Raw)PcapWriter: update docstrings 2016-03-10 11:24:30 +01:00