Ticket #9: patch_vrrp.diff

scapy.py

@@ -4128 +4128 @@
-            x = f.i2len(pkt,pkt.getfieldval(self.fld))
-        return x
-
+class IPListField(FieldListField):
+    islist = 1
+    def __init__(self, name, default, fld, shift=0):
+        self.name = name
+        self.default = default
+        self.fld = fld
+        self.shift=shift
+        
+    def i2repr(self,pkt,x):
+        s = []
+        if x == None:
+            return "[]"
+        for y in x:
+           s.append('%s' % y)
+        return "[ %s ]" % (", ".join(s))
+        
+    def addfield(self, pkt, s, val):
+        val = self.i2m(pkt, val)
+        return s + "".join(map(lambda x: socket.inet_pton(socket.AF_INET, x), val))
+
+    def getfield(self, pkt, s):
+        l = getattr(pkt, self.fld)        
+        l -= self.shift
+        val = []
+        for i in range(l):
+            s,v = s[4:], socket.inet_ntop(socket.AF_INET, s[:4])
+            val.append(v)
+        return s, val
+
+
-# see http://www.iana.org/assignments/ipsec-registry for details
-ISAKMPAttributeTypes= { "Encryption":    (1, { "DES-CBS"  : 1,
-                                                "IDEA-CBC" : 2,
@@ -7071 +7101 @@
-        
-
-
+class VRRP(Packet):
+    name = "VRRP"
+    fields_desc = [
+        BitField("version" , 2, 4),
+        BitField("type" , 1, 4),
+        ByteField("vrid", 1),
+        ByteField("priority", 100),
+        FieldLenField("ipcount",None,"addrlist","B"),
+        ByteField("authtype", 0),
+        ByteField("adv", 1),
+        XShortField("chksum", None),
+        IPListField("addrlist", None, "ipcount"),
+        IntField("auth1", 0),
+        IntField("auth2", 0) ]
+    
+    def post_build(self, p, pay):
+        if self.chksum is None:
+            ck = checksum(p)
+            p = p[:6]+chr(ck>>8)+chr(ck&0xff)+p[8:]
+        return p + pay
+
+
-
-ISAKMP_payload_type = ["None","SA","Proposal","Transform","KE","ID","CERT","CR","Hash",
-                       "SIG","Nonce","N","D","VendorID"]
@@ -8369 +8421 @@
-                ( IP,     TCP,      { "frag" : 0, "proto" : socket.IPPROTO_TCP  } ),
-                ( IP,     UDP,      { "frag" : 0, "proto" : socket.IPPROTO_UDP  } ),
-                ( IP,     GRE,      { "frag" : 0, "proto" : socket.IPPROTO_GRE  } ),
+                ( IP,     VRRP,     { "frag" : 0, "proto" : 0x70 } ),
-                ( UDP,    MGCP,     { "dport" : 2727 } ),
-                ( UDP,    MGCP,     { "sport" : 2727 } ),
-                ( UDP,    DNS,      { "dport" : 53 } ),