Changeset 840

Timestamp:

05/23/06 12:02:28 (7 years ago)

Author:

ahu

Message:

add linux 'cooked' packet support to dnsscope, dnsreplay, dnslog etc

Location:

trunk/pdns/pdns

Files:

• dnspcap.cc (modified) (2 diffs)
• dnspcap.hh (modified) (3 diffs)
• dnsscope.cc (modified) (1 diff)
• docs/pdns.sgml (modified) (1 diff)

trunk/pdns/pdns/dnspcap.cc

@@ -19 +19 @@
     throw runtime_error((format("PCAP file %s has bad magic %x, should be %x") % fname % d_pfh.magic % 2712847316UL).str());
   
-  if( d_pfh.linktype!=1)
-    throw runtime_error((format("Unsupported link type %d") % d_pfh.linktype).str());
+  if( d_pfh.linktype==1) {
+    d_skipMediaHeader=sizeof(struct ether_header);
+  } else if(d_pfh.linktype==113) {
+    d_skipMediaHeader=16;
+  }
+  else throw runtime_error((format("Unsupported link type %d") % d_pfh.linktype).str());
   
   d_runts = d_oversized = d_correctpackets = d_nonetheripudp = 0;
@@ -65 +69 @@
 
     d_ether=reinterpret_cast<struct ether_header*>(d_buffer);
-    d_ip=reinterpret_cast<struct ip*>(d_buffer + sizeof(struct ether_header));
+    d_lcc=reinterpret_cast<struct pdns_lcc_header*>(d_buffer);
 
-    if(ntohs(d_ether->ether_type)==0x0800 && d_ip->ip_p==17) { // udp
-      d_udp=reinterpret_cast<const struct udphdr*>(d_buffer + sizeof(struct ether_header) + 4 * d_ip->ip_hl);
+    d_ip=reinterpret_cast<struct ip*>(d_buffer + d_skipMediaHeader);
+
+    uint16_t contentCode;
+    if(d_pfh.linktype==1) 
+      contentCode=ntohs(d_ether->ether_type);
+    else if(d_pfh.linktype==113)
+      contentCode=ntohs(d_lcc->lcc_protocol);
+
+    if(contentCode==0x0800 && d_ip->ip_p==17) { // udp
+      d_udp=reinterpret_cast<const struct udphdr*>(d_buffer + d_skipMediaHeader + 4 * d_ip->ip_hl);
       d_payload = (unsigned char*)d_udp + sizeof(struct udphdr);
       d_len = ntohs(d_udp->uh_ulen) - sizeof(struct udphdr);

trunk/pdns/pdns/dnspcap.hh

@@ -33 +33 @@
 };
 
+struct pdns_lcc_header {
+  uint16_t lcc_pkttype;/* packet type */
+  uint16_t lcc_hatype;/* link-layer address type */
+  uint16_t lcc_halen;/* link-layer address length */
+  uint8_t lcc_addr[8];/* link-layer address */
+  uint16_t lcc_protocol;/* protocol */
+};
+
 class PcapPacketReader
 {
@@ -58 +66 @@
   bool getUDPPacket();
 
+  struct pdns_lcc_header* d_lcc;
   struct ether_header* d_ether;
   struct ip *d_ip;
@@ -72 +81 @@
   FILE* d_fp;
   string d_fname;
+  int d_skipMediaHeader;
 };
 

trunk/pdns/pdns/dnsscope.cc

@@ -56 +56 @@
     if((ntohs(pr.d_udp->uh_dport)==5300 || ntohs(pr.d_udp->uh_sport)==5300 ||
         ntohs(pr.d_udp->uh_dport)==53   || ntohs(pr.d_udp->uh_sport)==53) &&
-        pr.d_len > sizeof(HEADER)) {
+        pr.d_len > 12) {
       try {
         MOADNSParser mdp((const char*)pr.d_payload, pr.d_len);

trunk/pdns/pdns/docs/pdns.sgml

@@ -248 +248 @@
               <para>
                 Some operators may want to follow RFC 2181 paragraph 5.2 and 5.4. This harms performance and does not solve any real problem,
-                but does make PowerDNS more compliant. If you want this, enable <command>auth-can-lower-ttl</command>. Implemented in c839, which is
+                but does make PowerDNS more compliant. If you want this, enable <command>auth-can-lower-ttl</command>. Implemented in c838, which is
                 post 3.1-pre2.
               </para>