Rooba
/
scapy
mirror of https://github.com/secdev/scapy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sendrecv: code clean-up

This commit is contained in:
Pierre LALET 2018-01-12 08:18:46 +01:00
parent c294d4f0a3
commit 5738bb4cbd
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scapy/sendrecv.py
View File

@ -25,9 +25,8 @@ from scapy import plist
from scapy.error import log_runtime, log_interactive from scapy.error import log_runtime, log_interactive
from scapy.base_classes import SetGen from scapy.base_classes import SetGen
from scapy.supersocket import StreamSocket, L3RawSocket, L2ListenTcpdump from scapy.supersocket import StreamSocket, L3RawSocket, L2ListenTcpdump
import scapy.modules.six as six from scapy.modules import six
from scapy.modules.six.moves import map from scapy.modules.six.moves import map
from scapy.modules.six import iteritems
if conf.route is None: if conf.route is None:
# unused import, only to initialize conf.route # unused import, only to initialize conf.route
import scapy.route import scapy.route
@ -337,7 +336,7 @@ def sendpfast(x, pps=None, mbps=None, realtime=None, loop=0, file_cache=False, i
subprocess.check_call(argv) subprocess.check_call(argv)
except KeyboardInterrupt: except KeyboardInterrupt:
log_interactive.info("Interrupted by user") log_interactive.info("Interrupted by user")
except Exception as e: except Exception:
if conf.interactive: if conf.interactive:
log_interactive.error("Cannot execute [%s]", argv[0], exc_info=True) log_interactive.error("Cannot execute [%s]", argv[0], exc_info=True)
else: else:
@ -501,8 +500,6 @@ def sndrcvflood(pks, pkt, inter=0, verbose=None, chainCC=False, prn=lambda x: x)
if not isinstance(pkt, Gen): if not isinstance(pkt, Gen):
pkt = SetGen(pkt) pkt = SetGen(pkt)
tobesent = [p for p in pkt] tobesent = [p for p in pkt]
received = plist.SndRcvList()
seen = {}
stopevent = threading.Event() stopevent = threading.Event()
count_packets = six.moves.queue.Queue() count_packets = six.moves.queue.Queue()
@ -673,7 +670,7 @@ Examples:
for i, s in enumerate(opened_socket)) for i, s in enumerate(opened_socket))
elif isinstance(opened_socket, dict): elif isinstance(opened_socket, dict):
sniff_sockets.update((s, label) sniff_sockets.update((s, label)
for s, label in iteritems(opened_socket)) for s, label in six.iteritems(opened_socket))
else: else:
sniff_sockets[opened_socket] = "socket0" sniff_sockets[opened_socket] = "socket0"
if offline is not None: if offline is not None:
@ -687,7 +684,7 @@ Examples:
sniff_sockets.update((PcapReader( sniff_sockets.update((PcapReader(
fname if flt is None else fname if flt is None else
tcpdump(fname, args=["-w", "-", flt], getfd=True) tcpdump(fname, args=["-w", "-", flt], getfd=True)
), label) for fname, label in iteritems(offline)) ), label) for fname, label in six.iteritems(offline))
else: else:
sniff_sockets[PcapReader( sniff_sockets[PcapReader(
offline if flt is None else offline if flt is None else
@ -704,7 +701,7 @@ Examples:
elif isinstance(iface, dict): elif isinstance(iface, dict):
sniff_sockets.update( sniff_sockets.update(
(L2socket(type=ETH_P_ALL, iface=ifname, *arg, **karg), iflabel) (L2socket(type=ETH_P_ALL, iface=ifname, *arg, **karg), iflabel)
for ifname, iflabel in iteritems(iface) for ifname, iflabel in six.iteritems(iface)
) )
else: else:
sniff_sockets[L2socket(type=ETH_P_ALL, iface=iface, sniff_sockets[L2socket(type=ETH_P_ALL, iface=iface,