Ticket #99: snmptrapv1-scapy.diff

a/scapy.py

@@ -1841 +1841 @@
-    UNIVERSAL_STRING = 28
-    CHAR_STRING = 29
-    BMP_STRING = 30
+    IPADDRESS = 0x40
-    COUNTER32 = 0x41
-    TIME_TICKS = 0x43
-
@@ -1921 +1922 @@
-class ASN1_VIDEOTEX_STRING(ASN1_STRING):
-    tag = ASN1_Class_UNIVERSAL.VIDEOTEX_STRING
-
+class ASN1_IPADDRESS(ASN1_STRING):
+    tag = ASN1_Class_UNIVERSAL.IPADDRESS
+
-class ASN1_UTC_TIME(ASN1_STRING):
-    tag = ASN1_Class_UNIVERSAL.UTC_TIME
-
@@ -1968 +1972 @@
-
-class BER_Exception(Exception):
-    pass
+
+class BER_Encoding_Error(ASN1_Encoding_Error):
+    def __init__(self, msg, encoded=None, remaining=None):
+        Exception.__init__(self, msg)
+        self.remaining = remaining
+        self.encoded = encoded
+    def __str__(self):
+        s = Exception.__str__(self)
+        if isinstance(self.encoded, BERcodec_Object):
+            s+="\n### Already encoded ###\n%s" % self.encoded.strshow()
+        else:
+            s+="\n### Already encoded ###\n%r" % self.encoded
+        s+="\n### Remaining ###\n%r" % self.remaining
+        return s
-
-class BER_Decoding_Error(ASN1_Decoding_Error):
-    def __init__(self, msg, decoded=None, remaining=None):
@@ -2189 +2207 @@
-
-class BERcodec_IA5_STRING(BERcodec_STRING):
-    tag = ASN1_Class_UNIVERSAL.IA5_STRING
+
+class BERcodec_IPADDRESS(BERcodec_STRING):
+    tag = ASN1_Class_UNIVERSAL.IPADDRESS
+    
+    @classmethod
+    def enc(cls, ipaddr_ascii):
+        try:
+            s = inet_aton(ipaddr_ascii)
+        except Exception:
+            raise BER_Encoding_Error("IPv4 address could not be encoded") 
+        return chr(cls.tag)+BER_len_enc(len(s))+s
+    
+    @classmethod
+    def do_dec(cls, s, context=None, safe=False):
+        l,s,t = cls.check_type_check_len(s)
+        try:
+            ipaddr_ascii = inet_ntoa(s)
+        except Exception:
+            raise BER_Decoding_Error("IP address could not be decoded", decoded=obj)
+        return cls.asn1_object(ipaddr_ascii), t
-
-class BERcodec_UTC_TIME(BERcodec_STRING):
-    tag = ASN1_Class_UNIVERSAL.UTC_TIME
@@ -4985 +5023 @@
-
-class ASN1F_BIT_STRING(ASN1F_STRING):
-    ASN1_tag = ASN1_Class_UNIVERSAL.BIT_STRING
+    
+class ASN1F_IPADDRESS(ASN1F_STRING):
+    ASN1_tag = ASN1_Class_UNIVERSAL.IPADDRESS    
+
+class ASN1F_TIME_TICKS(ASN1F_INTEGER):
+    ASN1_tag = ASN1_Class_UNIVERSAL.TIME_TICKS
-
-class ASN1F_UTC_TIME(ASN1F_STRING):
-    ASN1_tag = ASN1_Class_UNIVERSAL.UTC_TIME
@@ -9334 +9378 @@
-    
-class SNMPtrapv1(ASN1_Packet):
-    ASN1_codec = ASN1_Codecs.BER
-
-
-
+
+
-                                       ASN1F_enum_INTEGER("generic_trap", 0, SNMP_trap_types),
-                                       ASN1F_INTEGER("specific_trap", 0),
-INTEGER
+TIME_TICKS
-                                       ASN1F_SEQUENCE_OF("varbindlist", [], SNMPvarbind)
-                                       )
-
@@ -9591 +9634 @@
-bind_layers( UDP,           L2TP,          sport=1701, dport=1701)
-bind_layers( UDP,           SNMP,          sport=161)
-bind_layers( UDP,           SNMP,          dport=161)
+bind_layers( UDP,           SNMP,          sport=162)
+bind_layers( UDP,           SNMP,          dport=162)
-bind_layers( UDP,           MGCP,          dport=2727)
-bind_layers( UDP,           MGCP,          sport=2727)
-bind_layers( UDP,           DNS,           dport=53)