diff options
| author | Jeremy Allison <jra@samba.org> | 2007-10-24 14:16:54 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-10-24 14:16:54 -0700 |
| commit | 98e154c3125d5732c37a72d74b0eb5cd7b6155fd (patch) | |
| tree | 5389e93d634422fe934ea54fb298effb1a7dc841 /source/include/smb_macros.h | |
| parent | 4d4ab9aeb9d85b4c98cbf8a8363a9cefecd4b365 (diff) | |
| download | samba-98e154c3125d5732c37a72d74b0eb5cd7b6155fd.tar.gz samba-98e154c3125d5732c37a72d74b0eb5cd7b6155fd.tar.xz samba-98e154c3125d5732c37a72d74b0eb5cd7b6155fd.zip | |
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.
Diffstat (limited to 'source/include/smb_macros.h')
| -rw-r--r-- | source/include/smb_macros.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/include/smb_macros.h b/source/include/smb_macros.h index aea429d2ea1..9af63451b07 100644 --- a/source/include/smb_macros.h +++ b/source/include/smb_macros.h @@ -206,11 +206,10 @@ values ((int)(tvalnew)->tv_usec - (int)(tvalold)->tv_usec)/1000) /**************************************************************************** -true if two IP addresses are equal +true if two IPv4 addresses are equal ****************************************************************************/ -#define ip_equal(ip1,ip2) ((ip1).s_addr == (ip2).s_addr) -#define ip_service_equal(ip1,ip2) ( ((ip1).ip.s_addr == (ip2).ip.s_addr) && ((ip1).port == (ip2).port) ) +#define ip_equal_v4(ip1,ip2) ((ip1).s_addr == (ip2).s_addr) /***************************************************************** splits out the last subkey of a key |