From 56e646f55db6e66f9381b75fe638b45cbeaf5d09 Mon Sep 17 00:00:00 2001
From: Ralph Covelli <rcovelli@he.net>
Date: Fri, 12 May 2017 04:40:14 +0100
Subject: [PATCH] Refactored some redundant loops in CommunicatorClass::go()

---
 pdns/communicator.cc | 41 +++++++++++++++++------------------------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/pdns/communicator.cc b/pdns/communicator.cc
index eff4f2bb74..6958a8ef3a 100644
--- a/pdns/communicator.cc
+++ b/pdns/communicator.cc
@@ -37,6 +37,21 @@
 #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)
 {
@@ -80,31 +95,9 @@ void CommunicatorClass::go()
     exit(1);
   }
 
-  vector<string> parts;
-  stringtok(parts, ::arg()["also-notify"], ", \t");
-  for (vector<string>::const_iterator iter = parts.begin(); iter != parts.end(); ++iter) {
-    try {
-      ComboAddress caIp(*iter, 53);
-      d_alsoNotify.insert(caIp.toStringWithPort());
-    }
-    catch(PDNSException &e) {
-      L<<Logger::Error<<"Unparseable IP in also-notify. Error: "<<e.reason<<endl;
-      exit(1);
-    }
-  }
+  CommunicatorLoadArgsIntoSet("also-notify",d_alsoNotify);
 
-  vector<string> forwards;
-  stringtok(forwards, ::arg()["forward-notify"], ", \t");
-  for (vector<string>::const_iterator iter = forwards.begin(); iter != forwards.end(); ++iter) {
-    try {
-      ComboAddress caIp(*iter, 53);
-      PacketHandler::s_forwardNotify.insert(caIp.toStringWithPort());
-    }
-    catch(PDNSException &e) {
-      L<<Logger::Error<<"Unparseable IP in forward-notify. Error: "<<e.reason<<endl;
-      exit(1);
-    }
-  }
+  CommunicatorLoadArgsIntoSet("forward-notify",PacketHandler::s_forwardNotify);
 }
 
 void CommunicatorClass::mainloop(void)
-- 
2.47.2