From: Ralph Covelli <rcovelli@he.net>
Date: Fri, 26 May 2017 02:22:01 +0000 (+0100)
Subject: added CommunicatorClass::LoadArgsIntoSet and fixed some spelling errors
X-Git-Tag: rec-4.1.0-alpha1~90^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d702c27f409cc5b3cf7b0298455de21db73b14c0;p=thirdparty%2Fpdns.git

added CommunicatorClass::LoadArgsIntoSet and fixed some spelling errors
---

diff --git a/docs/markdown/authoritative/settings.md b/docs/markdown/authoritative/settings.md
index 4bfa49097f..c93637bb3a 100644
--- a/docs/markdown/authoritative/settings.md
+++ b/docs/markdown/authoritative/settings.md
@@ -364,10 +364,10 @@ Forward DNS updates sent to a slave to the master.
 ## `forward-notify`
 * IP addresses, separated by commas
 
-IP addresses to send received notifications to regardless of master or slave settings.
+IP addresses to forward received notifications to regardless of master or slave settings.
 
 Note: The intended use is in anycast environments where it might be necessary for a
-proxy server to preform the AXFR.  The usual checks are preformed before any received
+proxy server to perform the AXFR.  The usual checks are performed before any received
 notification is forwarded.
 
 ## `guardian`
diff --git a/pdns/communicator.cc b/pdns/communicator.cc
index 7cd6955d86..dc12ff9961 100644
--- a/pdns/communicator.cc
+++ b/pdns/communicator.cc
@@ -37,21 +37,6 @@
 #include "arguments.hh"
 #include "packetcache.hh"
 
-#define CommunicatorLoadArgsIntoSet(listname, listset) do {                                \
-  vector<string> parts;                                                                    \
-  stringtok(parts, ::arg()[(listname)], ", \t");                                           \
-  for (vector<string>::const_iterator iter = parts.begin(); iter != parts.end(); ++iter) { \
-    try {                                                                                  \
-      ComboAddress caIp(*iter, 53);                                                        \
-      (listset).insert(caIp.toStringWithPort());                                           \
-    }                                                                                      \
-    catch(PDNSException &e) {                                                              \
-      L<<Logger::Error<<"Unparseable IP in "<<(listname)<<". Error: "<<e.reason<<endl;     \
-      exit(1);                                                                             \
-    }                                                                                      \
-  }                                                                                        \
-} while(0)
-
 // there can be MANY OF THESE
 void CommunicatorClass::retrievalLoopThread(void)
 {
@@ -70,6 +55,22 @@ void CommunicatorClass::retrievalLoopThread(void)
   }
 }
 
+void CommunicatorClass::LoadArgsIntoSet(const char *listname, set<string> &listset)
+{
+  vector<string> parts;
+  stringtok(parts, ::arg()[listname], ", \t");
+  for (vector<string>::const_iterator iter = parts.begin(); iter != parts.end(); ++iter) {
+    try {
+      ComboAddress caIp(*iter, 53);
+      listset.insert(caIp.toStringWithPort());
+    }
+    catch(PDNSException &e) {
+      L<<Logger::Error<<"Unparseable IP in "<<listname<<". Error: "<<e.reason<<endl;
+      exit(1);
+    }
+  }
+}
+
 void CommunicatorClass::go()
 {
   try {
@@ -95,9 +96,9 @@ void CommunicatorClass::go()
     exit(1);
   }
 
-  CommunicatorLoadArgsIntoSet("also-notify", d_alsoNotify);
+  LoadArgsIntoSet("also-notify", d_alsoNotify);
 
-  CommunicatorLoadArgsIntoSet("forward-notify", PacketHandler::s_forwardNotify);
+  LoadArgsIntoSet("forward-notify", PacketHandler::s_forwardNotify);
 }
 
 void CommunicatorClass::mainloop(void)
diff --git a/pdns/communicator.hh b/pdns/communicator.hh
index babab1cfb1..f4c543874f 100644
--- a/pdns/communicator.hh
+++ b/pdns/communicator.hh
@@ -187,6 +187,7 @@ public:
   }
   bool notifyDomain(const DNSName &domain);
 private:
+  void LoadArgsIntoSet(const char *listname, set<string> &listset);
   void makeNotifySockets();
   void queueNotifyDomain(const DomainInfo& di, UeberBackend* B);
   int d_nsock4, d_nsock6;