From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 10 Jan 2018 10:33:09 +0000 (+0100)
Subject: ixplore: fix all indenting, no functional changes
X-Git-Tag: dnsdist-1.3.0~111^2~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae7af19fe773b8074c2d1b894a6c810b383e5802;p=thirdparty%2Fpdns.git

ixplore: fix all indenting, no functional changes
---

diff --git a/pdns/ixplore.cc b/pdns/ixplore.cc
index 41001dfcb0..43f8cddcc3 100644
--- a/pdns/ixplore.cc
+++ b/pdns/ixplore.cc
@@ -26,7 +26,7 @@
 #include "base64.hh"
 #include <sys/types.h>
 #include <dirent.h>
-              
+
 #include "dnsparser.hh"
 #include "sstuff.hh"
 #include "misc.hh"
@@ -62,20 +62,19 @@ struct CIContentCompareStruct
 };
 
 
-typedef multi_index_container<
+typedef multi_index_container <
   DNSRecord,
     indexed_by<
       ordered_non_unique<
         composite_key<DNSRecord,
-		      member<DNSRecord, DNSName, &DNSRecord::d_name>,
-		      member<DNSRecord, uint16_t, &DNSRecord::d_type>,
-		      member<DNSRecord, uint16_t, &DNSRecord::d_class>,
-		      member<DNSRecord, shared_ptr<DNSRecordContent>, &DNSRecord::d_content> >,
-	composite_key_compare<CanonDNSNameCompare, std::less<uint16_t>, std::less<uint16_t>, CIContentCompareStruct >
-		      
-      >
-    >
-  >records_t;
+                      member<DNSRecord, DNSName, &DNSRecord::d_name>,
+                      member<DNSRecord, uint16_t, &DNSRecord::d_type>,
+                      member<DNSRecord, uint16_t, &DNSRecord::d_class>,
+                      member<DNSRecord, shared_ptr<DNSRecordContent>, &DNSRecord::d_content> >,
+        composite_key_compare<CanonDNSNameCompare, std::less<uint16_t>, std::less<uint16_t>, CIContentCompareStruct >
+      > /* ordered_non_uniquw */
+    > /* indexed_by */
+> /* multi_index_container */ records_t;
 
 uint32_t getSerialFromMaster(const ComboAddress& master, const DNSName& zone, shared_ptr<SOARecordContent>& sr, const TSIGTriplet& tt = TSIGTriplet())
 {
@@ -90,7 +89,7 @@ uint32_t getSerialFromMaster(const ComboAddress& master, const DNSName& zone, sh
     trc.d_eRcode=0;
     addTSIG(pw, trc, tt.name, tt.secret, "", false);
   }
-  
+
   Socket s(master.sin4.sin_family, SOCK_DGRAM);
   s.connect(master);
   string msg((const char*)&packet[0], packet.size());
@@ -116,10 +115,10 @@ uint32_t getSerialsFromDir(const std::string& dir)
 {
   uint32_t ret=0;
   DIR* dirhdl=opendir(dir.c_str());
-  if(!dirhdl) 
+  if(!dirhdl)
     throw runtime_error("Could not open IXFR directory");
   struct dirent *entry;
-  
+
   while((entry = readdir(dirhdl))) {
     uint32_t num = atoi(entry->d_name);
     if(std::to_string(num) == entry->d_name)
@@ -130,7 +129,7 @@ uint32_t getSerialsFromDir(const std::string& dir)
 }
 
 uint32_t getSerialFromRecords(const records_t& records,	DNSRecord& soaret)
-{ 
+{
   DNSName root(".");
   uint16_t t=QType::SOA;
 
@@ -158,10 +157,10 @@ void writeZoneToDisk(const records_t& records, const DNSName& zone, const std::s
   fprintf(fp, "$ORIGIN %s\n", zone.toString().c_str());
   for(const auto& outer : {soarecord, records, soarecord} ) {
     for(const auto& r: outer) {
-      fprintf(fp, "%s\tIN\t%s\t%s\n", 
-	      r.d_name.isRoot() ? "@" :  r.d_name.toStringNoDot().c_str(),
-	      DNSRecordContent::NumberToType(r.d_type).c_str(),
-	      r.d_content->getZoneRepresentation().c_str());
+      fprintf(fp, "%s\tIN\t%s\t%s\n",
+          r.d_name.isRoot() ? "@" :  r.d_name.toStringNoDot().c_str(),
+          DNSRecordContent::NumberToType(r.d_type).c_str(),
+          r.d_content->getZoneRepresentation().c_str());
     }
   }
   fclose(fp);
@@ -180,7 +179,7 @@ void loadZoneFromDisk(records_t& records, const string& fname, const DNSName& zo
     if(rr.qtype.getCode() == QType::CNAME && rr.content.empty())
       rr.content=".";
     rr.qname = rr.qname.makeRelative(zone);
-    
+
     if(rr.qtype.getCode() != QType::SOA || seenSOA==false)
       records.insert(DNSRecord(rr));
     if(rr.qtype.getCode() == QType::SOA) {
@@ -202,197 +201,197 @@ void usage() {
   cerr<<"Syntax: ixplore track IP-ADDRESS PORT ZONE DIRECTORY [TSIGKEY TSIGALGO TSIGSECRET]"<<endl;
 }
 
-int main(int argc, char** argv)
-try
-{
-  for(int n=1 ; n < argc; ++n) {
-    if ((string) argv[n] == "--help") {
-      usage();
-      return EXIT_SUCCESS;
-    }
+int main(int argc, char** argv) {
+  try {
+    for(int n=1 ; n < argc; ++n) {
+      if ((string) argv[n] == "--help") {
+        usage();
+        return EXIT_SUCCESS;
+      }
 
-    if ((string) argv[n] == "--version") {
-      cerr<<"ixplore "<<VERSION<<endl;
-      return EXIT_SUCCESS;
+      if ((string) argv[n] == "--version") {
+        cerr<<"ixplore "<<VERSION<<endl;
+        return EXIT_SUCCESS;
+      }
     }
-  }
 
-  reportAllTypes();
-  string command;
-  if(argc < 5 || (command=argv[1], (command!="diff" && command !="track"))) {
-    usage();
-    exit(EXIT_FAILURE);
-  }
-  if(command=="diff") {
-    records_t before, after;
-    DNSName zone(argv[2]);
-    cout<<"Loading before from "<<argv[3]<<endl;
-    loadZoneFromDisk(before, argv[3], zone);
-    cout<<"Loading after from "<<argv[4]<<endl;
-    loadZoneFromDisk(after, argv[4], zone);
-
-    vector<DNSRecord> diff;
-
-    set_difference(before.cbegin(), before.cend(), after.cbegin(), after.cend(), back_inserter(diff), before.value_comp());
-    for(const auto& d : diff) {
-      cout<<'-'<< (d.d_name+zone) <<" IN "<<DNSRecordContent::NumberToType(d.d_type)<<" "<<d.d_content->getZoneRepresentation()<<endl;
+    reportAllTypes();
+    string command;
+    if(argc < 5 || (command=argv[1], (command!="diff" && command !="track"))) {
+      usage();
+      exit(EXIT_FAILURE);
     }
-    diff.clear();
-    set_difference(after.cbegin(), after.cend(), before.cbegin(), before.cend(), back_inserter(diff), before.value_comp());
-    for(const auto& d : diff) {
-      cout<<'+'<< (d.d_name+zone) <<" IN "<<DNSRecordContent::NumberToType(d.d_type)<<" "<<d.d_content->getZoneRepresentation()<<endl;
+    if(command=="diff") {
+      records_t before, after;
+      DNSName zone(argv[2]);
+      cout<<"Loading before from "<<argv[3]<<endl;
+      loadZoneFromDisk(before, argv[3], zone);
+      cout<<"Loading after from "<<argv[4]<<endl;
+      loadZoneFromDisk(after, argv[4], zone);
+
+      vector<DNSRecord> diff;
+
+      set_difference(before.cbegin(), before.cend(), after.cbegin(), after.cend(), back_inserter(diff), before.value_comp());
+      for(const auto& d : diff) {
+        cout<<'-'<< (d.d_name+zone) <<" IN "<<DNSRecordContent::NumberToType(d.d_type)<<" "<<d.d_content->getZoneRepresentation()<<endl;
+      }
+      diff.clear();
+      set_difference(after.cbegin(), after.cend(), before.cbegin(), before.cend(), back_inserter(diff), before.value_comp());
+      for(const auto& d : diff) {
+        cout<<'+'<< (d.d_name+zone) <<" IN "<<DNSRecordContent::NumberToType(d.d_type)<<" "<<d.d_content->getZoneRepresentation()<<endl;
+      }
+      exit(1);
     }
-    exit(1);
-  }
-  
-  // must be "track" then
+
+    // must be "track" then
 
     /* goal in life:
-     in directory/zone-name we leave files with their name the serial number
-     at startup, retrieve current SOA SERIAL for domain from master server
-     
-     compare with what the best is we have in our directory, IXFR from that.
-     Store result in memory, read that best zone in memory, apply deltas, write it out.
+       in directory/zone-name we leave files with their name the serial number
+       at startup, retrieve current SOA SERIAL for domain from master server
 
-     Next up, loop this every REFRESH seconds */
-  dns_random_init("0123456789abcdef");
+       compare with what the best is we have in our directory, IXFR from that.
+       Store result in memory, read that best zone in memory, apply deltas, write it out.
 
-  DNSName zone(argv[4]);
-  ComboAddress master(argv[2], atoi(argv[3]));
-  string directory(argv[5]);
-  records_t records;
+       Next up, loop this every REFRESH seconds */
+    dns_random_init("0123456789abcdef");
 
-  uint32_t ourSerial = getSerialsFromDir(directory);
+    DNSName zone(argv[4]);
+    ComboAddress master(argv[2], atoi(argv[3]));
+    string directory(argv[5]);
+    records_t records;
 
-  cout<<"Loading zone, our highest available serial is "<< ourSerial<<endl;
+    uint32_t ourSerial = getSerialsFromDir(directory);
 
-  TSIGTriplet tt;
-  if(argc > 6)
-    tt.name=DNSName(toLower(argv[6]));
-  if(argc > 7)
-    tt.algo=DNSName(toLower(argv[7]));
+    cout<<"Loading zone, our highest available serial is "<< ourSerial<<endl;
 
-  if(argc > 8) {
-    if(B64Decode(argv[8], tt.secret) < 0) {
-      cerr<<"Could not decode tsig secret!"<<endl;
-      exit(EXIT_FAILURE);
-    }
-  }
+    TSIGTriplet tt;
+    if(argc > 6)
+      tt.name=DNSName(toLower(argv[6]));
+    if(argc > 7)
+      tt.algo=DNSName(toLower(argv[7]));
 
-  try {
-    if(!ourSerial)
-      throw std::runtime_error("There is no local zone available");
-    string fname=directory+"/"+std::to_string(ourSerial);
-    cout<<"Loading serial number "<<ourSerial<<" from file "<<fname<<endl;
-    loadZoneFromDisk(records, fname, zone);
-  }
-  catch(std::exception& e) {
-    cout<<"Could not load zone from disk: "<<e.what()<<endl;
-    cout<<"Retrieving latest from master "<<master.toStringWithPort()<<endl;
-    ComboAddress local = master.sin4.sin_family == AF_INET ? ComboAddress("0.0.0.0") : ComboAddress("::");
-    AXFRRetriever axfr(master, zone, tt, &local);
-    unsigned int nrecords=0;
-    Resolver::res_t nop;
-    vector<DNSRecord> chunk;
-    char wheel[]="|/-\\";
-    int count=0;
-    time_t last=0;
-    while(axfr.getChunk(nop, &chunk)) {
-      for(auto& dr : chunk) {
-        if(dr.d_type == QType::TSIG)
-          continue;
-	dr.d_name.makeUsRelative(zone);
-	records.insert(dr);
-	nrecords++;
-      } 
-    
-      if(last != time(0)) {
-	cout << '\r' << wheel[count % (sizeof(wheel)-1)] << ' ' <<nrecords;
-	count++;
-	cout.flush();
-	last=time(0);
+    if(argc > 8) {
+      if(B64Decode(argv[8], tt.secret) < 0) {
+        cerr<<"Could not decode tsig secret!"<<endl;
+        exit(EXIT_FAILURE);
       }
     }
-    cout <<"\rDone, got "<<nrecords<<"                                            "<<endl;
-    cout<<"Writing to disk.."<<endl;
-    writeZoneToDisk(records, zone, directory);
-  }
 
-  for(;;) {
-    DNSRecord ourSoa;
-    ourSerial = getSerialFromRecords(records, ourSoa);
-
-    cout<<"Checking for update, our serial number is "<<ourSerial<<".. ";
-    cout.flush();
-    shared_ptr<SOARecordContent> sr;
-    uint32_t serial = getSerialFromMaster(master, zone, sr, tt);
-    if(ourSerial == serial) {
-      cout<<"still up to date, their serial is "<<serial<<", sleeping "<<sr->d_st.refresh<<" seconds"<<endl;
-      sleep(sr->d_st.refresh);
-      continue;
+    try {
+      if(!ourSerial)
+        throw std::runtime_error("There is no local zone available");
+      string fname=directory+"/"+std::to_string(ourSerial);
+      cout<<"Loading serial number "<<ourSerial<<" from file "<<fname<<endl;
+      loadZoneFromDisk(records, fname, zone);
     }
-
-    cout<<"got new serial: "<<serial<<", initiating IXFR!"<<endl;
-    auto deltas = getIXFRDeltas(master, zone, ourSoa, tt);
-    cout<<"Got "<<deltas.size()<<" deltas, applying.."<<endl;
-
-    for(const auto& delta : deltas) {
-    
-      const auto& remove = delta.first;
-      const auto& add = delta.second;
-
-      ourSerial=getSerialFromRecords(records, ourSoa);
-      uint32_t newserial=0;
-      for(const auto& rr : add) {
-	if(rr.d_type == QType::SOA) {
-	  newserial=std::dynamic_pointer_cast<SOARecordContent>(rr.d_content)->d_st.serial;
-	}
-      }
-
-      cout<<"This delta ("<<ourSerial<<" - "<<newserial<<") has "<<remove.size()<<" removals, "<<add.size()<<" additions"<<endl;
-      ofstream report(directory +"/delta."+std::to_string(ourSerial)+"-"+std::to_string(newserial));      
-      if(remove.empty()) {
-        cout<<"This delta is a whole new zone"<<endl;
-        report<<"- everything, whole new zone update follow"<<endl;
-        records.clear();
+    catch(std::exception& e) {
+      cout<<"Could not load zone from disk: "<<e.what()<<endl;
+      cout<<"Retrieving latest from master "<<master.toStringWithPort()<<endl;
+      ComboAddress local = master.sin4.sin_family == AF_INET ? ComboAddress("0.0.0.0") : ComboAddress("::");
+      AXFRRetriever axfr(master, zone, tt, &local);
+      unsigned int nrecords=0;
+      Resolver::res_t nop;
+      vector<DNSRecord> chunk;
+      char wheel[]="|/-\\";
+      int count=0;
+      time_t last=0;
+      while(axfr.getChunk(nop, &chunk)) {
+        for(auto& dr : chunk) {
+          if(dr.d_type == QType::TSIG)
+            continue;
+          dr.d_name.makeUsRelative(zone);
+          records.insert(dr);
+          nrecords++;
+        }
+
+        if(last != time(0)) {
+          cout << '\r' << wheel[count % (sizeof(wheel)-1)] << ' ' <<nrecords;
+          count++;
+          cout.flush();
+          last=time(0);
+        }
       }
+      cout <<"\rDone, got "<<nrecords<<"                                            "<<endl;
+      cout<<"Writing to disk.."<<endl;
+      writeZoneToDisk(records, zone, directory);
+    }
 
-      bool stop=false;
-
-      for(const auto& rr : remove) {
-	report<<'-'<< (rr.d_name+zone) <<" IN "<<DNSRecordContent::NumberToType(rr.d_type)<<" "<<rr.d_content->getZoneRepresentation()<<endl;
-	auto range = records.equal_range(tie(rr.d_name, rr.d_type, rr.d_class, rr.d_content));
-	if(range.first == range.second) {
-	  cout<<endl<<" !! Could not find record "<<rr.d_name<<" to remove!!"<<endl;
-	  //	  stop=true;
-	  report.flush();
-	}
-	records.erase(range.first, range.second);
+    for(;;) {
+      DNSRecord ourSoa;
+      ourSerial = getSerialFromRecords(records, ourSoa);
+
+      cout<<"Checking for update, our serial number is "<<ourSerial<<".. ";
+      cout.flush();
+      shared_ptr<SOARecordContent> sr;
+      uint32_t serial = getSerialFromMaster(master, zone, sr, tt);
+      if(ourSerial == serial) {
+        cout<<"still up to date, their serial is "<<serial<<", sleeping "<<sr->d_st.refresh<<" seconds"<<endl;
+        sleep(sr->d_st.refresh);
+        continue;
       }
 
-      for(const auto& rr : add) {
-	report<<'+'<< (rr.d_name+zone) <<" IN "<<DNSRecordContent::NumberToType(rr.d_type)<<" "<<rr.d_content->getZoneRepresentation()<<endl;
-	records.insert(rr);
-      }
-      if(stop) {
-	cerr<<"Had error condition, stopping.."<<endl;
-	report.flush();
-	exit(1);
+      cout<<"got new serial: "<<serial<<", initiating IXFR!"<<endl;
+      auto deltas = getIXFRDeltas(master, zone, ourSoa, tt);
+      cout<<"Got "<<deltas.size()<<" deltas, applying.."<<endl;
+
+      for(const auto& delta : deltas) {
+
+        const auto& remove = delta.first;
+        const auto& add = delta.second;
+
+        ourSerial=getSerialFromRecords(records, ourSoa);
+        uint32_t newserial=0;
+        for(const auto& rr : add) {
+          if(rr.d_type == QType::SOA) {
+            newserial=std::dynamic_pointer_cast<SOARecordContent>(rr.d_content)->d_st.serial;
+          }
+        }
+
+        cout<<"This delta ("<<ourSerial<<" - "<<newserial<<") has "<<remove.size()<<" removals, "<<add.size()<<" additions"<<endl;
+        ofstream report(directory +"/delta."+std::to_string(ourSerial)+"-"+std::to_string(newserial));
+        if(remove.empty()) {
+          cout<<"This delta is a whole new zone"<<endl;
+          report<<"- everything, whole new zone update follow"<<endl;
+          records.clear();
+        }
+
+        bool stop=false;
+
+        for(const auto& rr : remove) {
+          report<<'-'<< (rr.d_name+zone) <<" IN "<<DNSRecordContent::NumberToType(rr.d_type)<<" "<<rr.d_content->getZoneRepresentation()<<endl;
+          auto range = records.equal_range(tie(rr.d_name, rr.d_type, rr.d_class, rr.d_content));
+          if(range.first == range.second) {
+            cout<<endl<<" !! Could not find record "<<rr.d_name<<" to remove!!"<<endl;
+            //	  stop=true;
+            report.flush();
+          }
+          records.erase(range.first, range.second);
+        }
+
+        for(const auto& rr : add) {
+          report<<'+'<< (rr.d_name+zone) <<" IN "<<DNSRecordContent::NumberToType(rr.d_type)<<" "<<rr.d_content->getZoneRepresentation()<<endl;
+          records.insert(rr);
+        }
+        if(stop) {
+          cerr<<"Had error condition, stopping.."<<endl;
+          report.flush();
+          exit(1);
+        }
       }
+      cout<<"Writing zone to disk.. "; cout.flush();
+      writeZoneToDisk(records, zone, directory);
+      cout<<"Done"<<endl;
     }
-    cout<<"Writing zone to disk.. "; cout.flush();
-    writeZoneToDisk(records, zone, directory);
-    cout<<"Done"<<endl;
   }
-}
-catch(PDNSException &e2) {
-  cerr<<"Fatal: "<<e2.reason<<endl;
-}
-catch(std::exception &e)
-{
-  cerr<<"Fatal: "<<e.what()<<endl;
-}
-catch(...)
-{
-  cerr<<"Any other exception"<<endl;
+  catch(PDNSException &e2) {
+    cerr<<"Fatal: "<<e2.reason<<endl;
+  }
+  catch(std::exception &e)
+  {
+    cerr<<"Fatal: "<<e.what()<<endl;
+  }
+  catch(...)
+  {
+    cerr<<"Any other exception"<<endl;
+  }
 }