emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug when reading mac from command line, continue; if hwaddrr not found

Browse Source
This commit is contained in:
Glenn L McGrath 2002-12-13 09:02:16 +00:00
parent 25fe94fd32
commit 8b08bda66b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
networking/nameif.c
View File

@ -67,7 +67,7 @@ static void serror_msg_and_die(const char use_syslog, const char *s, ...)
} }
va_end(ap); va_end(ap);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -121,7 +121,7 @@ int nameif_main(int argc, char **argv)
ch = xcalloc(1, sizeof(mactable_t)); ch = xcalloc(1, sizeof(mactable_t));
ch->ifname = strdup(argv[optind - 1]); ch->ifname = strdup(argv[optind - 1]);
ch->mac = xcalloc(1, ETH_ALEN); ch->mac = xcalloc(1, ETH_ALEN);
memcpy(ch->mac, &mac, ETH_ALEN); memcpy(ch->mac, mac, ETH_ALEN);
optind++; optind++;
if (clist) if (clist)
clist->pprev = &ch->next; clist->pprev = &ch->next;
@ -186,7 +186,8 @@ int nameif_main(int argc, char **argv)
memset(&ifr, 0, sizeof(struct ifreq)); memset(&ifr, 0, sizeof(struct ifreq));
strncpy(ifr.ifr_name, line_ptr, iface_name_length); strncpy(ifr.ifr_name, line_ptr, iface_name_length);
if (ioctl(ctl_sk, SIOCGIFHWADDR, &ifr) < 0) { if (ioctl(ctl_sk, SIOCGIFHWADDR, &ifr) < 0) {
serror_msg_and_die(use_syslog, "cannot change name of %s to %s: %s", ifr.ifr_name, ch->ifname, strerror(errno)); // serror_msg(use_syslog, "cannot read hardware address of %s: %s", ifr.ifr_name, strerror(errno));
continue;
} }
for (ch = clist; ch; ch = ch->next) for (ch = clist; ch; ch = ch->next)
if (!memcmp(ch->mac, ifr.ifr_hwaddr.sa_data, ETH_ALEN)) if (!memcmp(ch->mac, ifr.ifr_hwaddr.sa_data, ETH_ALEN))
@ -194,6 +195,7 @@ int nameif_main(int argc, char **argv)
if (ch == NULL) { if (ch == NULL) {
continue; continue;
} }
strcpy(ifr.ifr_newname, ch->ifname); strcpy(ifr.ifr_newname, ch->ifname);
if (ioctl(ctl_sk, SIOCSIFNAME, &ifr) < 0) {; if (ioctl(ctl_sk, SIOCSIFNAME, &ifr) < 0) {;