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/lib/interface.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'source3/lib/interface.c') diff --git a/source3/lib/interface.c b/source3/lib/interface.c index 0696329fd6..49bbceceb7 100644 --- a/source3/lib/interface.c +++ b/source3/lib/interface.c @@ -269,7 +269,7 @@ const struct sockaddr_storage *iface_ip(const struct sockaddr_storage *ip) return True if a IP is directly reachable on one of our interfaces */ -bool iface_local(struct sockaddr_storage *ip) +bool iface_local(const struct sockaddr_storage *ip) { return iface_find(ip, True) ? true : false; } @@ -285,8 +285,7 @@ static void add_interface(const struct iface_struct *ifs) if (iface_find(&ifs->ip, False)) { DEBUG(3,("add_interface: not adding duplicate interface %s\n", - print_sockaddr(addr, sizeof(addr), - &ifs->ip, sizeof(struct sockaddr_storage)) )); + print_sockaddr(addr, sizeof(addr), &ifs->ip) )); return; } @@ -317,16 +316,13 @@ static void add_interface(const struct iface_struct *ifs) DEBUG(2,("added interface %s ip=%s ", iface->name, - print_sockaddr(addr, sizeof(addr), - &iface->ip, sizeof(struct sockaddr_storage)) )); + print_sockaddr(addr, sizeof(addr), &iface->ip) )); DEBUG(2,("bcast=%s ", print_sockaddr(addr, sizeof(addr), - &iface->bcast, - sizeof(struct sockaddr_storage)) )); + &iface->bcast) )); DEBUG(2,("netmask=%s\n", print_sockaddr(addr, sizeof(addr), - &iface->netmask, - sizeof(struct sockaddr_storage)) )); + &iface->netmask) )); } /**************************************************************************** -- cgit