mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-31 22:35:10 +00:00
Code Issues Releases Wiki Activity

now do two passes to skip bogus interfaces (lo0, etc)

Browse Source
This commit is contained in:
Todd C. Miller
1994-08-12 03:42:27 +00:00
parent 5a766f63ac
commit 6e337ed509
1 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
sudo.c
View File

@@ -585,8 +585,10 @@ static void load_interfaces()
{ {
struct ifconf ifconf; struct ifconf ifconf;
struct ifreq ifreq; struct ifreq ifreq;
struct in_addr *inptr;
char buf[BUFSIZ]; char buf[BUFSIZ];
int sock, len, i; int sock, len;
int i, j;
sock = socket(AF_INET, SOCK_DGRAM, 0); sock = socket(AF_INET, SOCK_DGRAM, 0);
if (sock < 0) { if (sock < 0) {
@@ -607,31 +609,45 @@ static void load_interfaces()
} }
/* /*
* malloc() space for interfaces array * find out how many interfaces exist, skipping bogus ones.
*/ */
len = num_interfaces = ifconf.ifc_len / sizeof(struct ifreq); len = num_interfaces = ifconf.ifc_len / sizeof(struct ifreq);
interfaces = (struct interface *) malloc(sizeof(struct interface) * len); for (i = 0; i < len; i++) {
inptr = &(((struct sockaddr_in *)&ifconf.ifc_req[i].ifr_addr)->sin_addr);
if (inptr->s_addr == inet_addr("127.0.0.1") ||
inptr->s_addr == inet_addr("255.255.255.255") ||
inptr->s_addr == inet_addr("0.0.0.0"))
--num_interfaces;
}
/*
* malloc() space for interfaces array
*/
interfaces = (struct interface *) malloc(sizeof(struct interface) *
num_interfaces);
if (interfaces == NULL) { if (interfaces == NULL) {
perror("malloc"); perror("malloc");
(void) fprintf(stderr, "%s: cannot allocate memory!\n", Argv[0]); (void) fprintf(stderr, "%s: cannot allocate memory!\n", Argv[0]);
exit(1); exit(1);
} }
/* XXX - do two passes. one to build up num_interfaces, one to copy */
/* /*
* for each interface, get the ip address and netmask * for each interface, get the ip address and netmask
*/ */
for (i = 0; i < len; i++) { for (i = 0, j = 0; i < len; i++) {
inptr = &(((struct sockaddr_in *)&ifconf.ifc_req[i].ifr_addr)->sin_addr);
/* get the ip address */ /* get the ip address */
/* XXX check for 127.0.0.1, 255.255.255.255 and 0.0.0.0 */ if (inptr->s_addr == inet_addr("127.0.0.1") ||
(void) memcpy(&interfaces[i].addr, inptr->s_addr == inet_addr("255.255.255.255") ||
&(((struct sockaddr_in *)&ifconf.ifc_req[i].ifr_addr)->sin_addr), inptr->s_addr == inet_addr("0.0.0.0"))
sizeof(struct in_addr)); continue;
(void) memcpy(&interfaces[j].addr, inptr, sizeof(struct in_addr));
/* get the netmask */ /* get the netmask */
/* #ifdef SIOCGIFNETMASK */ #ifdef SIOCGIFNETMASK
#if 0
(void) strcpy(ifreq.ifr_name, ifconf.ifc_req[i].ifr_name); (void) strcpy(ifreq.ifr_name, ifconf.ifc_req[i].ifr_name);
if (ioctl(sock, SIOCGIFNETMASK, (char *)(&ifreq)) < 0) { if (ioctl(sock, SIOCGIFNETMASK, (char *)(&ifreq)) < 0) {
(void) free(interfaces); (void) free(interfaces);
@@ -639,16 +655,17 @@ static void load_interfaces()
perror(""); perror("");
return; return;
} }
(void) memcpy(&interfaces[i].netmask, (void) memcpy(&interfaces[j].netmask,
&(((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr), &(((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr),
sizeof(struct in_addr)); sizeof(struct in_addr));
#else #else
if (IN_CLASSC(interfaces[i].addr.s_addr)) if (IN_CLASSC(interfaces[j].addr.s_addr))
interfaces[i].netmask.s_addr = htonl(IN_CLASSC_NET); interfaces[j].netmask.s_addr = htonl(IN_CLASSC_NET);
else if (IN_CLASSB(interfaces[i].addr.s_addr)) else if (IN_CLASSB(interfaces[j].addr.s_addr))
interfaces[i].netmask.s_addr = htonl(IN_CLASSB_NET); interfaces[j].netmask.s_addr = htonl(IN_CLASSB_NET);
else else
interfaces[i].netmask.s_addr = htonl(IN_CLASSA_NET); interfaces[j].netmask.s_addr = htonl(IN_CLASSA_NET);
#endif /* SIOCGIFNETMASK */ #endif /* SIOCGIFNETMASK */
++j;
} }
} }