Changeset 1381

Timestamp:

07/30/09 22:00:16 (8 months ago)

Author:

ahu

Message:

the big std::exception cleanup for newer boost for 3.1.7.1, 1274, 1275, 1276

Location:

tags/pdns-3.1.7.1/pdns

Files:

• dnsdemog.cc (modified) (2 diffs)
• dnsgram.cc (modified) (2 diffs)
• dnspacket.cc (modified) (2 diffs)
• dnspbench.cc (modified) (1 diff)
• dnsproxy.cc (modified) (1 diff)
• dnsreplay.cc (modified) (2 diffs)
• dnsscan.cc (modified) (1 diff)
• dnsscope.cc (modified) (2 diffs)
• dnswasher.cc (modified) (1 diff)
• dynlistener.cc (modified) (1 diff)
• lwres.cc (modified) (1 diff)
• notify.cc (modified) (1 diff)
• nproxy.cc (modified) (3 diffs)
• packethandler.cc (modified) (1 diff)
• pdns_recursor.cc (modified) (10 diffs)
• rcpgenerator.cc (modified) (1 diff)
• receiver.cc (modified) (1 diff)
• tcpreceiver.cc (modified) (1 diff)
• webserver.cc (modified) (2 diffs)
• win32_pdns_recursor.cc (modified) (2 diffs)

tags/pdns-3.1.7.1/pdns/dnsdemog.cc

@@ -72 +72 @@
           continue;
         }
-        catch(exception& e) {
+        catch(std::exception& e) {
           cerr << e.what() << endl;
           continue;
@@ -88 +88 @@
 
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cerr<<"Fatal: "<<e.what()<<endl;

tags/pdns-3.1.7.1/pdns/dnsgram.cc

@@ -155 +155 @@
           continue;
         }
-        catch(exception& e) {
+        catch(std::exception& e) {
           cerr << e.what() << endl;
           continue;
@@ -188 +188 @@
   }
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cerr<<"Fatal: "<<e.what()<<endl;

tags/pdns-3.1.7.1/pdns/dnspacket.cc

@@ -323 +323 @@
       pw.commit();
     }
-    catch(exception& e) {
+    catch(std::exception& e) {
       L<<Logger::Error<<"Exception: "<<e.what()<<endl;
       throw;
@@ -434 +434 @@
   return 0;
 }
-catch(exception& e) {
+catch(std::exception& e) {
   return -1;
 }

tags/pdns-3.1.7.1/pdns/dnspbench.cc

@@ -90 +90 @@
 #endif
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cerr<<"Fatal: "<<e.what()<<"\n";

tags/pdns-3.1.7.1/pdns/dnsproxy.cc

@@ -204 +204 @@
     L<<Logger::Error<<"Fatal error in DNS proxy: "<<ae.reason<<endl;
   }
-  catch(exception &e) {
+  catch(std::exception &e) {
     L<<Logger::Error<<"Communicator thread died because of STL error: "<<e.what()<<endl;
   }

tags/pdns-3.1.7.1/pdns/dnsreplay.cc

@@ -381 +381 @@
 
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cerr<<"Receiver thread died: "<<e.what()<<endl;
@@ -655 +655 @@
  out:;
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cerr<<"Fatal: "<<e.what()<<endl;

tags/pdns-3.1.7.1/pdns/dnsscan.cc

@@ -79 +79 @@
 
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cout<<"Fatal: "<<e.what()<<endl;

tags/pdns-3.1.7.1/pdns/dnsscope.cc

@@ -115 +115 @@
         continue;
       }
-      catch(exception& e) {
+      catch(std::exception& e) {
         if(pw)
           pw->write();
@@ -212 +212 @@
     cerr<<"Average response time: "<<tottime/totpackets<<" usec"<<endl;
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cerr<<"Fatal: "<<e.what()<<endl;

tags/pdns-3.1.7.1/pdns/dnswasher.cc

@@ -75 +75 @@
     pr.d_nonetheripudp<<" unknown encaps"<<endl;
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cerr<<"Fatal: "<<e.what()<<endl;

tags/pdns-3.1.7.1/pdns/dynlistener.cc

@@ -236 +236 @@
       L<<Logger::Error<<"Fatal error 2 in control listener: "<<E<<endl;
     }
-  catch(exception& e)
+  catch(std::exception& e)
     {
       L<<Logger::Error<<"Fatal STL error: "<<e.what()<<endl;

tags/pdns-3.1.7.1/pdns/lwres.cc

@@ -182 +182 @@
     return 1;
   }
-  catch(exception &mde) {
+  catch(std::exception &mde) {
     if(::arg().mustDo("log-common-errors"))
       L<<Logger::Notice<<"Unable to parse packet from remote server "<<ip.toString()<<": "<<mde.what()<<endl;

tags/pdns-3.1.7.1/pdns/notify.cc

@@ -53 +53 @@
   cerr<<"For: '"<<mdp.d_qname<<"'"<<endl;
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cerr<<"Fatal: "<<e.what()<<endl;

tags/pdns-3.1.7.1/pdns/nproxy.cc

@@ -111 +111 @@
 
 }
-catch(exception &e)
+catch(std::exception &e)
 {
   syslogFmt(boost::format("Error parsing packet from external nameserver: %s") % e.what());
@@ -160 +160 @@
 
 }
-catch(exception &e)
+catch(std::exception &e)
 {
   syslogFmt(boost::format("Error parsing packet from internal nameserver: %s") % e.what());
@@ -294 +294 @@
   syslogFmt(boost::format("Error parsing command line options: %s") % e.what());
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   syslogFmt(boost::format("Fatal: %s") % e.what());

tags/pdns-3.1.7.1/pdns/packethandler.cc

@@ -934 +934 @@
     S.ringAccount("servfail-queries",p->qdomain);
   }
-  catch(exception &e) {
+  catch(std::exception &e) {
     L<<Logger::Error<<"Exception building answer packet ("<<e.what()<<") sending out servfail"<<endl;
     delete r;

tags/pdns-3.1.7.1/pdns/pdns_recursor.cc

@@ -569 +569 @@
       if(ret.size()) {
         shuffle(ret);
-
+        
         for(vector<DNSResourceRecord>::const_iterator i=ret.begin(); i!=ret.end(); ++i) {
           pw.startRecord(i->qname, i->qtype.getCode(), i->ttl, i->qclass, (DNSPacketWriter::Place)i->d_place); 
@@ -667 +667 @@
     L<<Logger::Error<<"DNS parser error: "<<dc->d_mdp.d_qname<<", "<<e.what()<<endl;
   }
-  catch(exception& e) {
+  catch(std::exception& e) {
     L<<Logger::Error<<"STL error: "<<e.what()<<endl;
   }
@@ -881 +881 @@
            questionExpand(data, len, qname, sizeof(qname), type);  
         }
-        catch(exception &e)
+        catch(std::exception &e)
         {
            throw MOADNSException(e.what());
@@ -1184 +1184 @@
     command();
   }
-  catch(exception& e) {
+  catch(std::exception& e) {
     L<<Logger::Error<<"Error dealing with control socket request: "<<e.what()<<endl;
   }
@@ -1487 +1487 @@
     return "ok\n";
   }
-  catch(exception& e) {
+  catch(std::exception& e) {
     L<<Logger::Error<<"Had error reloading zones, keeping original data: "<<e.what()<<endl;
   }
@@ -1526 +1526 @@
             rr=String2DNSRR(rr.qname, rr.qtype, tmp, rr.ttl);
           }
-          catch(exception &e) {
+          catch(std::exception &e) {
             throw AhuException("Error parsing record '"+rr.qname+"' of type "+rr.qtype.getName()+" in zone '"+headers.first+"' from file '"+headers.second+"': "+e.what());
           }
@@ -1648 +1648 @@
     }
   }
-  catch(exception& e) {
+  catch(std::exception& e) {
     L<<Logger::Error<<"Retaining current script, error from '"<<fname<<"': "<< e.what() <<endl;
     return string("Retaining current script, error from '"+fname+"': "+string(e.what())+"\n");
@@ -1772 +1772 @@
     
   }
-  catch(exception &e) {
+  catch(std::exception &e) {
     L<<Logger::Error<<"Failed to load 'lua' script from '"<<::arg()["lua-dns-script"]<<"': "<<e.what()<<endl;
     exit(99);
@@ -1987 +1987 @@
 #endif
     ::arg().set("config-dir","Location of configuration directory (recursor.conf)")=SYSCONFDIR;
+#ifndef WIN32
+    ::arg().set("socket-owner","Owner of socket")="";
+    ::arg().set("socket-group","Group of socket")="";
+    ::arg().set("socket-mode", "Permissions for socket")="";
+#endif
+    
     ::arg().set("socket-dir","Where the controlsocket will live")=LOCALSTATEDIR;
     ::arg().set("delegation-only","Which domains we only accept delegations from")="";
@@ -2061 +2067 @@
     ret=EXIT_FAILURE;
   }
-  catch(exception &e) {
+  catch(std::exception &e) {
     L<<Logger::Error<<"STL Exception: "<<e.what()<<endl;
     ret=EXIT_FAILURE;

tags/pdns-3.1.7.1/pdns/rcpgenerator.cc

@@ -461 +461 @@
   
 }
-catch(exception& e)
+catch(std::exception& e)
 {
   cerr<<"Fatal: "<<e.what()<<endl;

tags/pdns-3.1.7.1/pdns/receiver.cc

@@ -568 +568 @@
     L<<Logger::Error<<"Exiting because: "<<AE.reason<<endl;
   }      
-  catch(exception &e) {
+  catch(std::exception &e) {
     if(!::arg().mustDo("daemon"))
       cerr<<"Exiting because of STL error: "<<e.what()<<endl;

tags/pdns-3.1.7.1/pdns/tcpreceiver.cc

@@ -324 +324 @@
     L<<Logger::Error<<"TCP nameserver had error, cycling backend: "<<ae.reason<<endl;
   }
-  catch(exception &e) {
+  catch(std::exception &e) {
     L<<Logger::Error<<"TCP Connection Thread died because of STL error: "<<e.what()<<endl;
   }

tags/pdns-3.1.7.1/pdns/webserver.cc

@@ -172 +172 @@
     L<<Logger::Error<<"Exception in webserver: "<<e.reason<<endl;
   }
-  catch(exception &e) {
+  catch(std::exception &e) {
     L<<Logger::Error<<"STL Exception in webserver: "<<e.what()<<endl;
   }
@@ -216 +216 @@
     L<<Logger::Error<<"Fatal error in main webserver thread: "<<e.reason<<endl;
   }
-  catch(exception &e) {
+  catch(std::exception &e) {
     L<<Logger::Error<<"STL Exception in main webserver thread: "<<e.what()<<endl;
   }

tags/pdns-3.1.7.1/pdns/win32_pdns_recursor.cc

@@ -597 +597 @@
     L<<Logger::Error<<"Exception: "<<ae.reason<<endl;
   }
-  catch(exception &e) {
+  catch(std::exception &e) {
     L<<Logger::Error<<"STL Exception: "<<e.what()<<endl;
   }
@@ -718 +718 @@
     L<<Logger::Error<<"Exception: "<<ae.reason<<endl;
   }
-  catch(exception &e) {
+  catch(std::exception &e) {
     L<<Logger::Error<<"STL Exception: "<<e.what()<<endl;
   }