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

ipfilter getifname ifdef cleanup.

Browse Source 
MFC after:	2 months
This commit is contained in:
Cy Schubert 2020-09-30 08:26:22 +00:00
parent 2c1685f369
commit 6dbd2fb858
1 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
contrib/ipfilter/lib/getifname.c
View File

@ -19,11 +19,9 @@
char *getifname(ptr) char *getifname(ptr)
struct ifnet *ptr; struct ifnet *ptr;
{ {
#if SOLARIS || defined(__hpux) #if SOLARIS
# if SOLARIS
# include <sys/mutex.h> # include <sys/mutex.h>
# include <sys/condvar.h> # include <sys/condvar.h>
# endif
# include "../pfil/qif.h" # include "../pfil/qif.h"
char *ifname; char *ifname;
qif_t qif; qif_t qif;
@ -42,13 +40,6 @@ char *getifname(ptr)
} }
return ifname; return ifname;
#else #else
# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
defined(__OpenBSD__) || \
(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
#else
char buf[LIFNAMSIZ];
int len;
# endif
struct ifnet netif; struct ifnet netif;
if ((void *)ptr == (void *)-1) if ((void *)ptr == (void *)-1)
@ -58,24 +49,6 @@ char *getifname(ptr)
if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1) if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1)
return "X"; return "X";
# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
defined(__OpenBSD__) || defined(linux) || \
(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
return strdup(netif.if_xname); return strdup(netif.if_xname);
# else
if (kstrncpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1)
return "X";
if (netif.if_unit < 10)
len = 2;
else if (netif.if_unit < 1000)
len = 3;
else if (netif.if_unit < 10000)
len = 4;
else
len = 5;
buf[sizeof(buf) - len] = '\0';
sprintf(buf + strlen(buf), "%d", netif.if_unit % 10000);
return strdup(buf);
# endif
#endif #endif
} }