status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

minissdpd/listifaces: fix. now compatible with linux and BSD

This commit is contained in:
Thomas Bernard 2014-02-03 16:48:51 +01:00
parent b7a4f8d696
commit 2e4d11ba28
2 changed files with 52 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
minissdpd/Makefile
View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.17 2012/05/02 10:26:50 nanard Exp $ # $Id: Makefile,v 1.18 2014/02/03 14:32:14 nanard Exp $
# MiniUPnP project # MiniUPnP project
# author: Thomas Bernard # author: Thomas Bernard
# website: http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/ # website: http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
@ -59,6 +59,8 @@ testminissdpd: $(TESTMINISSDPDOBJS)
testcodelength: testcodelength.o testcodelength: testcodelength.o
listifaces: listifaces.o upnputils.o
depend: depend:
makedepend -f$(MAKEFILE_LIST) -Y \ makedepend -f$(MAKEFILE_LIST) -Y \
$(ALLOBJS:.o=.c) 2>/dev/null $(ALLOBJS:.o=.c) 2>/dev/null

66
minissdpd/listifaces.c
View File

@ -1,4 +1,7 @@
/* $Id: listifaces.c,v 1.4 2007/09/23 16:59:02 nanard Exp $ */ /* $Id: listifaces.c,v 1.6 2014/02/03 14:32:14 nanard Exp $ */
/* (c) 2006-2014 Thomas BERNARD
* http://miniupnp.free.fr/ http://miniupnp.tuxfamily.org/
*/
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -8,7 +11,9 @@
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "upnputils.h"
/* hexdump */
void printhex(const unsigned char * p, int n) void printhex(const unsigned char * p, int n)
{ {
int i; int i;
@ -27,20 +32,28 @@ void printhex(const unsigned char * p, int n)
} }
} }
void listifaces() /* List network interfaces */
void listifaces(void)
{ {
struct ifconf ifc; struct ifconf ifc;
char * buf = 0; char * buf = NULL;
int buflen = sizeof(struct ifreq)*20; int buflen;
/*[sizeof(struct ifreq)*8];*/
int s, i; int s, i;
int j; int j;
char saddr[256/*INET_ADDRSTRLEN*/]; char saddr[256/*INET_ADDRSTRLEN*/];
#ifdef __linux__
buflen = sizeof(struct ifreq)*10;
#else
buflen = 0;
#endif
/*s = socket(PF_INET, SOCK_DGRAM, 0);*/ /*s = socket(PF_INET, SOCK_DGRAM, 0);*/
s = socket(AF_INET, SOCK_DGRAM, 0); s = socket(AF_INET, SOCK_DGRAM, 0);
do { do {
#ifdef __linux__
buflen += buflen; buflen += buflen;
buf = realloc(buf, buflen); #endif
if(buflen > 0)
buf = realloc(buf, buflen);
ifc.ifc_len = buflen; ifc.ifc_len = buflen;
ifc.ifc_buf = (caddr_t)buf; ifc.ifc_buf = (caddr_t)buf;
if(ioctl(s, SIOCGIFCONF, &ifc) < 0) if(ioctl(s, SIOCGIFCONF, &ifc) < 0)
@ -50,22 +63,39 @@ void listifaces()
free(buf); free(buf);
return; return;
} }
printf("%d - %d - %d\n", buflen, ifc.ifc_len, (int)sizeof(struct ifreq)); printf("buffer length=%d - buffer used=%d - sizeof(struct ifreq)=%d\n",
printf(" %d\n", IFNAMSIZ); buflen, ifc.ifc_len, (int)sizeof(struct ifreq));
printf(" %d %d\n", (int)sizeof(struct sockaddr), (int)sizeof(struct sockaddr_in) ); printf("IFNAMSIZ=%d ", IFNAMSIZ);
} while(buflen == ifc.ifc_len); printf("sizeof(struct sockaddr)=%d sizeof(struct sockaddr_in)=%d\n",
(int)sizeof(struct sockaddr), (int)sizeof(struct sockaddr_in) );
#ifndef __linux__
if(buflen == 0)
buflen = ifc.ifc_len;
else
break;
} while(1);
#else
} while(buflen <= ifc.ifc_len);
#endif
printhex((const unsigned char *)ifc.ifc_buf, ifc.ifc_len); printhex((const unsigned char *)ifc.ifc_buf, ifc.ifc_len);
j = 0; printf("off index fam name address\n");
for(i=0; i<ifc.ifc_len; /*i += sizeof(struct ifreq)*/) for(i = 0, j = 0; i<ifc.ifc_len; j++)
{ {
//const struct ifreq * ifrp = &(ifc.ifc_req[j]); /*const struct ifreq * ifrp = &(ifc.ifc_req[j]);*/
const struct ifreq * ifrp = (const struct ifreq *)(buf + i); const struct ifreq * ifrp = (const struct ifreq *)(buf + i);
i += sizeof(ifrp->ifr_name) + 16;//ifrp->ifr_addr.sa_len;
/*inet_ntop(AF_INET, &(((struct sockaddr_in *)&(ifrp->ifr_addr))->sin_addr), saddr, sizeof(saddr));*/ /*inet_ntop(AF_INET, &(((struct sockaddr_in *)&(ifrp->ifr_addr))->sin_addr), saddr, sizeof(saddr));*/
saddr[0] = '\0'; saddr[0] = '\0';
inet_ntop(ifrp->ifr_addr.sa_family, &(ifrp->ifr_addr.sa_data[2]), saddr, sizeof(saddr)); /* inet_ntop(ifrp->ifr_addr.sa_family, &(ifrp->ifr_addr.sa_data[2]), saddr, sizeof(saddr)); */
printf("%2d %d %d %s %s\n", j, ifrp->ifr_addr.sa_family, -1/*ifrp->ifr_addr.sa_len*/, ifrp->ifr_name, saddr); sockaddr_to_string(&ifrp->ifr_addr, saddr, sizeof(saddr));
j++; printf("0x%03x %2d %2d %-16s %s\n", i, j, ifrp->ifr_addr.sa_family, ifrp->ifr_name, saddr);
/*ifrp->ifr_addr.sa_len is only available on BSD */
#ifdef __linux__
i += sizeof(struct ifreq);
#else
if(ifrp->ifr_addr.sa_len == 0)
break;
i += IFNAMSIZ + ifrp->ifr_addr.sa_len;
#endif
} }
free(buf); free(buf);
close(s); close(s);
@ -73,6 +103,8 @@ void listifaces()
int main(int argc, char * * argv) int main(int argc, char * * argv)
{ {
(void)argc;
(void)argv;
listifaces(); listifaces();
return 0; return 0;
} }