Merge branch 'master' of https://github.com/greearb/xorp.ct

greearb · Sep 10, 2011 · 299047a · 299047a
2 parents 287f717 + 02ee142
commit 299047a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/xorp/libxipc/tests/test_stcp.cc b/xorp/libxipc/tests/test_stcp.cc
@@ -157,8 +157,9 @@ static void
 test_xrlerror_note(EventLoop&e, XrlPFSTCPListener& l)
 {
     Xrl x("anywhere", "no_execute");
+    string t("test");
 
-    XrlPFSTCPSender s(e, l.address());
+    XrlPFSTCPSender s(t, e, l.address());
 
     bool done = false;
     s.send(x, false, callback(no_execute_reply_handler, &done));
@@ -202,7 +203,8 @@ run_test()
 			callback(no_execute_recv_handler, NOISE));
 
     XrlPFSTCPListener listener(eventloop, &cmd_dispatcher);
-    XrlPFSTCPSender s(eventloop, listener.address());
+    string test("test");
+    XrlPFSTCPSender s(test, eventloop, listener.address());
     s.set_keepalive_time(KEEPALIVE_TIME);
 
     tracef("listener address: %s\n", listener.address());
@@ -248,7 +250,8 @@ run_no_keepalive_test()
     setenv("XORP_SENDER_KEEPALIVE_TIME", "0", 1);
 
     XrlPFSTCPListener listener(eventloop, &cmd_dispatcher);
-    XrlPFSTCPSender s(eventloop, listener.address());
+    string test("test");
+    XrlPFSTCPSender s(test, eventloop, listener.address());
 
     tracef("listener address: %s\n", listener.address());
 

diff --git a/xorp/libxorp/tests/test_ipv4net.cc b/xorp/libxorp/tests/test_ipv4net.cc
@@ -108,8 +108,6 @@ test_ipv4net_valid_constructors(TestInfo& test_info)
     // Test values for IPv4 address: "12.34.56.78"
     const char *addr_string = "12.34.56.78";
     uint32_t ui = htonl((12 << 24) | (34 << 16) | (56 << 8) | 78);
-    struct in_addr in_addr;
-    in_addr.s_addr = ui;
     struct sockaddr_in sin;
     memset(&sin, 0, sizeof(sin));
 #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN

diff --git a/xorp/libxorp/tests/test_ipvxnet.cc b/xorp/libxorp/tests/test_ipvxnet.cc
@@ -108,8 +108,6 @@ test_ipvxnet_valid_constructors(TestInfo& test_info)
     // Test values for IPv4 address: "12.34.56.78"
     const char *addr_string4 = "12.34.56.78";
     uint32_t ui = htonl((12 << 24) | (34 << 16) | (56 << 8) | 78);
-    struct in_addr in_addr;
-    in_addr.s_addr = ui;
     struct sockaddr_in sin;
     memset(&sin, 0, sizeof(sin));
 #ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN