Changeset 432

Timestamp:

07/05/05 17:38:50 (8 years ago)

Author:

ahu

Message:

kai's fixes (bsdisms, min/max, bogus)

Files:

• trunk/pdns/pdns/dnsscope.cc (modified) (6 diffs)

trunk/pdns/pdns/dnsscope.cc

@@ +1 @@
+#define __FAVOR_BSD
 #include <pcap.h>
 
@@ -9 +10 @@
 #include <set>
 #include <fstream>
+#include <algorithm>
 #include "anadns.hh"
 
@@ -42 +44 @@
     pw=new PcapPacketWriter(argv[2], pr);
 
-  int dnserrors=0;
+  int dnserrors=0, bogus=0;
   typedef map<uint32_t,uint32_t> cumul_t;
   cumul_t cumul;
@@ -54 +56 @@
 
   while(pr.getUDPPacket()) {
-    if((ntohs(pr.d_udp->dest)==5300 || ntohs(pr.d_udp->source)==5300 ||
-        ntohs(pr.d_udp->dest)==53   || ntohs(pr.d_udp->source)==53) &&
+    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)) {
       try {
@@ -112 +114 @@
       }
       catch(exception& e) {
-        cerr<<"Bogus packet"<<endl;
         if(pw)
           pw->write();
+        bogus++;
         continue;
       }
@@ -122 +124 @@
 
   cerr<<"Saw "<<pr.d_correctpackets<<" correct packets, "<<pr.d_runts<<" runts, "<< pr.d_oversized<<" oversize, "<<
-    pr.d_nonetheripudp<<" unknown encaps, "<<dnserrors<<" dns decoding errors"<<endl;
+    pr.d_nonetheripudp<<" unknown encaps, "<<dnserrors<<" dns decoding errors, "<<bogus<<" bogus packets"<<endl;
 
   unsigned int unanswered=0;