diff options
| author |   Yaroslav Brustinov <ybrustin@cisco.com> | 2016-06-05 10:44:40 +0300 |
|---|---|---|
| committer | Yaroslav Brustinov <ybrustin@cisco.com> | 2016-06-05 10:44:40 +0300 |
| commit | 6d5144308445cb02373056668e3df5d962dc424c (patch) | |
| tree | 41be395e6a06a0cb1cfe1fce070c536c0687d8de /scripts/external_libs | |
| parent | e0ca7a226fd37023ff8a9d80e46403a34492c1d7 (diff) | |
| parent | 0400a9503137f9179eb92f15d4e3b985ffad562e (diff) | |
Merge branch 'master' into cpu_per_core
Diffstat (limited to 'scripts/external_libs')
| -rw-r--r-- | scripts/external_libs/scapy-2.3.1/python2/scapy/arch/linux.py | 15 | ||||
| -rw-r--r-- | scripts/external_libs/scapy-2.3.1/python3/scapy/arch/linux.py | 15 |
2 files changed, 16 insertions, 14 deletions
diff --git a/scripts/external_libs/scapy-2.3.1/python2/scapy/arch/linux.py b/scripts/external_libs/scapy-2.3.1/python2/scapy/arch/linux.py index 32f0a2d1..729ab3fd 100644 --- a/scripts/external_libs/scapy-2.3.1/python2/scapy/arch/linux.py +++ b/scripts/external_libs/scapy-2.3.1/python2/scapy/arch/linux.py @@ -69,13 +69,14 @@ RTF_REJECT = 0x0200 LOOPBACK_NAME="lo" -with os.popen("tcpdump -V 2> /dev/null") as _f: - if _f.close() >> 8 == 0x7f: - log_loading.warning("Failed to execute tcpdump. Check it is installed and in the PATH") - TCPDUMP=0 - else: - TCPDUMP=1 -del(_f) +#with os.popen("tcpdump -V 2> /dev/null") as _f: +# if _f.close() >> 8 == 0x7f: +# log_loading.warning("Failed to execute tcpdump. Check it is installed and in the PATH") +# TCPDUMP=0 +# else: +# TCPDUMP=1 +#del(_f) +TCPDUMP=0 def get_if_raw_hwaddr(iff): diff --git a/scripts/external_libs/scapy-2.3.1/python3/scapy/arch/linux.py b/scripts/external_libs/scapy-2.3.1/python3/scapy/arch/linux.py index 3eab16c6..40ff9e35 100644 --- a/scripts/external_libs/scapy-2.3.1/python3/scapy/arch/linux.py +++ b/scripts/external_libs/scapy-2.3.1/python3/scapy/arch/linux.py @@ -71,13 +71,14 @@ PCAP_ERRBUF_SIZE=256 LOOPBACK_NAME="lo" -with os.popen("tcpdump -V 2> /dev/null") as _f: - if _f.close() >> 8 == 0x7f: - log_loading.warning("Failed to execute tcpdump. Check it is installed and in the PATH") - TCPDUMP=0 - else: - TCPDUMP=1 -del(_f) +#with os.popen("tcpdump -V 2> /dev/null") as _f: +# if _f.close() >> 8 == 0x7f: +# log_loading.warning("Failed to execute tcpdump. Check it is installed and in the PATH") +# TCPDUMP=0 +# else: +# TCPDUMP=1 +#del(_f) +TCPDUMP=0 def get_if_raw_hwaddr(iff): |