r12804: This patch reworks the Samba4 sockets layer to use a socket_address

structure that is more generic than just 'IP/port'.

It now passes make test, and has been reviewed and updated by
metze. (Thankyou *very* much).

This passes 'make test' as well as kerberos use (not currently in the
testsuite).

The original purpose of this patch was to have Samba able to pass a
socket address stucture from the BSD layer into the kerberos routines
and back again.   It also removes nbt_peer_addr, which was being used
for a similar purpose.

It is a large change, but worthwhile I feel.

Andrew Bartlett
(This used to be commit 88198c4881d8620a37086f80e4da5a5b71c5bbb2)

1 files changed, 14 insertions, 1 deletions

diff --git a/source4/torture/nbt/wins.c b/source4/torture/nbt/wins.c
index 37e9688a60..bcb52dc9b8 100644
--- a/source4/torture/nbt/wins.c
+++ b/source4/torture/nbt/wins.c
@@ -59,10 +59,23 @@ static BOOL nbt_test_wins_name(TALLOC_CTX *mem_ctx, const char *address,
 	struct nbt_name_socket *nbtsock = nbt_name_socket_init(mem_ctx, NULL);
 	BOOL ret = True;
 	const char *myaddress = talloc_strdup(mem_ctx, iface_best_ip(address));
+	struct socket_address *socket_address;
+
+	socket_address = socket_address_from_strings(mem_ctx, 
+						     nbtsock->sock->backend_name,
+						     myaddress, 0);
+	if (!socket_address) {
+		return False;
+	}
 
 	/* we do the listen here to ensure the WINS server receives the packets from
 	   the right IP */
-	socket_listen(nbtsock->sock, myaddress, 0, 0, 0);
+	status = socket_listen(nbtsock->sock, socket_address, 0, 0);
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("socket_listen for WINS failed: %s\n", nt_errstr(status));
+		return False;
+	}
+	talloc_free(socket_address);
 
 	printf("Testing name registration to WINS with name %s at %s nb_flags=0x%x\n", 
 	       nbt_name_string(mem_ctx, name), myaddress, nb_flags);