docs: fix a typo in history file

[bbaumbach/samba-autobuild/.git] / source4 / lib / socket / testsuite.c

diff --git a/source4/lib/socket/testsuite.c b/source4/lib/socket/testsuite.c
index 0195064a800158aff6aec35dd0e05f79c122b1d0..1df96e3ccf705ec6150cd0156009cde52490bafe 100644 (file)
--- a/source4/lib/socket/testsuite.c
+++ b/source4/lib/socket/testsuite.c
@@ -25,6 +25,7 @@
 #include "system/network.h"
 #include "lib/socket/netif.h"
 #include "torture/torture.h"
+#include "torture/local/proto.h"
 #include "param/param.h"
 #include "libcli/resolve/resolve.h"
 
@@ -42,18 +43,16 @@ static bool test_udp(struct torture_context *tctx)
        TALLOC_CTX *mem_ctx = tctx;
        struct interface *ifaces;
 
-       load_interfaces(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces);
+       load_interface_list(tctx, tctx->lp_ctx, &ifaces);
 
-       status = socket_create("ip", SOCKET_TYPE_DGRAM, &sock1, 0);
+       status = socket_create(mem_ctx, "ip", SOCKET_TYPE_DGRAM, &sock1, 0);
        torture_assert_ntstatus_ok(tctx, status, "creating DGRAM IP socket 1");
-       talloc_steal(mem_ctx, sock1);
 
-       status = socket_create("ip", SOCKET_TYPE_DGRAM, &sock2, 0);
+       status = socket_create(mem_ctx, "ip", SOCKET_TYPE_DGRAM, &sock2, 0);
        torture_assert_ntstatus_ok(tctx, status, "creating DGRAM IP socket 1");
-       talloc_steal(mem_ctx, sock2);
 
        localhost = socket_address_from_strings(sock1, sock1->backend_name, 
-                                               iface_best_ip(ifaces, "127.0.0.1"), 0);
+                                               iface_list_best_ip(ifaces, "127.0.0.1"), 0);
 
        torture_assert(tctx, localhost, "Localhost not found");
 
@@ -62,10 +61,10 @@ static bool test_udp(struct torture_context *tctx)
 
        srv_addr = socket_get_my_addr(sock1, mem_ctx);
        torture_assert(tctx, srv_addr != NULL && 
-                      strcmp(srv_addr->addr, iface_best_ip(ifaces, "127.0.0.1")) == 0,
+                      strcmp(srv_addr->addr, iface_list_best_ip(ifaces, "127.0.0.1")) == 0,
                                   talloc_asprintf(tctx, 
                "Expected server address of %s but got %s",
-                     iface_best_ip(ifaces, "127.0.0.1"), srv_addr ? srv_addr->addr : NULL));
+                     iface_list_best_ip(ifaces, "127.0.0.1"), srv_addr ? srv_addr->addr : NULL));
 
        torture_comment(tctx, "server port is %d\n", srv_addr->port);
 
@@ -127,17 +126,15 @@ static bool test_tcp(struct torture_context *tctx)
        struct tevent_context *ev = tctx->ev;
        struct interface *ifaces;
 
-       status = socket_create("ip", SOCKET_TYPE_STREAM, &sock1, 0);
+       status = socket_create(mem_ctx, "ip", SOCKET_TYPE_STREAM, &sock1, 0);
        torture_assert_ntstatus_ok(tctx, status, "creating IP stream socket 1");
-       talloc_steal(mem_ctx, sock1);
 
-       status = socket_create("ip", SOCKET_TYPE_STREAM, &sock2, 0);
+       status = socket_create(mem_ctx, "ip", SOCKET_TYPE_STREAM, &sock2, 0);
        torture_assert_ntstatus_ok(tctx, status, "creating IP stream socket 1");
-       talloc_steal(mem_ctx, sock2);
 
-       load_interfaces(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces);
+       load_interface_list(tctx, tctx->lp_ctx, &ifaces);
        localhost = socket_address_from_strings(sock1, sock1->backend_name, 
-                                               iface_best_ip(ifaces, "127.0.0.1"), 0);
+                                               iface_list_best_ip(ifaces, "127.0.0.1"), 0);
        torture_assert(tctx, localhost, "Localhost not found");
 
        status = socket_listen(sock1, localhost, 0, 0);
@@ -147,7 +144,7 @@ static bool test_tcp(struct torture_context *tctx)
        torture_assert(tctx, srv_addr && srv_addr->addr, 
                                   "Unexpected socket_get_my_addr NULL\n");
 
-       torture_assert_str_equal(tctx, srv_addr->addr, iface_best_ip(ifaces, "127.0.0.1"), 
+       torture_assert_str_equal(tctx, srv_addr->addr, iface_list_best_ip(ifaces, "127.0.0.1"),
                        "Unexpected server address");
 
        torture_comment(tctx, "server port is %d\n", srv_addr->port);
@@ -188,8 +185,7 @@ static bool test_tcp(struct torture_context *tctx)
 
 struct torture_suite *torture_local_socket(TALLOC_CTX *mem_ctx)
 {
-       struct torture_suite *suite = torture_suite_create(mem_ctx, 
-                                                                                                          "SOCKET");
+       struct torture_suite *suite = torture_suite_create(mem_ctx, "socket");
 
        torture_suite_add_simple_test(suite, "udp", test_udp);
        torture_suite_add_simple_test(suite, "tcp", test_tcp);