d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from NetBSD rev. 1.3 (drochner): Use getifaddrs(3) instead of

Browse Source 
SIOCGIFCONF.
This commit is contained in:
Tim J. Robbins 2004-02-26 08:49:19 +00:00
parent 72abc018fe
commit 8861f1dd53
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=126269
1 changed files with 28 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
contrib/smbfs/lib/smb/nb_net.c
View File

@ -34,7 +34,6 @@
*/ */
#include <sys/param.h> #include <sys/param.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/ioctl.h>
#include <net/if.h> #include <net/if.h>
@ -46,6 +45,7 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <ifaddrs.h>
#include <netsmb/netbios.h> #include <netsmb/netbios.h>
#include <netsmb/smb_lib.h> #include <netsmb/smb_lib.h>
@ -102,77 +102,46 @@ nb_resolvehost_in(const char *name, struct sockaddr **dest)
int int
nb_enum_if(struct nb_ifdesc **iflist, int maxif) nb_enum_if(struct nb_ifdesc **iflist, int maxif)
{ {
struct ifconf ifc;
struct ifreq *ifrqp;
struct nb_ifdesc *ifd; struct nb_ifdesc *ifd;
struct in_addr iaddr, imask; struct ifaddrs *ifp, *p;
char *ifrdata, *iname; int i;
int s, rdlen, ifcnt, error, iflags, i;
size_t ifrlen;
*iflist = NULL; if (getifaddrs(&ifp) < 0)
s = socket(AF_INET, SOCK_DGRAM, 0);
if (s == -1)
return errno; return errno;
rdlen = maxif * sizeof(struct ifreq); *iflist = NULL;
ifrdata = malloc(rdlen); i = 0;
if (ifrdata == NULL) { for (p = ifp; p; p = p->ifa_next) {
error = ENOMEM;
goto bad;
}
ifc.ifc_len = rdlen;
ifc.ifc_buf = ifrdata;
if (ioctl(s, SIOCGIFCONF, &ifc) != 0) {
error = errno;
goto bad;
}
ifrqp = ifc.ifc_req;
ifcnt = ifc.ifc_len / sizeof(struct ifreq);
error = 0;
for (i = 0; i < ifcnt; i++) {
ifrlen = sizeof(struct ifreq);
if (ifrqp->ifr_addr.sa_len > sizeof(struct sockaddr))
ifrlen += ifrqp->ifr_addr.sa_len
- sizeof(struct sockaddr);
if (ifrqp->ifr_addr.sa_family != AF_INET) if (i >= maxif)
goto next; break;
iname = ifrqp->ifr_name;
if (strlen(iname) >= sizeof(ifd->id_name))
goto next;
iaddr = (*(struct sockaddr_in *)&ifrqp->ifr_addr).sin_addr; if ((p->ifa_addr->sa_family != AF_INET) ||
((p->ifa_flags & (IFF_UP|IFF_BROADCAST))
if (ioctl(s, SIOCGIFNETMASK, ifrqp) != 0) != (IFF_UP|IFF_BROADCAST)))
goto next; continue;
imask = ((struct sockaddr_in *)&ifrqp->ifr_addr)->sin_addr; if (strlen(p->ifa_name) >= sizeof(ifd->id_name))
continue;
if (ioctl(s, SIOCGIFFLAGS, ifrqp) != 0)
goto next;
iflags = ifrqp->ifr_flags;
if ((iflags & IFF_UP) == 0 || (iflags & IFF_BROADCAST) == 0)
goto next;
ifd = malloc(sizeof(struct nb_ifdesc)); ifd = malloc(sizeof(struct nb_ifdesc));
if (ifd == NULL) if (ifd == NULL) {
freeifaddrs(ifp);
/* XXX should free stuff already in *iflist */
return ENOMEM; return ENOMEM;
}
bzero(ifd, sizeof(struct nb_ifdesc)); bzero(ifd, sizeof(struct nb_ifdesc));
strcpy(ifd->id_name, iname); strcpy(ifd->id_name, p->ifa_name);
ifd->id_flags = iflags; ifd->id_flags = p->ifa_flags;
ifd->id_addr = iaddr; ifd->id_addr = ((struct sockaddr_in *)p->ifa_addr)->sin_addr;
ifd->id_mask = imask; ifd->id_mask = ((struct sockaddr_in *)p->ifa_netmask)->sin_addr;
ifd->id_next = *iflist; ifd->id_next = *iflist;
*iflist = ifd; *iflist = ifd;
i++;
next:
ifrqp = (struct ifreq *)((caddr_t)ifrqp + ifrlen);
} }
bad:
free(ifrdata); freeifaddrs(ifp);
close(s); return 0;
return error; }
}
/*ARGSUSED*/ /*ARGSUSED*/
/*int /*int