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)

1 files changed, 10 insertions, 10 deletions

diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index f7bf8506fe..e1ca924b09 100644
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -50,7 +50,7 @@ int max_protocol = PROTOCOL_NT1;
 static int port;
 static int name_type = 0x20;
 static bool have_ip;
-static struct in_addr dest_ip;
+static struct sockaddr_storage dest_ss;
 
 static struct client_connection *connections;
 
@@ -64,7 +64,7 @@ static struct cli_state *do_connect( const char *server, const char *share,
 	struct cli_state *c = NULL;
 	struct nmb_name called, calling;
 	const char *server_n;
-	struct in_addr ip;
+	struct sockaddr_storage ss;
 	pstring servicename;
 	char *sharename;
 	fstring newserver, newshare;
@@ -83,22 +83,22 @@ static struct cli_state *do_connect( const char *server, const char *share,
 
 	server_n = server;
 	
-	zero_ip_v4(&ip);
+	zero_addr(&ss, AF_INET);
 
 	make_nmb_name(&calling, global_myname(), 0x0);
 	make_nmb_name(&called , server, name_type);
 
  again:
-	zero_ip_v4(&ip);
-	if (have_ip) 
-		ip = dest_ip;
+	zero_addr(&ss, AF_INET);
+	if (have_ip)
+		ss = dest_ss;
 
 	/* have to open a new connection */
 	if (!(c=cli_initialise()) || (cli_set_port(c, port) != port)) {
 		d_printf("Connection to %s failed\n", server_n);
 		return NULL;
 	}
-	status = cli_connect(c, server_n, &ip);
+	status = cli_connect(c, server_n, &ss);
 	if (!NT_STATUS_IS_OK(status)) {
 		d_printf("Connection to %s failed (Error %s)\n", server_n, nt_errstr(status));
 		return NULL;
@@ -366,10 +366,10 @@ void cli_cm_set_dest_name_type( int type )
 /****************************************************************************
 ****************************************************************************/
 
-void cli_cm_set_dest_ip(struct in_addr ip )
+void cli_cm_set_dest_ss(struct sockaddr_storage *pss)
 {
-	dest_ip = ip;
-	have_ip = True;
+	dest_ss = *pss;
+	have_ip = true;
 }
 
 /**********************************************************************