From f55ea8bb3dca868e21663cd90eaea7a35cd7886c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 9 Jan 2006 22:12:53 +0000 Subject: 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) --- source4/torture/nbt/winsbench.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source4/torture/nbt/winsbench.c') diff --git a/source4/torture/nbt/winsbench.c b/source4/torture/nbt/winsbench.c index 65f494184f..5aa97f9ade 100644 --- a/source4/torture/nbt/winsbench.c +++ b/source4/torture/nbt/winsbench.c @@ -223,6 +223,7 @@ static BOOL bench_wins(TALLOC_CTX *mem_ctx, struct nbt_name *name, const char *a int timelimit = lp_parm_int(-1, "torture", "timelimit", 10); struct wins_state *state; extern int torture_entries; + struct socket_address *my_ip; state = talloc_zero(nbtsock, struct wins_state); @@ -232,7 +233,10 @@ static BOOL bench_wins(TALLOC_CTX *mem_ctx, struct nbt_name *name, const char *a state->my_ip = talloc_strdup(mem_ctx, iface_best_ip(address)); state->ttl = timelimit; - socket_listen(nbtsock->sock, state->my_ip, 0, 0, 0); + my_ip = socket_address_from_strings(nbtsock, nbtsock->sock->backend_name, + state->my_ip, 0); + + socket_listen(nbtsock->sock, my_ip, 0, 0); printf("Running for %d seconds\n", timelimit); while (timeval_elapsed(&tv) < timelimit) { -- cgit