diff options
| author | Tim Prouty <tprouty@samba.org> | 2008-12-02 23:29:57 -0800 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2008-12-03 10:40:20 -0800 |
| commit | 1eb743ab8e8b1141f99fabd3e4a46895c6dcc17e (patch) | |
| tree | a43eb854b68ef6d65d6120d5ec0441bc26ea9612 /source3/lib/interface.c | |
| parent | fcbf88115c217cfe5090f8d60ab7627681c648c8 (diff) | |
| download | samba-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/lib/interface.c')
| -rw-r--r-- | source3/lib/interface.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/lib/interface.c b/source3/lib/interface.c index f533ec92c7..48fa4d32a9 100644 --- a/source3/lib/interface.c +++ b/source3/lib/interface.c @@ -33,7 +33,7 @@ bool ismyaddr(const struct sockaddr *ip) { struct interface *i; for (i=local_interfaces;i;i=i->next) { - if (addr_equal((struct sockaddr *)&i->ip,ip)) { + if (sockaddr_equal((struct sockaddr *)&i->ip,ip)) { return true; } } @@ -65,7 +65,7 @@ static struct interface *iface_find(const struct sockaddr *ip, if (same_net(ip, (struct sockaddr *)&i->ip, (struct sockaddr *)&i->netmask)) { return i; } - } else if (addr_equal((struct sockaddr *)&i->ip, ip)) { + } else if (sockaddr_equal((struct sockaddr *)&i->ip, ip)) { return i; } } @@ -93,7 +93,7 @@ void setup_linklocal_scope_id(struct sockaddr *pss) { struct interface *i; for (i=local_interfaces;i;i=i->next) { - if (addr_equal((struct sockaddr *)&i->ip,pss)) { + if (sockaddr_equal((struct sockaddr *)&i->ip,pss)) { struct sockaddr_in6 *psa6 = (struct sockaddr_in6 *)pss; psa6->sin6_scope_id = if_nametoindex(i->name); @@ -388,7 +388,7 @@ static void interpret_interface(char *token) } for (i=0;i<total_probed;i++) { - if (addr_equal((struct sockaddr *)&ss, (struct sockaddr *)&probed_ifaces[i].ip)) { + if (sockaddr_equal((struct sockaddr *)&ss, (struct sockaddr *)&probed_ifaces[i].ip)) { add_interface(&probed_ifaces[i]); return; } @@ -441,8 +441,8 @@ static void interpret_interface(char *token) make_net(&ss_net, &ss, &ss_mask); /* Maybe the first component was a broadcast address. */ - if (addr_equal((struct sockaddr *)&ss_bcast, (struct sockaddr *)&ss) || - addr_equal((struct sockaddr *)&ss_net, (struct sockaddr *)&ss)) { + if (sockaddr_equal((struct sockaddr *)&ss_bcast, (struct sockaddr *)&ss) || + sockaddr_equal((struct sockaddr *)&ss_net, (struct sockaddr *)&ss)) { for (i=0;i<total_probed;i++) { if (same_net((struct sockaddr *)&ss, (struct sockaddr *)&probed_ifaces[i].ip, |