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/register.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) (limited to 'source4/torture/nbt/register.c') diff --git a/source4/torture/nbt/register.c b/source4/torture/nbt/register.c index 8cbceb8e30..cd7d3c7624 100644 --- a/source4/torture/nbt/register.c +++ b/source4/torture/nbt/register.c @@ -48,8 +48,19 @@ static BOOL nbt_register_own(TALLOC_CTX *mem_ctx, struct nbt_name *name, struct nbt_name_socket *nbtsock = nbt_name_socket_init(mem_ctx, NULL); BOOL ret = True; const char *myaddress = iface_best_ip(address); + struct socket_address *socket_address; - socket_listen(nbtsock->sock, myaddress, 0, 0, 0); + socket_address = socket_address_from_strings(mem_ctx, nbtsock->sock->backend_name, + myaddress, 0); + if (!socket_address) { + return False; + } + + status = socket_listen(nbtsock->sock, socket_address, 0, 0); + if (!NT_STATUS_IS_OK(status)) { + printf("socket_listen for nbt_register_own failed: %s\n", nt_errstr(status)); + return False; + } printf("Testing name defense to name registration\n"); @@ -85,11 +96,11 @@ static BOOL nbt_register_own(TALLOC_CTX *mem_ctx, struct nbt_name *name, status = nbt_name_register(nbtsock, mem_ctx, &io); if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) { - printf("No response from %s for name register\n", address); + printf("No response from %s for name register demand\n", address); return False; } if (!NT_STATUS_IS_OK(status)) { - printf("Bad response from %s for name register - %s\n", + printf("Bad response from %s for name register demand - %s\n", address, nt_errstr(status)); return False; } @@ -113,8 +124,19 @@ static BOOL nbt_refresh_own(TALLOC_CTX *mem_ctx, struct nbt_name *name, struct nbt_name_socket *nbtsock = nbt_name_socket_init(mem_ctx, NULL); BOOL ret = True; const char *myaddress = 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; + } - 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 nbt_referesh_own failed: %s\n", nt_errstr(status)); + return False; + } printf("Testing name defense to name refresh\n"); -- cgit