#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-
-#ifdef HAVE_STDINT_H
#include <stdint.h>
-#endif
-
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#define IFACE_NUM 5
/* we leave all of the ioctl's to the application */
-static int addname(char **list, int *i, int *length, const char *name)
+static int addname(char **list, int *i, const char *name)
{
/* if we've run out of room, allocate some more. just return
}
-static int getifaces(const int sockfd, char ***list, int *length)
+static int getifaces(const int sockfd, char ***list)
{
#ifdef HAVE_IFNAMEINDEX
struct if_nameindex *ifstart, *ifs;
new = (char **) malloc((sizeof(ifs)/sizeof(struct if_nameindex) + 1) * sizeof(char *));
while (ifs && ifs->if_name) {
/* just bail if there's a problem */
- if (addname(new, &i, length, ifs->if_name) < 0)
+ if (addname(new, &i, ifs->if_name) < 0)
break;
ifs++;
}
}
new = (char **) malloc((ifc.ifc_len/sizeof(struct ifreq) + 1) * sizeof(char *));
- for ( ifr = ifc.ifc_req; ifc.ifc_len >= sizeof( struct ifreq );
+ for ( ifr = ifc.ifc_req; ifc.ifc_len >= (int) sizeof( struct ifreq );
ifc.ifc_len -= ifrsize, ifr = nextifr ) {
#ifdef BSD4_4
ifrsize = sizeof(ifr->ifr_name) +
nextifr = (struct ifreq *)((caddr_t)ifr + ifrsize );
/* just bail if there's a problem */
- if (addname(new, &i, length, ifr->ifr_name) < 0)
+ if (addname(new, &i, ifr->ifr_name) < 0)
break;
}
*list = new;
* Get interfaces from the kernel. we keep an extra null entry to signify
* the end of the interface list.
*/
-char **getifacelist()
+char **getifacelist(void)
{
- char **list;
- char **new;
- int length, i, fd;
+ char **list = NULL; /* FIXME */
+ int i, fd;
if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0)
return NULL;
- if ((i = getifaces(fd, &list, &length)) == 0) {
+ if ((i = getifaces(fd, &list)) == 0) {
free(list);
close(fd);
return NULL;
}
close(fd);
- if ((i < length) &&
- (new = (char **) realloc(list, (i + 1) * sizeof(char *))))
- return new;
-
return list;
}