Changeset 5896

Timestamp:

03/29/11 13:26:26 (2 years ago)

Author:

nopper

Message:

Refreshing scapy patches

Location:

packet-manipulator/trunk/deps/scapy-patches

Files:

• dns.patch (modified) (17 diffs)
• ppp-datalink.patch (modified) (1 diff)
• smb.patch (modified) (13 diffs)

packet-manipulator/trunk/deps/scapy-patches/dns.patch

@@ -1 @@
-diff -r 7a211173d33f scapy/layers/dns.py
---- a/scapy/layers/dns.py       Mon Jan 11 17:59:00 2010 +0100
-+++ b/scapy/layers/dns.py       Thu Feb 11 15:03:04 2010 +0100
-@@ -10,14 +10,23 @@
+diff -r 2c99fb37d83d scapy/layers/dns.py
+--- a/scapy/layers/dns.py       Fri Mar 11 19:37:19 2011 +0100
++++ b/scapy/layers/dns.py       Tue Mar 29 15:23:05 2011 +0200
+@@ -14,6 +14,23 @@
  from scapy.ansmachine import *
  from scapy.layers.inet import UDP
@@ -13 +13 @@
 +
 +def convert(x):
-+    x = [k[:63] for k in x.split(".")] # Truncate chunks that cannont be encoded (more than 63 bytes..)
++    if x == ".":
++      return "\x00"
++
++    x = [k[:63] for k in x.split(".")] # Truncate chunks that cannot be encoded (more than 63 bytes..)
 +    x = map(lambda y: chr(len(y))+y, x)
 +    x = "".join(x)
@@ -21 +24 @@
 +
  class DNSStrField(StrField):
+ 
+     def h2i(self, pkt, x):
+@@ -22,15 +39,7 @@
+       return x
+ 
      def i2m(self, pkt, x):
--        x = [k[:63] for k in x.split(".")] # Truncate chunks that cannont be encoded (more than 63 bytes..)
+-        if x == ".":
+-          return "\x00"
+-
+-        x = [k[:63] for k in x.split(".")] # Truncate chunks that cannot be encoded (more than 63 bytes..)
 -        x = map(lambda y: chr(len(y))+y, x)
 -        x = "".join(x)
@@ -29 +40 @@
 -        return x
 +        return convert(x)
+ 
      def getfield(self, pkt, s):
          n = ""
-         while 1:
-@@ -45,7 +54,7 @@
+@@ -63,7 +72,7 @@
              x = x.payload
              i += 1
@@ -41 +52 @@
          if x is None:
              x = self._countRR(pkt)
-@@ -54,10 +63,12 @@
+@@ -72,10 +81,12 @@
          if x is None:
              x = self._countRR(pkt)
@@ -56 +67 @@
      jpath = [p]
      while 1:
-@@ -67,26 +78,31 @@
+@@ -85,26 +96,31 @@
          l = ord(s[p])
          p += 1
@@ -91 +102 @@
  class DNSRRField(StrField):
      holds_packets=1
-@@ -98,18 +114,20 @@
+@@ -116,18 +132,20 @@
          if x is None:
              return ""
@@ -116 +127 @@
      def getfield(self, pkt, s):
          if type(s) is tuple :
-@@ -123,28 +141,28 @@
+@@ -141,28 +159,28 @@
              return s,""
          while c:
@@ -152 +163 @@
  class RDataField(StrLenField):
      def m2i(self, pkt, s):
-@@ -155,7 +173,7 @@
+@@ -173,7 +191,7 @@
              family = socket.AF_INET6
          elif pkt.type == 12:
@@ -161 +172 @@
          return s
      def i2m(self, pkt, s):
-@@ -165,26 +183,35 @@
+@@ -183,26 +201,35 @@
          elif pkt.type == 28:
              if s:
@@ -206 +217 @@
  class DNS(Packet):
      name = "DNS"
-@@ -210,7 +237,7 @@
+@@ -228,7 +255,7 @@
                  and self.id == other.id
                  and self.qr == 1
@@ -215 +226 @@
          type = ["Qry","Ans"][self.qr]
          name = ""
-@@ -224,24 +251,152 @@
+@@ -242,24 +269,152 @@
                  name = ' "%s"' % self.qd.qname
          return 'DNS %s%s ' % (type, name)
@@ -370 +381 @@
  class DNSRR(Packet):
      name = "DNS Resource Record"
-@@ -251,7 +406,9 @@
+@@ -269,7 +424,9 @@
                      ShortEnumField("rclass", 1, dnsclasses),
                      IntField("ttl", 0),
@@ -381 +392 @@
  bind_layers( UDP,           DNS,           dport=53)
  bind_layers( UDP,           DNS,           sport=53)
-@@ -275,9 +432,7 @@
+@@ -293,9 +450,7 @@
          return r.getlayer(DNS).rcode
      else:
@@ -392 +403 @@
  @conf.commands.register
  def dyndns_del(nameserver, name, type="ALL", ttl=10):
-@@ -297,7 +452,7 @@
+@@ -315,7 +470,7 @@
          return r.getlayer(DNS).rcode
      else:
@@ -401 +412 @@
  class DNS_am(AnsweringMachine):
      function_name="dns_spoof"
-@@ -312,7 +467,7 @@
+@@ -330,7 +485,7 @@
  
      def is_request(self, req):
@@ -410 +421 @@
          ip = req.getlayer(IP)
          dns = req.getlayer(DNS)
-@@ -322,4 +477,3 @@
+@@ -340,4 +495,3 @@
                      an=DNSRR(rrname=dns.qd.qname, ttl=10, rdata=rdata))
          return resp

packet-manipulator/trunk/deps/scapy-patches/ppp-datalink.patch

@@ -1 @@
-diff -r 7a211173d33f scapy/layers/ppp.py
---- a/scapy/layers/ppp.py       Mon Jan 11 17:59:00 2010 +0100
-+++ b/scapy/layers/ppp.py       Thu Feb 11 14:05:20 2010 +0100
-@@ -339,3 +339,5 @@
+diff -r 2c99fb37d83d scapy/layers/ppp.py
+--- a/scapy/layers/ppp.py       Fri Mar 11 19:37:19 2011 +0100
++++ b/scapy/layers/ppp.py       Tue Mar 29 15:24:12 2011 +0200
+@@ -345,3 +345,5 @@
  bind_layers( PPP,           PPP_ECP,       proto=0x8053)
  bind_layers( Ether,         PPP_IPCP,      type=0x8021)

packet-manipulator/trunk/deps/scapy-patches/smb.patch

@@ -1 @@
-diff -r 7a211173d33f scapy/fields.py
---- a/scapy/fields.py   Mon Jan 11 17:59:00 2010 +0100
-+++ b/scapy/fields.py   Thu Feb 11 15:02:28 2010 +0100
-@@ -271,7 +271,7 @@
+diff -r 2c99fb37d83d scapy/fields.py
+--- a/scapy/fields.py   Fri Mar 11 19:37:19 2011 +0100
++++ b/scapy/fields.py   Tue Mar 29 15:25:11 2011 +0200
+@@ -278,7 +278,7 @@
  
  class ShortField(Field):
@@ -11 +11 @@
  class LEShortField(Field):
      def __init__(self, name, default):
-@@ -478,8 +478,8 @@
+@@ -485,8 +485,8 @@
          return rr
  
@@ -22 +22 @@
          l = self.length_from(pkt)/2
          if x is None:
-@@ -491,6 +491,7 @@
+@@ -498,6 +498,7 @@
          return x
      def m2i(self, pkt, x):
@@ -30 +30 @@
  
  class StrLenField(StrField):
-@@ -585,6 +586,27 @@
+@@ -592,6 +593,27 @@
      def randval(self):
          return RandTermString(RandNum(0,1200),"\x00")
@@ -58 +58 @@
      def __init__(self, name, default, stop, additionnal=0):
          Field.__init__(self, name, default)
-diff -r 7a211173d33f scapy/layers/netbios.py
---- a/scapy/layers/netbios.py   Mon Jan 11 17:59:00 2010 +0100
-+++ b/scapy/layers/netbios.py   Thu Feb 11 15:02:28 2010 +0100
-@@ -199,8 +199,22 @@
+diff -r 2c99fb37d83d scapy/layers/netbios.py
+--- a/scapy/layers/netbios.py   Fri Mar 11 19:37:19 2011 +0100
++++ b/scapy/layers/netbios.py   Tue Mar 29 15:25:11 2011 +0200
+@@ -205,8 +205,22 @@
  class NBTSession(Packet):
      name="NBT Session Packet"
@@ -86 +86 @@
  bind_layers( UDP,           NBNSQueryRequest,  dport=137)
  bind_layers( UDP,           NBNSRequest,       dport=137)
-@@ -214,3 +228,6 @@
+@@ -220,3 +234,6 @@
  bind_layers( UDP,           NBNSWackResponse, sport=137)
  bind_layers( UDP,           NBTDatagram,      dport=138)
@@ -93 +93 @@
 +bind_layers( TCP,           NBTSession,       dport=445)
 +bind_layers( TCP,           NBTSession,       sport=445)
-diff -r 7a211173d33f scapy/layers/smb.py
---- a/scapy/layers/smb.py       Mon Jan 11 17:59:00 2010 +0100
-+++ b/scapy/layers/smb.py       Thu Feb 11 15:02:28 2010 +0100
-@@ -7,6 +7,280 @@
+diff -r 2c99fb37d83d scapy/layers/smb.py
+--- a/scapy/layers/smb.py       Fri Mar 11 19:37:19 2011 +0100
++++ b/scapy/layers/smb.py       Tue Mar 29 15:25:11 2011 +0200
+@@ -11,6 +11,280 @@
  from scapy.fields import *
  from scapy.layers.netbios import NBTSession
@@ -377 +377 @@
  # SMB NetLogon Response Header
  class SMBNetlogon_Protocol_Response_Header(Packet):
-@@ -106,32 +380,6 @@
+@@ -110,32 +384,6 @@
                     StrNullField("ServerName","WIN"),
                     LEShortField("LM20Token", 0xffff)]
@@ -410 +410 @@
  class SMBNegociate_Protocol_Response_Advanced_Security(Packet):
      name="SMBNegociate Protocol Response Advanced Security"
-@@ -211,8 +459,8 @@
+@@ -215,8 +463,8 @@
                     ByteField("EncryptionKeyLength",8),
                     LEShortField("ByteCount",24),
@@ -421 +421 @@
  # SMBNegociate Protocol Response No Security No Key
  class SMBNegociate_Protocol_Response_No_Security_No_Key(Packet):
-@@ -290,10 +538,11 @@
+@@ -294,10 +542,11 @@
                   BitField("Reserved5",0,5),
                   LEShortField("ByteCount",35),
@@ -437 +437 @@
                   ByteEnumField("AndXCommand2",0xFF,{0xFF:"SMB_COM_NONE"}),
                   ByteField("Reserved6",0),
-@@ -302,7 +551,7 @@
+@@ -306,7 +555,7 @@
                   LEShortField("PasswordLength",0x1),
                   LEShortField("ByteCount2",18),
@@ -446 +446 @@
  
  # Session Setup AndX Response
-@@ -328,9 +577,9 @@
+@@ -332,9 +581,9 @@
                   LEShortField("AndXOffset",66),
                   LEShortField("Action",0),
@@ -459 +459 @@
                   ByteEnumField("AndXCommand2",0xFF,{0xFF:"SMB_COM_NONE"}),
                   ByteField("Reserved3",0),
-@@ -340,11 +589,3 @@
+@@ -344,11 +593,3 @@
                   StrNullField("Service","IPC"),
                   StrNullField("NativeFileSystem","")]