Changeset 918:c6d5e354eb6f

Timestamp:

09/12/08 17:57:20 (4 months ago)

Author:

Phil <phil@secdev.org>

Message:

Scapy6 adapatations to have it work inside scapy 2

Files:

• scapy/config.py (modified) (1 diff)
• scapy/layers/inet.py (modified) (7 diffs)
• scapy/layers/inet6.py (modified) (26 diffs)
• scapy/layers/ip6.py (deleted)

scapy/config.py

@@ -313 +313 @@
-    temp_files = []
-    netcache = NetCache()
-p
+net
-                   "mgcp", "mobileip", "netbios", "netflow", "ntp", "ppp", "radius", "rip", "rtp",
-                   "sebek", "skinny", "smb", "snmp", "tftp", "x509", "bluetooth" ]

scapy/layers/inet.py

@@ -278 +278 @@
-                ck=checksum(psdhdr+p)
-                p = p[:16]+struct.pack("!H", ck)+p[18:]
-IPv6) or isinstance(self.underlayer, _IPv6OptionHeade
+inet6.IPv6) or isinstance(self.underlayer, inet6._IPv6ExtHd
-                ck = in6_chksum(socket.IPPROTO_TCP, self.underlayer, p)
-                p = p[:16]+struct.pack("!H", ck)+p[18:]
@@ -302 +302 @@
-        if isinstance(self.underlayer, IP):
-            return self.underlayer.sprintf("TCP %IP.src%:%TCP.sport% > %IP.dst%:%TCP.dport% %TCP.flags%")
-
+inet6.
-            return self.underlayer.sprintf("TCP %IPv6.src%:%TCP.sport% > %IPv6.dst%:%TCP.dport% %TCP.flags%")
-        else:
@@ -332 +332 @@
-                ck=checksum(psdhdr+p)
-                p = p[:6]+struct.pack("!H", ck)+p[8:]
-IPv6) or isinstance(self.underlayer, _IPv6OptionHeade
+inet6.IPv6) or isinstance(self.underlayer, inet6._IPv6ExtHd
-                ck = in6_chksum(socket.IPPROTO_UDP, self.underlayer, p)
-                p = p[:6]+struct.pack("!H", ck)+p[8:]
@@ -353 +353 @@
-        if isinstance(self.underlayer, IP):
-            return self.underlayer.sprintf("UDP %IP.src%:%UDP.sport% > %IP.dst%:%UDP.dport%")
-
+inet6.
-            return self.underlayer.sprintf("UDP %IPv6.src%:%UDP.sport% > %IPv6.dst%:%UDP.dport%")
-        else:
@@ -926 +926 @@
-        ports_done = {}
-        for s,r in self.res:
-
-
+inet6.
+inet6.
-            ips[r.src] = None
-            if TCP in s:
@@ -938 +938 @@
-                trace_id = (s.src,s.dst,s.proto,0)
-            trace = rt.get(trace_id,{})
-
-
+inet6.
+inet6.
-                if trace_id in ports_done:
-                    continue
@@ -1222 +1222 @@
-conf.stats_classic_protocols += [TCP,UDP,ICMP]
-conf.stats_dot11_protocols += [TCP,UDP,ICMP]
+
+from scapy.layers import inet6

scapy/layers/inet6.py

@@ -2 +2 @@
-#############################################################################
-##                                                                         ##
-scapy6.py --- IPv6 support for Scapy
- see http://namabiiru.hongo.wide.ad.jp/scapy6/
- for more informations
+inet6.py --- IPv6 support for Scapy 
+see http://natisbad.org/IPv6/                 
+for more informations 
-##                                                                         ##
-## Copyright (C) 2005  Guillaume Valadon <guedou@hongo.wide.ad.jp>         ##
@@ -11 +11 @@
-## This program is free software; you can redistribute it and/or modify it ##
-## under the terms of the GNU General Public License version 2 as          ##
-; version 2.
+.           
-##                                                                         ##
-## This program is distributed in the hope that it will be useful, but     ##
@@ -20 +20 @@
-#############################################################################
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -29 +39 @@
-
-def get_cls(name, fallback_cls):
-__builtin__.__dict__
+globals()
-
-
@@ -43 +53 @@
-WINDOWS = sys.platform.startswith("win")
-
-if OPENBSD or FREEBSD or NETBSD or DARWIN:
-        loname = "lo0"
-else:
-        loname = "lo"
-
-# From net/ipv6.h on Linux (+ Additions)
@@ -91 +97 @@
-    elif in6_ismaddr(addr):
-        if in6_ismnladdr(addr):
-loname
+LOOPBACK_NAME
-        elif in6_ismgladdr(addr):
-            cset = filter(lambda x: x[1] == IPV6_ADDR_GLOBAL, laddr)
@@ -322 +328 @@
-        if not pathes:
-            warning("No route found for IPv6 destination %s (no default route?)" % dst)
-loname
+LOOPBACK_NAME
-
-        pathes.sort()
@@ -342 +348 @@
-        #    6to4 address in those available
-        #  - dst is link local (unicast or multicast) and multiple output
-
+6
-        #  - if none of the previous or ambiguity persists, be lazy and keep
-        #    first one
@@ -355 +361 @@
-            elif in6_ismaddr(dst) or in6_islladdr(dst):
-                # TODO : I'm sure we are not covering all addresses. Check that
-
+6
-
-            if tmp:
@@ -442 +448 @@
-
-            cset = [] # candidate set (possible source addresses)
-loname
+LOOPBACK_NAME
-                if d == '::':
-                    continue
@@ -469 +475 @@
-        xx = "::1"
-        scope = 128
-loname
+LOOPBACK_NAME
-        ret.append(xx, scope, ifname)
-        return ret
@@ -479 +485 @@
-        dp = 0
-        nh = '::'
-loname
+LOOPBACK_NAME
-        cset = ['::1']
-        routes.append((d, dp, nh, dev, cset))
@@ -551 +557 @@
-            if '%' in nh:
-                nh,dev = nh.split('%')
-loname
+LOOPBACK_NAME
-                cset = ['::1']
-                nh = '::'
@@ -604 +610 @@
-    
-    def __init__(self):
-arp_cache
+{}
-
-    def flush(self, statictoo=True):
@@ -686 +692 @@
-            return mac
-    
-
-
-loname
+6
+
+LOOPBACK_NAME
-            return "ff:ff:ff:ff:ff:ff"
-
@@ -1025 +1031 @@
-    tod = struct.pack("!II", i,j)
-    # TODO: Add some check regarding system address gathering
-
+6
-    mac = ":".join(map(lambda x: "%.02x" % ord(x), list(rawmac)))
-    # construct modified EUI-64 ID
@@ -1565 +1571 @@
-                    SourceIP6Field("src", "dst"), # dst is for src @ selection
-                    IP6Field("dst", "::1") ]
+
+    def route(self):
+        dst = self.dst
+        if isinstance(dst,Gen):
+            dst = iter(dst).next()
+        return conf.route6.route(dst)
+
-    def mysummary(self):
-        return "%s > %s (%i)" % (self.src,self.dst, self.nh)
@@ -1674 +1687 @@
-            return self.payload.answers(other.payload)
-
-
-
+
+
+
-
-class IPerror6(IPv6):
@@ -1833 +1847 @@
-    name = 'Abstract IPV6 Option Header'
-    aliastypes = [IPv6, IPerror6] # TODO ...
-
-scapy._IPv6OptionHeader = _IPv6ExtHdr
-
-
@@ -4696 +4708 @@
-        msg = """
-dhcp6d( dns="2001:500::1035", domain="localdomain, local", duid=None)
-
+6
-        sipdomains=None, sipservers=None, 
-        nisdomain=None, nisservers=None, 
@@ -4710 +4722 @@
-  
-   iface : the interface to listen/reply on if you do not want to use 
-
+6
-
-   advpref : Value in [0,255] given to Advertise preference field.
@@ -4764 +4776 @@
-                      nisdomain=None, nisservers=None, nispdomain=None,
-                      nispservers=None, bcmcsservers=None, bcmcsdomains=None,
-conf.ifac
+Non
-        def norm_list(val, param_name):
-            if val is None:
@@ -4778 +4790 @@
-                return -1
-
+        if iface is None:
+            iface = conf.iface6
+        
-        self.debug = debug
-
@@ -5931 +5946 @@
-#############################################################################
-
-
-
-
+
+
-
-bind_layers(Ether,     IPv6,     type = 0x86dd )
@@ -5949 +5963 @@
-def get_working_if6():
-    """
-
+6
-    one used by default route if any.
-    """
@@ -5959 +5973 @@
-
-conf.route6 = Route6()
-
+6
-
-if __name__ == '__main__':