Use common strlist implementation in Samba 3 and Samba 4.

[samba.git] / source4 / torture / nbt / wins.c

diff --git a/source4/torture/nbt/wins.c b/source4/torture/nbt/wins.c
index 2ba7f221c9beefdc5dbfd25eb914b49e60b63c6f..0399daedf05204c986593448a2a32af566cb4a19 100644 (file)
--- a/source4/torture/nbt/wins.c
+++ b/source4/torture/nbt/wins.c
@@ -53,9 +53,14 @@ static bool nbt_test_wins_name(struct torture_context *tctx, const char *address
        struct nbt_name_refresh_wins refresh;
        struct nbt_name_release release;
        NTSTATUS status;
-       struct nbt_name_socket *nbtsock = nbt_name_socket_init(tctx, NULL);
-       const char *myaddress = talloc_strdup(tctx, iface_best_ip(tctx->lp_ctx, address));
+       struct nbt_name_socket *nbtsock = torture_init_nbt_socket(tctx);
+       const char *myaddress;
        struct socket_address *socket_address;
+       struct interface *ifaces;
+
+       load_interfaces(tctx, lp_interfaces(tctx->lp_ctx), &ifaces);
+
+       myaddress = talloc_strdup(tctx, iface_best_ip(ifaces, address));
 
        socket_address = socket_address_from_strings(tctx, 
                                                     nbtsock->sock->backend_name,
@@ -75,6 +80,7 @@ static bool nbt_test_wins_name(struct torture_context *tctx, const char *address
 
        torture_comment(tctx, "release the name\n");
        release.in.name = *name;
+       release.in.dest_port = lp_nbt_port(tctx->lp_ctx);
        release.in.dest_addr = address;
        release.in.address = myaddress;
        release.in.nb_flags = nb_flags;
@@ -88,8 +94,9 @@ static bool nbt_test_wins_name(struct torture_context *tctx, const char *address
 
        torture_comment(tctx, "register the name\n");
        io.in.name = *name;
-       io.in.wins_servers = str_list_make(tctx, address, NULL);
-       io.in.addresses = str_list_make(tctx, myaddress, NULL);
+       io.in.wins_port = lp_nbt_port(tctx->lp_ctx);
+       io.in.wins_servers = (const char **)str_list_make(tctx, address, NULL);
+       io.in.addresses = (const char **)str_list_make(tctx, myaddress, NULL);
        io.in.nb_flags = nb_flags;
        io.in.ttl = 300000;
        
@@ -160,8 +167,9 @@ static bool nbt_test_wins_name(struct torture_context *tctx, const char *address
 
        torture_comment(tctx, "refresh the name\n");
        refresh.in.name = *name;
-       refresh.in.wins_servers = str_list_make(tctx, address, NULL);
-       refresh.in.addresses = str_list_make(tctx, myaddress, NULL);
+       refresh.in.wins_port = lp_nbt_port(tctx->lp_ctx);
+       refresh.in.wins_servers = (const char **)str_list_make(tctx, address, NULL);
+       refresh.in.addresses = (const char **)str_list_make(tctx, myaddress, NULL);
        refresh.in.nb_flags = nb_flags;
        refresh.in.ttl = 12345;