oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(find_all_addresses): use getifaddrs, from Jason Thorpe <thorpej@netbsd.org>

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9263 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2000-12-05 05:42:18 +00:00
parent 419ef60ec7
commit a1366b4974
1 changed files with 102 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

279
lib/krb5/get_addrs.c
View File

@@ -43,42 +43,35 @@ struct mbuf;
#ifdef HAVE_NET_IF_H #ifdef HAVE_NET_IF_H
#include <net/if.h> #include <net/if.h>
#endif #endif
#include <ifaddrs.h>
#ifdef HAVE_SYS_SOCKIO_H
#include <sys/sockio.h>
#endif /* HAVE_SYS_SOCKIO_H */
#ifdef HAVE_NETINET_IN6_VAR_H
#include <netinet/in6_var.h>
#endif /* HAVE_NETINET_IN6_VAR_H */
static krb5_error_code static krb5_error_code
gethostname_fallback (krb5_addresses *res) gethostname_fallback (krb5_addresses *res)
{ {
krb5_error_code err; krb5_error_code err;
char hostname[MAXHOSTNAMELEN]; char hostname[MAXHOSTNAMELEN];
struct hostent *hostent; struct hostent *hostent;
if (gethostname (hostname, sizeof(hostname))) if (gethostname (hostname, sizeof(hostname)))
return errno; return errno;
hostent = roken_gethostbyname (hostname); hostent = roken_gethostbyname (hostname);
if (hostent == NULL) if (hostent == NULL)
return errno; return errno;
res->len = 1; res->len = 1;
res->val = malloc (sizeof(*res->val)); res->val = malloc (sizeof(*res->val));
if (res->val == NULL) if (res->val == NULL)
return ENOMEM; return ENOMEM;
res->val[0].addr_type = hostent->h_addrtype; res->val[0].addr_type = hostent->h_addrtype;
res->val[0].address.data = NULL; res->val[0].address.data = NULL;
res->val[0].address.length = 0; res->val[0].address.length = 0;
err = krb5_data_copy (&res->val[0].address, err = krb5_data_copy (&res->val[0].address,
hostent->h_addr, hostent->h_addr,
hostent->h_length); hostent->h_length);
if (err) { if (err) {
free (res->val); free (res->val);
return err; return err;
} }
return 0; return 0;
} }
enum { enum {
@@ -94,147 +87,96 @@ enum {
*/ */
static krb5_error_code static krb5_error_code
find_all_addresses (krb5_context context, find_all_addresses (krb5_context context, krb5_addresses *res, int flags)
krb5_addresses *res, int flags,
int af, int siocgifconf, int siocgifflags,
size_t ifreq_sz)
{ {
krb5_error_code ret; struct sockaddr sa_zero;
int fd; struct ifaddrs *ifa0, *ifa;
size_t buf_size; krb5_error_code ret;
char *buf; int num, idx;
struct ifconf ifconf;
int num, j = 0;
char *p;
size_t sz;
struct sockaddr sa_zero;
struct ifreq *ifr;
krb5_address lo_addr;
int got_lo = FALSE;
buf = NULL; res->val = NULL;
res->val = NULL;
memset (&sa_zero, 0, sizeof(sa_zero)); if (getifaddrs(&ifa0) == -1)
fd = socket(af, SOCK_DGRAM, 0); return (errno);
if (fd < 0)
return -1;
buf_size = 8192; memset(&sa_zero, 0, sizeof(sa_zero));
for (;;) {
buf = malloc(buf_size);
if (buf == NULL) {
ret = ENOMEM;
goto error_out;
}
ifconf.ifc_len = buf_size;
ifconf.ifc_buf = buf;
/* /* First, count all the ifaddrs. */
* Solaris returns EINVAL when the buffer is too small. for (ifa = ifa0, num = 0; ifa != NULL; ifa = ifa->ifa_next, num++)
*/ /* nothing */;
if (ioctl (fd, siocgifconf, &ifconf) < 0 && errno != EINVAL) {
ret = errno;
goto error_out;
}
/*
* Can the difference between a full and a overfull buf
* be determined?
*/
if (ifconf.ifc_len < buf_size) if (num == 0) {
break; freeifaddrs(ifa0);
free (buf); return (ENXIO);
buf_size *= 2; }
}
num = ifconf.ifc_len / ifreq_sz; /* Allocate storage for them. */
res->len = num; res->val = calloc(num, sizeof(*res->val));
res->val = calloc(num, sizeof(*res->val)); if (res->val == NULL) {
if (res->val == NULL) { freeifaddrs(ifa0);
ret = ENOMEM; return (ENOMEM);
goto error_out; }
}
j = 0; /* Now traverse the list. */
for (p = ifconf.ifc_buf; for (ifa = ifa0, idx = 0; ifa != NULL; ifa = ifa->ifa_next) {
p < ifconf.ifc_buf + ifconf.ifc_len; if ((ifa->ifa_flags & IFF_UP) == 0)
p += sz) { continue;
struct ifreq ifreq; if (memcmp(ifa->ifa_addr, &sa_zero, sizeof(sa_zero)) == 0)
struct sockaddr *sa; continue;
if (krb5_sockaddr_uninteresting(ifa->ifa_addr))
continue;
ifr = (struct ifreq *)p; if ((ifa->ifa_flags & IFF_LOOPBACK) != 0) {
sa = &ifr->ifr_addr; /* We'll deal with the LOOP_IF_NONE case later. */
if ((flags & LOOP) == 0)
continue;
}
sz = ifreq_sz; ret = krb5_sockaddr2address(ifa->ifa_addr, &res->val[idx]);
#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN if (ret) {
sz = max(sz, sizeof(ifr->ifr_name) + sa->sa_len); /*
#endif * The most likely error here is going to be "Program
#ifdef SA_LEN * lacks support for address type". This is no big
sz = max(sz, sizeof(ifr->ifr_name) + SA_LEN(sa)); * deal -- just continue, and we'll listen on the
#endif * addresses who's type we *do* support.
memcpy (ifreq.ifr_name, ifr->ifr_name, sizeof(ifr->ifr_name)); */
continue;
}
idx++;
}
if (ioctl(fd, siocgifflags, &ifreq) < 0) { /*
ret = errno; * If no addresses were found, and LOOP_IF_NONE is set, then find
goto error_out; * the loopback addresses and add them to our list.
} */
if ((flags & LOOP_IF_NONE) != 0 && idx == 0) {
for (ifa = ifa0; ifa != NULL; ifa = ifa->ifa_next) {
if ((ifa->ifa_flags & IFF_UP) == 0)
continue;
if (memcmp(ifa->ifa_addr, &sa_zero, sizeof(sa_zero)) == 0)
continue;
if (krb5_sockaddr_uninteresting(ifa->ifa_addr))
continue;
if (!(ifreq.ifr_flags & IFF_UP)) if ((ifa->ifa_flags & IFF_LOOPBACK) != 0) {
continue; ret = krb5_sockaddr2address(ifa->ifa_addr, &res->val[idx]);
if (memcmp (sa, &sa_zero, sizeof(sa_zero)) == 0) if (ret) {
continue; /*
if (krb5_sockaddr_uninteresting (sa)) * See comment above.
continue; */
continue;
}
idx++;
}
}
}
if (ifreq.ifr_flags & IFF_LOOPBACK) { freeifaddrs(ifa0);
if (flags & LOOP_IF_NONE) { if (ret)
ret = krb5_sockaddr2address (sa, &lo_addr); free(res->val);
if (ret) else
goto error_out; res->len = idx; /* Now a count. */
got_lo = TRUE; return (ret);
continue;
} else if((flags & LOOP) == 0)
continue;
}
ret = krb5_sockaddr2address (sa, &res->val[j]);
if (ret)
goto error_out;
++j;
}
if ((flags & LOOP_IF_NONE) && got_lo) {
if (j == 0)
res->val[j++] = lo_addr;
else
krb5_free_address (context, &lo_addr);
}
if (j != num) {
void *tmp;
res->len = j;
tmp = realloc (res->val, j * sizeof(*res->val));
if (j != 0 && tmp == NULL) {
ret = ENOMEM;
goto error_out;
}
res->val = tmp;
}
ret = 0;
goto cleanup;
error_out:
if (got_lo)
krb5_free_address (context, &lo_addr);
while(j--) {
krb5_free_address (context, &res->val[j]);
}
free (res->val);
cleanup:
close (fd);
free (buf);
return ret;
} }
static krb5_error_code static krb5_error_code
@@ -243,26 +185,9 @@ get_addrs_int (krb5_context context, krb5_addresses *res, int flags)
krb5_error_code ret = -1; krb5_error_code ret = -1;
if (flags & SCAN_INTERFACES) { if (flags & SCAN_INTERFACES) {
#if defined(AF_INET6) && defined(SIOCGIF6CONF) && defined(SIOCGIF6FLAGS) ret = find_all_addresses (context, res, flags);
if (ret)
ret = find_all_addresses (context, res, flags,
AF_INET6, SIOCGIF6CONF, SIOCGIF6FLAGS,
sizeof(struct in6_ifreq));
#endif
#if defined(HAVE_IPV6) && defined(SIOCGIFCONF)
if (ret)
ret = find_all_addresses (context, res, flags,
AF_INET6, SIOCGIFCONF, SIOCGIFFLAGS,
sizeof(struct ifreq));
#endif
#if defined(AF_INET) && defined(SIOCGIFCONF) && defined(SIOCGIFFLAGS)
if (ret)
ret = find_all_addresses (context, res, flags,
AF_INET, SIOCGIFCONF, SIOCGIFFLAGS,
sizeof(struct ifreq));
if(ret || res->len == 0) if(ret || res->len == 0)
ret = gethostname_fallback (res); ret = gethostname_fallback (res);
#endif
} else } else
ret = 0; ret = 0;