Changeset 862:52d055e522bd

Show
Ignore:
Timestamp:
08/11/08 18:01:50 (5 months ago)
Author:
Phil <phil@secdev.org>
Parents:

861:1dbeceddbb8a 807:19df3f1cd92b

Message:

Merged with one-file scapy

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • scapy/asn1/mib.py

    r846 r862  
    1616_mib_re_integer = re.compile("^[0-9]+$") 
    1717_mib_re_both = re.compile("^([a-zA-Z_][a-zA-Z0-9_-]*)\(([0-9]+)\)$") 
    18 _mib_re_oiddecl = re.compile("$\s*([a-zA-Z0-9_-]+)\s+OBJECT[^:]+::=\s*\{([^\}]+)\}",re.M) 
     18_mib_re_oiddecl = re.compile("$\s*([a-zA-Z0-9_-]+)\s+OBJECT([^:\{\}]|\{[^:]+\})+::=\s*\{([^\}]+)\}",re.M) 
    1919_mib_re_strings = re.compile('"[^"]*"') 
    2020_mib_re_comments = re.compile('--.*(\r|\n)') 
    …… 
    119119            cleantext = " ".join(_mib_re_strings.split(" ".join(_mib_re_comments.split(text)))) 
    120120            for m in _mib_re_oiddecl.finditer(cleantext): 
    121                 ident,oid = m.groups() 
     121                gr = m.groups() 
     122                ident,oid = gr[0],gr[-1] 
    122123                ident=fixname(ident) 
    123124                oid = oid.split() 

  • scapy/fields.py

    r851 r862  
    335335        if x is None: 
    336336            x = "" 
     337        elif type(x) is not str: 
     338            x=str(x) 
    337339        return x 
    338340    def addfield(self, pkt, s, val): 

  • scapy/layers/dot11.py

    r846 r862  
    383383    filter = None 
    384384     
    385     def parse_options(iffrom, ifto, replace, pattern="", ignorepattern=""): 
     385    def parse_options(self, iffrom, ifto, replace, pattern="", ignorepattern=""): 
    386386        self.iffrom = iffrom 
    387387        self.ifto = ifto