From f88b7a076be74a29a3bf876b4e2705f4a1ecf42b Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 24 Oct 2007 14:16:54 -0700 Subject: This is a large patch (sorry). Migrate from struct in_addr to struct sockaddr_storage in most places that matter (ie. not the nmbd and NetBIOS lookups). This passes make test on an IPv4 box, but I'll have to do more work/testing on IPv6 enabled boxes. This should now give us a framework for testing and finishing the IPv6 migration. It's at the state where someone with a working IPv6 setup should (theorecically) be able to type : smbclient //ipv6-address/share and have it work. Jeremy. (This used to be commit 98e154c3125d5732c37a72d74b0eb5cd7b6155fd) --- source3/torture/torture.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source3/torture/torture.c') diff --git a/source3/torture/torture.c b/source3/torture/torture.c index d684216232..8eb29d837d 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -99,14 +99,14 @@ void *shm_setup(int size) static struct cli_state *open_nbt_connection(void) { struct nmb_name called, calling; - struct in_addr ip; + struct sockaddr_storage ss; struct cli_state *c; NTSTATUS status; make_nmb_name(&calling, myname, 0x0); make_nmb_name(&called , host, 0x20); - zero_ip_v4(&ip); + zero_addr(&ss, AF_INET); if (!(c = cli_initialise())) { printf("Failed initialize cli_struct to connect with %s\n", host); @@ -115,7 +115,7 @@ static struct cli_state *open_nbt_connection(void) c->port = port_to_use; - status = cli_connect(c, host, &ip); + status = cli_connect(c, host, &ss); if (!NT_STATUS_IS_OK(status)) { printf("Failed to connect with %s. Error %s\n", host, nt_errstr(status) ); return NULL; @@ -129,10 +129,10 @@ static struct cli_state *open_nbt_connection(void) if (!cli_session_request(c, &calling, &called)) { /* - * Well, that failed, try *SMBSERVER ... + * Well, that failed, try *SMBSERVER ... * However, we must reconnect as well ... */ - status = cli_connect(c, host, &ip); + status = cli_connect(c, host, &ss); if (!NT_STATUS_IS_OK(status)) { printf("Failed to connect with %s. Error %s\n", host, nt_errstr(status) ); return NULL; -- cgit