Ticket #31: scapy.patch

./scapy.py

@@ -19 +19 @@
-##                                                                         ##
-#############################################################################
-
+# Revision 1.0.5.1F  2006/10/17 16:50:19  yl
+# - Added MPLS and IGMPv2 by Yi Lei
-#
-# $Log: scapy.py,v $
-# Revision 1.0.5.1  2006/10/19 15:56:43  pbi
@@ -1730 +1732 @@
-
-from __future__ import generators
-
-
+F
-
-VERSION = RCSID.split()[2]+"beta"
-
@@ -8053 +8055 @@
-                   ShortEnumField("RR_CLASS",1,{1:"INTERNET"}),
-                   IntField("TTL",0),
-                   ShortField("RDLENGTH",83),
- 
+
-
-# Service for Node Status Response
-class NBNSNodeStatusResponseService(Packet):
@@ -8503 +8505 @@
-                    IntField("padding2", 0) ]
-
-
+class MPLS(Packet):
+    name = "MPLS"
+    fields_desc =  [ BitField("label", 3, 20),
+                     BitField("cos", 0, 3),
+                     BitField("s", 1, 1),
+                     ByteField("ttl", 0)  ]
+
+igmptypes = { 0x11 : "membership query",
+              0x16 : "version 2 membership report",
+              0x17 : "leave group",
+              0x12 : "version 1 membership report" }
+
+class IGMPV2(Packet):
+    name = "IGMPV2"
+    fields_desc = [ ByteEnumField("type",0x11, igmptypes),
+                    ByteField("maxResTime",1600),
+                    XShortField("chksum", None),
+                    IPField("gda", "0.0.0.0")]
+    def post_build(self, p, pay):
+        p += pay
+        if self.chksum is None:
+            ck = checksum(p)
+            p = p[:2]+chr(ck>>8)+chr(ck&0xff)+p[4:]
+        return p
-
+    
-#################
-## Bind layers ##
-#################
@@ -8559 +8586 @@
-                ( Ether,  EAPOL,    { "type" : 0x888e, "dst" : "01:80:c2:00:00:03" } ),
-                ( Ether,  PPPoED,   { "type" : 0x8863 } ),
-                ( Ether,  PPPoE,    { "type" : 0x8864 } ),
+                ( Ether,  MPLS,    { "type" : 0x8847 } ),
+                ( MPLS,   IP,       { }                 ),                  
-                ( CookedLinux,  LLC,      { "proto" : 0x007a } ),
-                ( CookedLinux,  Dot1Q,    { "proto" : 0x8100 } ),
-                ( CookedLinux,  Ether,    { "proto" : 0x0001 } ),
@@ -8585 +8614 @@
-                ( IPerror,IPerror,  { "frag" : 0, "proto" : socket.IPPROTO_IP   } ),
-                ( IPerror,ICMPerror,{ "frag" : 0, "proto" : socket.IPPROTO_ICMP } ),
-                ( IPerror,TCPerror, { "frag" : 0, "proto" : socket.IPPROTO_TCP  } ),
-
+                             
-                ( IP,     IP,       { "frag" : 0, "proto" : socket.IPPROTO_IP   } ),
-                ( IP,     ICMP,     { "frag" : 0, "proto" : socket.IPPROTO_ICMP } ),
-                ( 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,     IGMPV2,   { "frag" : 0, "proto" : socket.IPPROTO_IGMP } ),
-                ( UDP,    MGCP,     { "dport" : 2727 } ),
-                ( UDP,    MGCP,     { "sport" : 2727 } ),
-                ( UDP,    DNS,      { "dport" : 53 } ),