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

Cleanup ifunit(), so it uses the dev_named() function to map an interface

Browse Source 
name into a device.
This commit is contained in:
Jonathan Lemon 2001-10-17 18:58:14 +00:00
parent 7e7c3f3f33
commit 10930aad3f
1 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sys/net/if.c
View File

@ -1084,46 +1084,28 @@ struct ifnet *
ifunit(const char *name)
{
char namebuf[IFNAMSIZ + 1];
const char *cp;
struct ifnet *ifp;
int unit;
unsigned len, m;
char c;
dev_t dev;
len = strlen(name);
if (len < 2 || len > IFNAMSIZ)
return NULL;
cp = name + len - 1;
c = *cp;
if (c < '0' || c > '9')
return NULL; /* trailing garbage */
unit = 0;
m = 1;
do {
if (cp == name)
return NULL; /* no interface name */
unit += (c - '0') * m;
if (unit > 1000000)
return NULL; /* number is unreasonable */
m *= 10;
c = *--cp;
} while (c >= '0' && c <= '9');
len = cp - name + 1;
bcopy(name, namebuf, len);
namebuf[len] = '\0';
/*
* Now search all the interfaces for this name/number
*/
/*
* XXX
* Devices should really be known as /dev/fooN, not /dev/net/fooN.
*/
snprintf(namebuf, IFNAMSIZ, "%s/%s", net_cdevsw.d_name, name);
TAILQ_FOREACH(ifp, &ifnet, if_link) {
if (strcmp(ifp->if_name, namebuf))
continue;
if (unit == ifp->if_unit)
dev = ifdev_byindex(ifp->if_index);
if (strcmp(devtoname(dev), namebuf) == 0)
break;
if (dev_named(dev, name))
break;
}
return (ifp);
}
/*
* Map interface name in a sockaddr_dl to
* interface structure pointer.