summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2008-12-02 23:29:57 -0800
committerTim Prouty <tprouty@samba.org>2008-12-03 10:40:20 -0800
commit1eb743ab8e8b1141f99fabd3e4a46895c6dcc17e (patch)
treea43eb854b68ef6d65d6120d5ec0441bc26ea9612 /source3/include
parentfcbf88115c217cfe5090f8d60ab7627681c648c8 (diff)
downloadsamba-1eb743ab8e8b1141f99fabd3e4a46895c6dcc17e.tar.gz
samba-1eb743ab8e8b1141f99fabd3e4a46895c6dcc17e.tar.bz2
samba-1eb743ab8e8b1141f99fabd3e4a46895c6dcc17e.zip
s3: Change sockaddr util function names for consistency
Also eliminates name conflicts with OneFS system libraries
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/proto.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index f2bbb07f92..d9430e2909 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1396,13 +1396,13 @@ bool is_loopback_ip_v4(struct in_addr ip);
bool is_loopback_addr(const struct sockaddr *pss);
bool is_zero_addr(const struct sockaddr *pss);
void zero_ip_v4(struct in_addr *ip);
-void zero_addr(struct sockaddr_storage *pss);
+void zero_sockaddr(struct sockaddr_storage *pss);
void in_addr_to_sockaddr_storage(struct sockaddr_storage *ss,
struct in_addr ip);
bool same_net(const struct sockaddr *ip1,
const struct sockaddr *ip2,
const struct sockaddr *mask);
-bool addr_equal(const struct sockaddr *ip1,
+bool sockaddr_equal(const struct sockaddr *ip1,
const struct sockaddr *ip2);
bool is_address_any(const struct sockaddr *psa);
uint16_t get_sockaddr_port(const struct sockaddr_storage *pss);