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/locktest.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source3/torture/locktest.c') diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c index 20fd49b3e1..f69f8bf48f 100644 --- a/source3/torture/locktest.c +++ b/source3/torture/locktest.c @@ -161,7 +161,7 @@ static struct cli_state *connect_one(char *share, int snum) struct nmb_name called, calling; char *server_n; fstring server; - struct in_addr ip; + struct sockaddr_storage ss; fstring myname; static int count; NTSTATUS status; @@ -173,8 +173,8 @@ static struct cli_state *connect_one(char *share, int snum) share++; server_n = server; - - zero_ip_v4(&ip); + + zero_addr(&ss, AF_INET); slprintf(myname,sizeof(myname), "lock-%lu-%u", (unsigned long)getpid(), count++); @@ -182,7 +182,7 @@ static struct cli_state *connect_one(char *share, int snum) make_nmb_name(&called , server, 0x20); again: - zero_ip_v4(&ip); + zero_addr(&ss, AF_INET); /* have to open a new connection */ if (!(c=cli_initialise())) { @@ -190,7 +190,7 @@ static struct cli_state *connect_one(char *share, int snum) return NULL; } - status = cli_connect(c, server_n, &ip); + status = cli_connect(c, server_n, &ss); if (!NT_STATUS_IS_OK(status)) { DEBUG(0,("Connection to %s failed. Error %s\n", server_n, nt_errstr(status) )); return NULL; -- cgit