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)

3 files changed, 15 insertions, 15 deletions

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;
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index 84c6e1c3a4..354607bb4e 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -168,7 +168,7 @@ static struct cli_state *connect_one(char *share)
 	struct nmb_name called, calling;
 	char *server_n;
 	char *server;
-	struct in_addr ip;
+	struct sockaddr_storage ss;
 	NTSTATUS status;
 
 	server = share+2;
@@ -178,14 +178,14 @@ static struct cli_state *connect_one(char *share)
 	share++;
 
 	server_n = server;
-	
-        zero_ip_v4(&ip);
+
+	zero_addr(&ss, AF_INET);
 
 	make_nmb_name(&calling, "masktest", 0x0);
 	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())) {
@@ -193,7 +193,7 @@ static struct cli_state *connect_one(char *share)
 		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;
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;