Changeset 762 for trunk/pdns/pdns/dnsscan.cc

Timestamp:

04/24/06 09:29:38 (7 years ago)

Author:

ahu

Message:

make dnsscan accept multiple files
move auth nameserver over to ComboAddress?

Files:

• trunk/pdns/pdns/dnsscan.cc (modified) (1 diff)

trunk/pdns/pdns/dnsscan.cc

@@ -27 +27 @@
 try
 {
-  PcapPacketReader pr(argv[1]);
   Socket sock(InterNetwork, Datagram);
 
+  /*
   IPEndpoint remote(argc > 2 ? argv[2] : "127.0.0.1", 
                     argc > 3 ? atoi(argv[3]) : 5300);
 
+  */
 
-  while(pr.getUDPPacket()) {
-    try {
-      MOADNSParser mdp((const char*)pr.d_payload, pr.d_len);
-      for(int i=0; i < mdp.d_qname.length(); ++i)
-        if(!isalnum(mdp.d_qname[i]) && mdp.d_qname[i]!='.' && mdp.d_qname[i]!='-' && mdp.d_qname[i]!='_') {
-          //      cout<<mdp.d_qname<<"|"<<mdp.d_qtype<<"|"<<mdp.d_qclass<<"\n";
-          // sock.sendTo(string(pr.d_payload, pr.d_payload + pr.d_len), remote);
-          break;
+  if(argc<2) {
+    cerr<<"Syntax: dnsscan file1 [file2 ..] "<<endl;
+    exit(1);
+  }
+    
+  for(int n=1; n < argc; ++n) {
+    PcapPacketReader pr(argv[n]);
+    
+    while(pr.getUDPPacket()) {
+      try {
+        MOADNSParser mdp((const char*)pr.d_payload, pr.d_len);
+        for(int i=0; i < mdp.d_qname.length(); ++i)
+          if(!isalnum(mdp.d_qname[i]) && mdp.d_qname[i]!='.' && mdp.d_qname[i]!='-' && mdp.d_qname[i]!='_') {
+            //    cout<<mdp.d_qname<<"|"<<mdp.d_qtype<<"|"<<mdp.d_qclass<<"\n";
+            // sock.sendTo(string(pr.d_payload, pr.d_payload + pr.d_len), remote);
+            break;
+          }
+        if(mdp.d_qtype > 256 || mdp.d_qclass!=1 ) {
+          //    sock.sendTo(string(pr.d_payload, pr.d_payload + pr.d_len), remote);
+          
         }
-      if(mdp.d_qtype > 256 || mdp.d_qclass!=1 ) {
+        for(MOADNSParser::answers_t::const_iterator i=mdp.d_answers.begin(); i!=mdp.d_answers.end(); ++i) {          
+          
+        }
+        
+      }
+      catch(MOADNSException &e) {
+        cout<<"Error from remote "<<U32ToIP(ntohl(*((uint32_t*)&pr.d_ip->ip_src)))<<": "<<e.what()<<"\n";
         //      sock.sendTo(string(pr.d_payload, pr.d_payload + pr.d_len), remote);
-
       }
-      for(MOADNSParser::answers_t::const_iterator i=mdp.d_answers.begin(); i!=mdp.d_answers.end(); ++i) {          
-
-      }
-
-    }
-    catch(MOADNSException &e) {
-      cout<<"Error: "<<e.what()<<"\n";
-      sock.sendTo(string(pr.d_payload, pr.d_payload + pr.d_len), remote);
     }
   }