ping target is now optional. nexthop will be used in place of ping target if ping target is not specified. this is also true of dhcp configurations.

2 files changed, 13 insertions, 3 deletions

diff --git a/src/lboutput.cc b/src/lboutput.cc
index a20a72e..ff915ec 100644
--- a/src/lboutput.cc
+++ b/src/lboutput.cc
@@ -60,7 +60,12 @@ LBOutput::write(const LBData &lbdata)
 
     line += space + string("Last Status Change:  ") + string(tbuf);
 
-    line += space + string("Target:  Ping ") + iter->second._ping_target + "\n";
+    string target = iter->second._ping_target;
+    if (target.empty()) {
+      target = iter->second._nexthop;
+    }
+
+    line += space + string("Target:  Ping ") + target + "\n";
 
     char btmp[256];
     string time_buf;
diff --git a/src/lbpathtest.cc b/src/lbpathtest.cc
index df29921..ebe55cd 100644
--- a/src/lbpathtest.cc
+++ b/src/lbpathtest.cc
@@ -101,11 +101,16 @@ LBPathTest::start(LBData &lb_data)
   //iterate over packets and send
   LBData::InterfaceHealthIter iter = lb_data._iface_health_coll.begin();
   while (iter != lb_data._iface_health_coll.end()) {
+    string target = iter->second._ping_target;
+    if (target.empty()) {
+      target = iter->second._nexthop;
+    }
+
     if (_debug) {
-      cout << "LBPathTest::start(): sending ping test for: " << iter->first << " for " << iter->second._ping_target << endl;
+      cout << "LBPathTest::start(): sending ping test for: " << iter->first << " for " << target << endl;
     }
     _packet_id = ++_packet_id % 32767;
-    send(iter->first, iter->second._ping_target, _packet_id);
+    send(iter->first, target, _packet_id);
     results.insert(pair<int,PktData>(_packet_id,PktData(iter->first,-1)));
 
     ++ct;