Merged with one-file scapy

--HG--
rename : scapy.py => bin/scapy
rename : scapy.py => scapy/__init__.py
rename : scapy.py => scapy/ansmachine.py
rename : scapy.py => scapy/arch.py
rename : scapy.py => scapy/as_resolvers.py
rename : scapy.py => scapy/asn1/asn1.py
rename : scapy.py => scapy/asn1/ber.py
rename : scapy.py => scapy/asn1/mib.py
rename : scapy.py => scapy/asn1fields.py
rename : scapy.py => scapy/asn1packet.py
rename : scapy.py => scapy/automaton.py
rename : scapy.py => scapy/autorun.py
rename : scapy.py => scapy/config.py
rename : scapy.py => scapy/dadict.py
rename : scapy.py => scapy/data.py
rename : scapy.py => scapy/error.py
rename : scapy.py => scapy/fields.py
rename : scapy.py => scapy/layers/__init__.py
rename : scapy.py => scapy/layers/bluetooth.py
rename : scapy.py => scapy/layers/dhcp.py
rename : scapy.py => scapy/layers/dns.py
rename : scapy.py => scapy/layers/dot11.py
rename : scapy.py => scapy/layers/gprs.py
rename : scapy.py => scapy/layers/hsrp.py
rename : scapy.py => scapy/layers/inet.py
rename : scapy.py => scapy/layers/ip6.py
rename : scapy.py => scapy/layers/ir.py
rename : scapy.py => scapy/layers/isakmp.py
rename : scapy.py => scapy/layers/l2.py
rename : scapy.py => scapy/layers/l2tp.py
rename : scapy.py => scapy/layers/mgcp.py
rename : scapy.py => scapy/layers/mobileip.py
rename : scapy.py => scapy/layers/netbios.py
rename : scapy.py => scapy/layers/netflow.py
rename : scapy.py => scapy/layers/ntp.py
rename : scapy.py => scapy/layers/ppp.py
rename : scapy.py => scapy/layers/radius.py
rename : scapy.py => scapy/layers/rip.py
rename : scapy.py => scapy/layers/rtp.py
rename : scapy.py => scapy/layers/sebek.py
rename : scapy.py => scapy/layers/skinny.py
rename : scapy.py => scapy/layers/smb.py
rename : scapy.py => scapy/layers/snmp.py
rename : scapy.py => scapy/layers/tftp.py
rename : scapy.py => scapy/layers/x509.py
rename : scapy.py => scapy/main.py
rename : scapy.py => scapy/modules/geoip.py
rename : scapy.py => scapy/modules/nmap.py
rename : scapy.py => scapy/modules/p0f.py
rename : scapy.py => scapy/modules/queso.py
rename : scapy.py => scapy/modules/voip.py
rename : scapy.py => scapy/packet.py
rename : scapy.py => scapy/plist.py
rename : scapy.py => scapy/route.py
rename : scapy.py => scapy/sendrecv.py
rename : scapy.py => scapy/supersocket.py
rename : scapy.py => scapy/themes.py
rename : scapy.py => scapy/utils.py
rename : scapy.py => scapy/volatile.py

scapy/asn1/mib.py

@@ -15,7 +15,7 @@ from scapy.utils import do_graph
 
 _mib_re_integer = re.compile("^[0-9]+$")
 _mib_re_both = re.compile("^([a-zA-Z_][a-zA-Z0-9_-]*)\(([0-9]+)\)$")
-_mib_re_oiddecl = re.compile("$\s*([a-zA-Z0-9_-]+)\s+OBJECT[^:]+::=\s*\{([^\}]+)\}",re.M)
+_mib_re_oiddecl = re.compile("$\s*([a-zA-Z0-9_-]+)\s+OBJECT([^:\{\}]|\{[^:]+\})+::=\s*\{([^\}]+)\}",re.M)
 _mib_re_strings = re.compile('"[^"]*"')
 _mib_re_comments = re.compile('--.*(\r|\n)')
 
@@ -118,7 +118,8 @@ def load_mib(filenames):
             text = f.read()
             cleantext = " ".join(_mib_re_strings.split(" ".join(_mib_re_comments.split(text))))
             for m in _mib_re_oiddecl.finditer(cleantext):
-                ident,oid = m.groups()
+                gr = m.groups()
+                ident,oid = gr[0],gr[-1]
                 ident=fixname(ident)
                 oid = oid.split()
                 for i in range(len(oid)):

scapy/fields.py

@@ -334,6 +334,8 @@ class StrField(Field):
     def i2m(self, pkt, x):
         if x is None:
             x = ""
+        elif type(x) is not str:
+            x=str(x)
         return x
     def addfield(self, pkt, s, val):
         return s+self.i2m(pkt, val)

scapy/layers/dot11.py

@@ -382,7 +382,7 @@ iwconfig wlan0 mode managed
     function_name = "airpwn"
     filter = None
     
-    def parse_options(iffrom, ifto, replace, pattern="", ignorepattern=""):
+    def parse_options(self, iffrom, ifto, replace, pattern="", ignorepattern=""):
         self.iffrom = iffrom
         self.ifto = ifto
         ptrn = re.compile(pattern)