Ticket #130: tcp-dns-layer.patch

a/scapy/layers/dns.py

@@ -8 +8 @@
-from scapy.packet import *
-from scapy.fields import *
-from scapy.ansmachine import *
-
+,TCP
-
-class DNSStrField(StrField):
-    def i2m(self, pkt, x):
@@ -188 +188 @@
-
-class DNS(Packet):
-    name = "DNS"
-
+
+
-                    BitField("qr",0, 1),
-                    BitEnumField("opcode", 0, 4, {0:"QUERY",1:"IQUERY",2:"STATUS"}),
-                    BitField("aa", 0, 1),
@@ -205 +206 @@
-                    DNSRRField("an", "ancount"),
-                    DNSRRField("ns", "nscount"),
-                    DNSRRField("ar", "arcount",0) ]
+    def post_build(self, p, pay):
+        if isinstance(self.underlayer, TCP) and self.length is None:
+            l = len(p) - 2
+            p = struct.pack("!H", l) + p[2:]
+        return p + pay
+
-    def answers(self, other):
-        return (isinstance(other, DNS)
-                and self.id == other.id
@@ -224 +231 @@
-                name = ' "%s"' % self.qd.qname
-        return 'DNS %s%s ' % (type, name)
-
+
-dnstypes = { 0:"ANY", 255:"ALL",
-             1:"A", 2:"NS", 3:"MD", 4:"MD", 5:"CNAME", 6:"SOA", 7: "MB", 8:"MG",
-             9:"MR",10:"NULL",11:"WKS",12:"PTR",13:"HINFO",14:"MINFO",15:"MX",16:"TXT",
@@ -255 +263 @@
-
-bind_layers( UDP,           DNS,           dport=53)
-bind_layers( UDP,           DNS,           sport=53)
+bind_layers( TCP,           DNS,           dport=53)
+bind_layers( TCP,           DNS,           sport=53)
-
-
-@conf.commands.register