From 2c42f5ec145f1332f23498313473af3d5b24ab44 Mon Sep 17 00:00:00 2001 From: Brandon Stepler Date: Mon, 8 Mar 2021 12:40:00 -0500 Subject: wanloadbalance: T3395: fix DHCP filename and ICMP status line --- src/lbdata.cc | 2 +- src/lbtest_icmp.cc | 11 ----------- src/lbtest_icmp.hh | 3 --- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/lbdata.cc b/src/lbdata.cc index 60578de..ed36e37 100644 --- a/src/lbdata.cc +++ b/src/lbdata.cc @@ -332,7 +332,7 @@ LBData::update_dhcp_nexthop() LBData::InterfaceHealthIter h_iter = _iface_health_coll.begin(); while (h_iter != _iface_health_coll.end()) { if (h_iter->second._nexthop == "dhcp") { - string file("/var/lib/dhcp/dhclient_"+h_iter->first+"_lease"); + string file("/var/lib/dhcp/dhclient_"+h_iter->first+".lease"); FILE *fp = fopen(file.c_str(),"r"); if (fp) { char str[1025]; diff --git a/src/lbtest_icmp.cc b/src/lbtest_icmp.cc index 5bdc14d..743895c 100644 --- a/src/lbtest_icmp.cc +++ b/src/lbtest_icmp.cc @@ -173,17 +173,6 @@ LBTestICMP::send(int send_sock, const string &iface, const string &target_addr, } } -/** - * - * - **/ -string -LBTestICMP::status() -{ - //set the status line to be used when the show command is invoked - return name() + "\t" + string("Target: ") + _target; -} - /** diff --git a/src/lbtest_icmp.hh b/src/lbtest_icmp.hh index 2de9115..e081f49 100644 --- a/src/lbtest_icmp.hh +++ b/src/lbtest_icmp.hh @@ -38,9 +38,6 @@ public: string name() {return string("ping");} - string - status(); - private: void send(int sock, const string &iface, const string &target_addr, int packet_id); -- cgit v1.2.3