On Fri, 22 Jan 2016 14:44:48 +0000, Stuart Henderson <st...@openbsd.org> wrote:
> There's this code in lib/scapy/arch/unix.py:in6_getifaddr which > calls "ifconfig -l" which is expecting to see a list of interfaces: > > # List all network interfaces > try: > f = os.popen("%s -l" % conf.prog.ifconfig) > except OSError,msg: > log_interactive.warning("Failed to execute ifconfig.") > return [] Indeed, thanks for spotting that. I fixed the problem (and it's merged upstream). > and it looks like it's also not parsing the "netstat -rn -f inet6" > output correctly in the function below that one. Could you take > a look please Daniel? I looked at it and did some print debugging but AFAIU the code but it seems ok, so I don't know? With this updated diff, I removed what was in the patch patches/patch-scapy_arch_unix_py because what it does is looking for "L" in the Prio column in `netstat -rn -finet` but a L shouldn't be there. I also backported a diff from upstream to fix make test. Now make test doesn't need to be killed. Without root it's PASSED=760 FAILED=7 and with root it's even PASSED=767 FAILED=0 \o/ Cheers, Daniel Index: Makefile =================================================================== RCS file: /cvs/ports/net/scapy/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- Makefile 16 Feb 2015 22:57:11 -0000 1.20 +++ Makefile 24 Jan 2016 15:02:18 -0000 @@ -2,9 +2,12 @@ COMMENT= powerful interactive packet manipulation in python -MODPY_EGG_VERSION= 2.1.0 +MODPY_EGG_VERSION= 2.3.2 DISTNAME= scapy-${MODPY_EGG_VERSION} -REVISION= 2 + +GH_ACCOUNT= secdev +GH_PROJECT= scapy +GH_TAGNAME= v${MODPY_EGG_VERSION} CATEGORIES= net @@ -15,8 +18,8 @@ MAINTAINER= Jonathan Armani <armani@open # GPLv2 PERMIT_PACKAGE_CDROM= Yes -MASTER_SITES= ${HOMEPAGE}/files/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ethertypes +MASTER_SITES0= https://spacehopper.org/mirrors/ +DISTFILES= ${DISTNAME}.tar.gz ethertypes-20120703:0 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MODULES= lang/python @@ -32,12 +35,12 @@ post-extract: gunzip ${WRKSRC}/doc/scapy.1.gz pre-configure: - perl -p -i -e "s,/etc/ethertypes,${SYSCONFDIR}/ethertypes,g" \ + sed -i "s,/etc/ethertypes,${SYSCONFDIR}/ethertypes,g" \ ${WRKSRC}/scapy/data.py post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/scapy - ${INSTALL_DATA} ${DISTDIR}/ethertypes ${PREFIX}/share/examples/scapy + ${INSTALL_DATA} ${DISTDIR}/ethertypes-20120703 ${PREFIX}/share/examples/scapy/ethertypes # some tests require root. do-test: Index: distinfo =================================================================== RCS file: /cvs/ports/net/scapy/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 18 Jan 2015 03:14:52 -0000 1.6 +++ distinfo 24 Jan 2016 15:02:18 -0000 @@ -1,4 +1,4 @@ -SHA256 (ethertypes) = 4UAHHkYt+Kq597Y6OWW/IGeX7Lz/M0o+xJQlbe/jXcs= -SHA256 (scapy-2.1.0.tar.gz) = Q8ojOwz8lQQBGT4nAuoy7h3YPUurZxNx4yKntsUidbo= -SIZE (ethertypes) = 1317 -SIZE (scapy-2.1.0.tar.gz) = 956785 +SHA256 (ethertypes-20120703) = 7Tj51kS+/IfrQahknDEAcyQNmozXWy+cEVtdnX5dAzw= +SHA256 (scapy-2.3.2.tar.gz) = G4qG1of+uO0BEUwMAWtChnTL/sBOPrb1JJoBjEJ8T2o= +SIZE (ethertypes-20120703) = 1362 +SIZE (scapy-2.3.2.tar.gz) = 1166056 Index: patches/patch-scapy_arch_pcapdnet_py =================================================================== RCS file: patches/patch-scapy_arch_pcapdnet_py diff -N patches/patch-scapy_arch_pcapdnet_py --- patches/patch-scapy_arch_pcapdnet_py 5 Oct 2010 09:18:05 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-scapy_arch_pcapdnet_py,v 1.1 2010/10/05 09:18:05 armani Exp $ ---- scapy/arch/pcapdnet.py.orig Tue Oct 5 10:14:39 2010 -+++ scapy/arch/pcapdnet.py Tue Oct 5 10:16:27 2010 -@@ -63,6 +63,8 @@ if conf.use_pcap: - return ts,pkt - def __getattr__(self, attr): - return getattr(self.pcap, attr) -+ def __del__(self): -+ os.close(self.pcap.fileno()) - open_pcap = lambda *args,**kargs: _PcapWrapper_libpcap(*args,**kargs) - elif hasattr(pcap,"open_live"): # python-pcapy - class _PcapWrapper_pcapy: Index: patches/patch-scapy_arch_unix_py =================================================================== RCS file: /cvs/ports/net/scapy/patches/patch-scapy_arch_unix_py,v retrieving revision 1.1 diff -u -p -r1.1 patch-scapy_arch_unix_py --- patches/patch-scapy_arch_unix_py 1 Oct 2009 16:28:49 -0000 1.1 +++ patches/patch-scapy_arch_unix_py 24 Jan 2016 15:02:18 -0000 @@ -1,15 +1,45 @@ $OpenBSD: patch-scapy_arch_unix_py,v 1.1 2009/10/01 16:28:49 sthen Exp $ ---- scapy/arch/unix.py.orig Tue Sep 29 20:25:02 2009 -+++ scapy/arch/unix.py Tue Sep 29 20:26:50 2009 -@@ -61,7 +61,10 @@ def read_routes(): - else: - rt = l.split() - dest,gw,flg = rt[:3] -- netif = rt[5+mtu_present+prio_present] -+ if 'L' in rt[4+mtu_present+prio_present]: -+ netif = rt[6+mtu_present+prio_present] -+ else: -+ netif = rt[5+mtu_present+prio_present] - if flg.find("Lc") >= 0: - continue - if dest == "default": + +Merged upstream +https://github.com/secdev/scapy/commit/3ecf379e52214aa742d09a15b13694e7d2c6d469 + +--- scapy/arch/unix.py.orig Fri Jan 15 14:10:59 2016 ++++ scapy/arch/unix.py Sun Jan 24 11:03:12 2016 +@@ -155,14 +155,30 @@ def in6_getifaddr(): + """ + + # List all network interfaces +- try: +- f = os.popen("%s -l" % conf.prog.ifconfig) +- except OSError,msg: +- log_interactive.warning("Failed to execute ifconfig.") +- return [] ++ if scapy.arch.OPENBSD: ++ try: ++ f = os.popen("%s" % conf.prog.ifconfig) ++ except OSError,msg: ++ log_interactive.warning("Failed to execute ifconfig.") ++ return [] + +- # Get the list of network interfaces +- splitted_line = f.readline().rstrip().split() ++ # Get the list of network interfaces ++ splitted_line = [] ++ for l in f: ++ if "flags" in l: ++ iface = l.split()[0].rstrip(':') ++ splitted_line.append(iface) ++ ++ else: # FreeBSD, NetBSD or Darwin ++ try: ++ f = os.popen("%s -l" % conf.prog.ifconfig) ++ except OSError,msg: ++ log_interactive.warning("Failed to execute ifconfig.") ++ return [] ++ ++ # Get the list of network interfaces ++ splitted_line = f.readline().rstrip().split() ++ + ret = [] + for i in splitted_line: + ret += _in6_getifaddr(i) Index: patches/patch-scapy_config_py =================================================================== RCS file: /cvs/ports/net/scapy/patches/patch-scapy_config_py,v retrieving revision 1.1 diff -u -p -r1.1 patch-scapy_config_py --- patches/patch-scapy_config_py 12 Jan 2012 03:16:24 -0000 1.1 +++ patches/patch-scapy_config_py 24 Jan 2016 15:02:18 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-scapy_config_py,v 1.1 2012/01/12 03:16:24 bluhm Exp $ ---- scapy/config.py.orig Mon Dec 14 16:31:55 2009 -+++ scapy/config.py Tue Sep 20 23:49:47 2011 -@@ -366,7 +366,7 @@ extensions_paths: path or list of paths where extensio - netcache = NetCache() +--- scapy/config.py.orig Fri Jan 15 14:10:59 2016 ++++ scapy/config.py Thu Jan 21 19:49:16 2016 +@@ -374,7 +374,7 @@ extensions_paths: path or list of paths where extensio load_layers = ["l2", "inet", "dhcp", "dns", "dot11", "gprs", "hsrp", "inet6", "ir", "isakmp", "l2tp", "mgcp", "mobileip", "netbios", "netflow", "ntp", "ppp", "radius", "rip", "rtp", -- "sebek", "skinny", "smb", "snmp", "tftp", "x509", "bluetooth", "dhcp6", "llmnr" ] -+ "sebek", "skinny", "smb", "snmp", "tftp", "x509", "bluetooth", "dhcp6", "llmnr", "loop" ] + "sebek", "skinny", "smb", "snmp", "tftp", "x509", "bluetooth", "dhcp6", "llmnr", "sctp", "vrrp", +- "ipsec" ] ++ "ipsec", "loop" ] if not Conf.ipv6_enabled: Index: patches/patch-scapy_sendrecv_py =================================================================== RCS file: /cvs/ports/net/scapy/patches/patch-scapy_sendrecv_py,v retrieving revision 1.1 diff -u -p -r1.1 patch-scapy_sendrecv_py --- patches/patch-scapy_sendrecv_py 5 Oct 2010 09:18:05 -0000 1.1 +++ patches/patch-scapy_sendrecv_py 24 Jan 2016 15:02:18 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-scapy_sendrecv_py,v 1.1 2010/10/05 09:18:05 armani Exp $ ---- scapy/sendrecv.py.orig Mon Oct 4 07:33:19 2010 -+++ scapy/sendrecv.py Mon Oct 4 07:35:09 2010 -@@ -117,7 +117,7 @@ def sndrcv(pks, pkt, timeout = None, inter = 0, verbos +--- scapy/sendrecv.py.orig Tue Dec 30 21:25:32 2014 ++++ scapy/sendrecv.py Sun Jan 17 20:19:17 2016 +@@ -121,7 +121,7 @@ def sndrcv(pks, pkt, timeout = None, inter = 0, verbos if remaintime <= 0: break r = None Index: patches/patch-setup_py =================================================================== RCS file: /cvs/ports/net/scapy/patches/patch-setup_py,v retrieving revision 1.2 diff -u -p -r1.2 patch-setup_py --- patches/patch-setup_py 5 Oct 2010 09:18:05 -0000 1.2 +++ patches/patch-setup_py 24 Jan 2016 15:02:18 -0000 @@ -1,9 +1,9 @@ $OpenBSD: patch-setup_py,v 1.2 2010/10/05 09:18:05 armani Exp $ ---- setup.py.orig Mon Dec 14 16:31:55 2009 -+++ setup.py Mon Oct 4 07:43:18 2010 -@@ -44,7 +44,7 @@ setup( - version = '2.1.0', - packages=['scapy','scapy/arch', 'scapy/arch/windows', 'scapy/layers','scapy/asn1','scapy/tools','scapy/modules', 'scapy/crypto'], +--- setup.py.orig Fri Jan 15 14:10:59 2016 ++++ setup.py Thu Jan 21 19:49:16 2016 +@@ -49,7 +49,7 @@ setup( + version = '2.3.2', + packages=['scapy','scapy/arch', 'scapy/arch/windows', 'scapy/layers','scapy/asn1','scapy/tools','scapy/modules', 'scapy/crypto', 'scapy/contrib'], scripts = SCRIPTS, - data_files = [('share/man/man1', ["doc/scapy.1.gz"])], + data_files = [('man/man1', ["doc/scapy.1"])], Index: patches/patch-test_regression_uts =================================================================== RCS file: patches/patch-test_regression_uts diff -N patches/patch-test_regression_uts --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-test_regression_uts 24 Jan 2016 15:02:18 -0000 @@ -0,0 +1,123 @@ +$OpenBSD$ + +Backported from upstream +https://github.com/secdev/scapy/commit/ce89fee4ddcf5156b72074aede6a04e58b10dc5e + +--- test/regression.uts.orig Fri Jan 15 14:10:59 2016 ++++ test/regression.uts Sun Jan 24 10:15:57 2016 +@@ -754,12 +754,12 @@ class ATMT1(Automaton): + = Simple automaton Tests + ~ automaton + +-a=ATMT1(init="a") ++a=ATMT1(init="a", ll=lambda: None, recvsock=lambda: None) + a.run() + assert( _ == 'aabaaababaaabaaababab' ) + a.result + assert( _ == 'aabaaababaaabaaababab' ) +-a=ATMT1(init="b") ++a=ATMT1(init="b", ll=lambda: None, recvsock=lambda: None) + a.run() + assert( _ == 'babababababababababababababab' ) + a.result +@@ -769,7 +769,7 @@ assert( _ == 'babababababababababababababab' ) + ~ automaton + + try: +- ATMT1(init="").run() ++ ATMT1(init="", ll=lambda: None, recvsock=lambda: None).run() + except Automaton.Stuck: + True + else: +@@ -783,14 +783,14 @@ class ATMT2(ATMT1): + def MAIN(self, s): + return "c"+ATMT1.MAIN(self, s).run() + +-a=ATMT2(init="a") ++a=ATMT2(init="a", ll=lambda: None, recvsock=lambda: None) + a.run() + assert( _ == 'ccccccacabacccacababacccccacabacccacababab' ) + + + a.result + assert( _ == 'ccccccacabacccacababacccccacabacccacababab' ) +-a=ATMT2(init="b") ++a=ATMT2(init="b", ll=lambda: None, recvsock=lambda: None) + a.run() + assert( _ == 'cccccbaccbabaccccbaccbabab') + a.result +@@ -806,12 +806,12 @@ class ATMT3(ATMT2): + raise self.MAIN(s+"da") + + +-a=ATMT3(init="a", debug=2) ++a=ATMT3(init="a", debug=2, ll=lambda: None, recvsock=lambda: None) + a.run() + assert( _ == 'cccccacabdacccacabdabda') + a.result + assert( _ == 'cccccacabdacccacabdabda') +-a=ATMT3(init="b") ++a=ATMT3(init="b", ll=lambda: None, recvsock=lambda: None) + a.run() + assert( _ == 'cccccbdaccbdabdaccccbdaccbdabdab' ) + +@@ -826,12 +826,12 @@ class ATMT4(ATMT3): + def action_test(self, s): + self.result = "e"+s+"e" + +-a=ATMT4(init="a") ++a=ATMT4(init="a", ll=lambda: None, recvsock=lambda: None) + a.run() + assert( _ == 'cccccacabdacccacabdabda') + a.result + assert( _ == 'ecccccacabdacccacabdabdae') +-a=ATMT4(init="b") ++a=ATMT4(init="b", ll=lambda: None, recvsock=lambda: None) + a.run() + assert( _ == 'cccccbdaccbdabdaccccbdaccbdabdab' ) + a.result +@@ -869,7 +869,7 @@ class ATMT5(Automaton): + def END(self): + return self.res + +-a=ATMT5() ++a=ATMT5(ll=lambda: None, recvsock=lambda: None) + a.run() + assert( _ == 'Jupiter' ) + +@@ -905,7 +905,7 @@ class ATMT6(Automaton): + def END(self): + return self.res + +-a=ATMT6() ++a=ATMT6(ll=lambda: None, recvsock=lambda: None) + a.run() + assert( _ == 'Mercury' ) + +@@ -936,7 +936,7 @@ class ATMT7(Automaton): + self.res += "n" + return self.res + +-a=ATMT7() ++a=ATMT7(ll=lambda: None, recvsock=lambda: None) + a.run(wait=False) + a.io.tst.send("at") + a.io.tst.recv() +@@ -976,7 +976,7 @@ class ATMT8(Automaton): + + r,w = os.pipe() + +-a=ATMT8(external_fd={"extfd":r}) ++a=ATMT8(external_fd={"extfd":r}, ll=lambda: None, recvsock=lambda: None) + a.run(wait=False) + os.write(w,"ra") + os.write(w,"nu") +@@ -1008,7 +1008,7 @@ class ATMT9(Automaton): + self.res += "s" + return self.res + +-a=ATMT9(debug=5) ++a=ATMT9(debug=5, ll=lambda: None, recvsock=lambda: None) + a.run() + assert( _ == "VENUs" ) + Index: patches/patch-test_run_tests =================================================================== RCS file: patches/patch-test_run_tests diff -N patches/patch-test_run_tests --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-test_run_tests 24 Jan 2016 15:02:18 -0000 @@ -0,0 +1,9 @@ +$OpenBSD$ +--- test/run_tests.orig Tue Jan 19 19:27:57 2016 ++++ test/run_tests Tue Jan 19 19:30:18 2016 +@@ -1,4 +1,4 @@ +-#! /bin/bash ++#! /bin/sh + DIR=$(dirname $0)/.. + if [ "$*" == "" ] + then Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/scapy/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 12 Jan 2012 03:16:24 -0000 1.4 +++ pkg/PLIST 24 Jan 2016 15:02:18 -0000 @@ -50,6 +50,77 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/scapy/base_classes.pyc lib/python${MODPY_VERSION}/site-packages/scapy/config.py lib/python${MODPY_VERSION}/site-packages/scapy/config.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/ +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/HomePlugAV.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/HomePlugAV.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/__init__.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/avs.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/avs.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/bgp.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/bgp.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/carp.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/carp.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/cdp.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/cdp.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/chdlc.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/chdlc.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/dtp.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/dtp.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/eigrp.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/eigrp.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/etherip.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/etherip.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/gsm_um.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/gsm_um.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/gtp.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/gtp.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/icmp_extensions.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/icmp_extensions.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/igmp.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/igmp.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/igmpv3.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/igmpv3.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/ikev2.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/ikev2.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/isis.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/isis.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/ldp.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/ldp.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/mpls.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/mpls.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/openflow.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/openflow.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/openflow3.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/openflow3.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/ospf.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/ospf.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/ppi.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/ppi.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/ppi_cace.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/ppi_cace.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/ppi_geotag.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/ppi_geotag.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/ripng.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/ripng.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/rsvp.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/rsvp.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/send.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/send.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/skinny.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/skinny.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/spbm.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/spbm.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/ubberlogger.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/ubberlogger.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/vqp.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/vqp.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/vtp.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/vtp.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/vxlan.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/vxlan.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/wpa_eapol.py +lib/python${MODPY_VERSION}/site-packages/scapy/contrib/wpa_eapol.pyc lib/python${MODPY_VERSION}/site-packages/scapy/crypto/ lib/python${MODPY_VERSION}/site-packages/scapy/crypto/__init__.py lib/python${MODPY_VERSION}/site-packages/scapy/crypto/__init__.pyc @@ -70,6 +141,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/scapy/layers/all.pyc lib/python${MODPY_VERSION}/site-packages/scapy/layers/bluetooth.py lib/python${MODPY_VERSION}/site-packages/scapy/layers/bluetooth.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/layers/clns.py +lib/python${MODPY_VERSION}/site-packages/scapy/layers/clns.pyc lib/python${MODPY_VERSION}/site-packages/scapy/layers/dhcp.py lib/python${MODPY_VERSION}/site-packages/scapy/layers/dhcp.pyc lib/python${MODPY_VERSION}/site-packages/scapy/layers/dhcp6.py @@ -86,6 +159,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/scapy/layers/inet.pyc lib/python${MODPY_VERSION}/site-packages/scapy/layers/inet6.py lib/python${MODPY_VERSION}/site-packages/scapy/layers/inet6.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/layers/ipsec.py +lib/python${MODPY_VERSION}/site-packages/scapy/layers/ipsec.pyc lib/python${MODPY_VERSION}/site-packages/scapy/layers/ir.py lib/python${MODPY_VERSION}/site-packages/scapy/layers/ir.pyc lib/python${MODPY_VERSION}/site-packages/scapy/layers/isakmp.py @@ -118,6 +193,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/scapy/layers/rip.pyc lib/python${MODPY_VERSION}/site-packages/scapy/layers/rtp.py lib/python${MODPY_VERSION}/site-packages/scapy/layers/rtp.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/layers/sctp.py +lib/python${MODPY_VERSION}/site-packages/scapy/layers/sctp.pyc lib/python${MODPY_VERSION}/site-packages/scapy/layers/sebek.py lib/python${MODPY_VERSION}/site-packages/scapy/layers/sebek.pyc lib/python${MODPY_VERSION}/site-packages/scapy/layers/skinny.py @@ -128,6 +205,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/scapy/layers/snmp.pyc lib/python${MODPY_VERSION}/site-packages/scapy/layers/tftp.py lib/python${MODPY_VERSION}/site-packages/scapy/layers/tftp.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/layers/vrrp.py +lib/python${MODPY_VERSION}/site-packages/scapy/layers/vrrp.pyc lib/python${MODPY_VERSION}/site-packages/scapy/layers/x509.py lib/python${MODPY_VERSION}/site-packages/scapy/layers/x509.pyc lib/python${MODPY_VERSION}/site-packages/scapy/main.py @@ -147,6 +226,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/scapy/modules/voip.pyc lib/python${MODPY_VERSION}/site-packages/scapy/packet.py lib/python${MODPY_VERSION}/site-packages/scapy/packet.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/pipetool.py +lib/python${MODPY_VERSION}/site-packages/scapy/pipetool.pyc lib/python${MODPY_VERSION}/site-packages/scapy/plist.py lib/python${MODPY_VERSION}/site-packages/scapy/plist.pyc lib/python${MODPY_VERSION}/site-packages/scapy/pton_ntop.py @@ -155,6 +236,8 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/scapy/route.pyc lib/python${MODPY_VERSION}/site-packages/scapy/route6.py lib/python${MODPY_VERSION}/site-packages/scapy/route6.pyc +lib/python${MODPY_VERSION}/site-packages/scapy/scapypipes.py +lib/python${MODPY_VERSION}/site-packages/scapy/scapypipes.pyc lib/python${MODPY_VERSION}/site-packages/scapy/sendrecv.py lib/python${MODPY_VERSION}/site-packages/scapy/sendrecv.pyc lib/python${MODPY_VERSION}/site-packages/scapy/supersocket.py