Fix various memory leaks when receiving packets #1847
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -79,8 +79,14 @@ def _sndrcv_snd(pks, timeout, inter, verbose, tobesent, hsent, timessent, stopev | |
| except Exception: | ||
| log_runtime.exception("--- Error sending packets") | ||
| if timeout is not None: | ||
| def _timeout(stopevent): | ||
| stopevent.wait(timeout) | ||
| stopevent.set() | ||
| thread = threading.Thread( | ||
| target=_timeout, args=(stopevent,) | ||
| ) | ||
| thread.setDaemon(True) | ||
| thread.start() | ||
|
|
||
|
|
||
| def _sndrcv_rcv(pks, hsent, stopevent, nbrecv, notans, verbose, chainCC, | ||
|
|
@@ -142,33 +148,38 @@ def _get_pkt(): | |
| return (hsent, ans, nbrecv, notans) | ||
|
|
||
|
|
||
| _DOC_SNDRCV_PARAMS = """ | ||
| pks: SuperSocket instance to send/receive packets | ||
| pkt: the packet to send | ||
| rcv_pks: if set, will be used instead of pks to receive packets. | ||
| packets will still be sent through pks | ||
| nofilter: put 1 to avoid use of BPF filters | ||
| retry: if positive, how many times to resend unanswered packets | ||
| if negative, how many times to retry when no more packets | ||
| are answered | ||
| timeout: how much time to wait after the last packet has been sent | ||
| verbose: set verbosity level | ||
| multi: whether to accept multiple answers for the same stimulus | ||
| store_unanswered: whether to store not-answered packets or not. | ||
| setting it to False will increase speed, and will return | ||
| None as the unans list. | ||
| process: if specified, only result from process(pkt) will be stored. | ||
| the function should follow the following format: | ||
| lambda sent, received: (func(sent), func2(received)) | ||
| if the packet is unanswered, `received` will be None. | ||
| if `store_unanswered` is False, the function won't be called on | ||
| un-answered packets. | ||
| prebuild: pre-build the packets before starting to send them. Automatically | ||
| enabled when a generator is passed as the packet | ||
| """ | ||
|
|
||
|
|
||
| def sndrcv(pks, pkt, timeout=None, inter=0, verbose=None, chainCC=False, | ||
| retry=0, multi=False, rcv_pks=None, store_unanswered=True, | ||
| process=None, prebuild=False): | ||
| """Scapy raw function to send a packet and receive its answer. | ||
| WARNING: This is an internal function. Using sr/srp/sr1/srp is | ||
| more appropriate in many cases. | ||
| """ | ||
| if verbose is None: | ||
| verbose = conf.verb | ||
|
|
@@ -204,18 +215,13 @@ def sndrcv(pks, pkt, timeout=None, inter=0, verbose=None, chainCC=False, | |
| hsent = {} | ||
| timessent = {} if listable else None | ||
|
|
||
| _sndrcv_snd(pks, timeout, inter, verbose, | ||
| tobesent, hsent, timessent, stopevent) | ||
|
|
||
| hsent, newans, nbrecv, notans = _sndrcv_rcv( | ||
| (rcv_pks or pks), hsent, stopevent, nbrecv, notans, verbose, | ||
| chainCC, multi, _storage_policy=_storage_policy, | ||
| ) | ||
|
|
||
| ans.extend(newans) | ||
|
|
||
|
|
@@ -457,49 +463,19 @@ def _parse_tcpreplay_result(stdout, stderr, argv): | |
|
|
||
| @conf.commands.register | ||
| def sr(x, promisc=None, filter=None, iface=None, nofilter=0, *args, **kargs): | ||
| """Send and receive packets at layer 3""" | ||
| s = conf.L3socket(promisc=promisc, filter=filter, | ||
| iface=iface, nofilter=nofilter) | ||
| result = sndrcv(s, x, *args, **kargs) | ||
| s.close() | ||
| return result | ||
|
|
||
|
|
||
| @conf.commands.register | ||
| def sr1(x, promisc=None, filter=None, iface=None, nofilter=0, *args, **kargs): | ||
| """Send packets at layer 3 and return only the first answer""" | ||
| s = conf.L3socket(promisc=promisc, filter=filter, | ||
| nofilter=nofilter, iface=iface) | ||
| ans, _ = sndrcv(s, x, *args, **kargs) | ||
| s.close() | ||
| if len(ans) > 0: | ||
|
|
@@ -509,61 +485,40 @@ def sr1(x, promisc=None, filter=None, iface=None, nofilter=0, *args, **kargs): | |
|
|
||
|
|
||
| @conf.commands.register | ||
| def srp(x, promisc=None, iface=None, iface_hint=None, filter=None, | ||
| nofilter=0, type=ETH_P_ALL, *args, **kargs): | ||
| """Send and receive packets at layer 2""" | ||
| if iface is None and iface_hint is not None: | ||
| iface = conf.route.route(iface_hint)[0] | ||
| s = conf.L2socket(promisc=promisc, iface=iface, | ||
| filter=filter, nofilter=nofilter, type=type) | ||
| result = sndrcv(s, x, *args, **kargs) | ||
| s.close() | ||
| return result | ||
|
|
||
|
|
||
| @conf.commands.register | ||
| def srp1(*args, **kargs): | ||
| """Send and receive packets at layer 2 and return only the first answer""" | ||
| ans, _ = srp(*args, **kargs) | ||
| if len(ans) > 0: | ||
| return ans[0][1] | ||
| else: | ||
| return None | ||
|
|
||
|
|
||
guedou marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| # Append doc | ||
| for sr_func in [srp, srp1, sr, sr1]: | ||
| sr_func.__doc__ += _DOC_SNDRCV_PARAMS | ||
|
|
||
|
|
||
| # SEND/RECV LOOP METHODS | ||
|
|
||
|
|
||
| def __sr_loop(srfunc, pkts, prn=lambda x: x[1].summary(), | ||
| prnfail=lambda x: x.summary(), | ||
| inter=1, timeout=None, count=None, verbose=None, store=1, | ||
| *args, **kargs): | ||
| n = 0 | ||
| r = 0 | ||
| ct = conf.color_theme | ||
|
|
@@ -632,7 +587,8 @@ def srploop(pkts, *args, **kargs): | |
| # SEND/RECV FLOOD METHODS | ||
|
|
||
|
|
||
| def sndrcvflood(pks, pkt, inter=0, verbose=None, chainCC=False, | ||
| store_unanswered=True, process=None, timeout=None): | ||
| if not verbose: | ||
| verbose = conf.verb | ||
| listable = (isinstance(pkt, Packet) and pkt.__iterlen__() == 1) or isinstance(pkt, list) # noqa: E501 | ||
|
|
@@ -674,7 +630,8 @@ def _timeout(timeout): | |
| # We don't use _sndrcv_snd verbose (it messes the logs up as in a thread that ends after receiving) # noqa: E501 | ||
| thread = threading.Thread( | ||
| target=_sndrcv_snd, | ||
| args=(pks, None, inter, False, | ||
| infinite_gen, hsent, timessent, stopevent) | ||
| ) | ||
| thread.setDaemon(True) | ||
| thread.start() | ||
|
|
@@ -893,7 +850,8 @@ def sniff(count=0, store=True, offline=None, prn=None, lfilter=None, | |
| try: | ||
| if started_callback: | ||
| started_callback() | ||
| continue_sniff = True | ||
|
There was a problem hiding this comment. Is that the only relevant fix? =) There was a problem hiding this comment. That’s for #1918 There’s a lot of unrelevant cleaning happening 😄 sorry for the messy PRs |
||
| while sniff_sockets and continue_sniff: | ||
| if timeout is not None: | ||
| remain = stoptime - time.time() | ||
| if remain <= 0: | ||
|
|
@@ -923,10 +881,10 @@ def sniff(count=0, store=True, offline=None, prn=None, lfilter=None, | |
| # on_packet_received handles the prn/storage | ||
| session.on_packet_received(p) | ||
| if stop_filter and stop_filter(p): | ||
| continue_sniff = False | ||
| break | ||
| if 0 < count <= c: | ||
| continue_sniff = False | ||
| break | ||
| except KeyboardInterrupt: | ||
| pass | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # This file is part of Scapy | ||
| # See http://www.secdev.org/projects/scapy for more information | ||
| # Copyright (C) Guillaume Valadon | ||
| # This program is published under a GPLv2 license | ||
|
|
||
| import os | ||
| import sys | ||
|
|
||
| scapy_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..")) | ||
| sys.path.append(scapy_path) | ||
|
|
||
| from scapy.all import * | ||
|
|
||
| print("Scapy %s - Benchmarks" % VERSION) | ||
| print("Python %s" % sys.version.replace("\n", "")) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # This file is part of Scapy | ||
| # See http://www.secdev.org/projects/scapy for more information | ||
| # Copyright (C) Gabriel Potter | ||
| # This program is published under a GPLv2 license | ||
|
|
||
|
|
||
| # https://github.com/secdev/scapy/issues/1791 | ||
|
|
||
| from common import * | ||
|
|
||
| # Router IP | ||
| dest = conf.route.route("0.0.0.0")[2] | ||
|
|
||
| send_tcp = False | ||
| send_icmp = True | ||
|
|
||
| pkts = [] | ||
| for i in range(1,50): | ||
| a = IP(dst=dest) / TCP(flags="S", seq=i, sport=65000, dport=55556) | ||
| b = IP(dst=dest)/ICMP() | ||
| if send_tcp: | ||
| pkts.append(a) | ||
| if send_icmp: | ||
| pkts.append(b) | ||
|
|
||
| ans, unans = sr(pkts, filter="host {0}".format(dest), inter=0, timeout=1, prebuild=True, store_unanswered=False) | ||
|
|
||
| print("scapy version: {}".format(conf.version)) | ||
|
|
||
| for pkt in ans: | ||
| sent = pkt[0] | ||
| received = pkt[1] | ||
| res = (received.time - sent.sent_time) | ||
| print("%s %s : %s" % (received.time, sent.sent_time, res)) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That was fixed