X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fnameif.c;h=10f13b4bcda72b28d93fc7e7e25315e363111d66;hb=7b08cdd98cdf99b0d2bd622566e9288d44b17529;hp=1edd64111b0149a2a0ad2c949f6c1b263dbb0fad;hpb=f03c933e473760cb3776aee8283ecb3e4bddf097;p=oweals%2Fbusybox.git diff --git a/networking/nameif.c b/networking/nameif.c index 1edd64111..10f13b4bc 100644 --- a/networking/nameif.c +++ b/networking/nameif.c @@ -1,9 +1,9 @@ -/* +/* * nameif.c - Naming Interfaces based on MAC address for busybox. * - * Writen 2000 by Andi Kleen. + * Written 2000 by Andi Kleen. * Busybox port 2002 by Nick Fedchik - * Glenn McGrath + * Glenn McGrath * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,10 +22,10 @@ * */ + #include #include #include - #include #include #include @@ -35,9 +35,19 @@ #include "busybox.h" -/* set interface name, from */ -#define SIOCSIFNAME 0x8923 -/* Octets in one ethernet addr, from */ +/* Older versions of net/if.h do not appear to define IF_NAMESIZE. */ +#ifndef IF_NAMESIZE +# ifdef IFNAMSIZ +# define IF_NAMESIZE IFNAMSIZ +# else +# define IF_NAMESIZE 16 +# endif +#endif + +/* take from linux/sockios.h */ +#define SIOCSIFNAME 0x8923 /* set interface name */ + +/* Octets in one Ethernet addr, from */ #define ETH_ALEN 6 #ifndef ifr_newname @@ -46,23 +56,27 @@ typedef struct mactable_s { struct mactable_s *next; - struct mactable_s **pprev; + struct mactable_s *prev; char *ifname; struct ether_addr *mac; } mactable_t; -static void serror_msg_and_die(const char use_syslog, const char *s, ...) +static unsigned char use_syslog; + +static void serror(const char *s, ...) __attribute__ ((noreturn)); + +static void serror(const char *s, ...) { va_list ap; va_start(ap, s); if (use_syslog) { - openlog("nameif", 0, LOG_LOCAL0); - syslog(LOG_ERR, s, ap); + openlog(bb_applet_name, 0, LOG_LOCAL0); + vsyslog(LOG_ERR, s, ap); closelog(); } else { - vfprintf(stderr, s, ap); + bb_verror_msg(s, ap); putc('\n', stderr); } @@ -71,24 +85,33 @@ static void serror_msg_and_die(const char use_syslog, const char *s, ...) exit(EXIT_FAILURE); } +/* Check ascii str_macaddr, convert and copy to *mac */ +struct ether_addr *cc_macaddr(char *str_macaddr) +{ + struct ether_addr *lmac, *mac; + + lmac = ether_aton(str_macaddr); + if (lmac == NULL) + serror("cannot parse MAC %s", str_macaddr); + mac = xmalloc(ETH_ALEN); + memcpy(mac, lmac, ETH_ALEN); + + return mac; +} + int nameif_main(int argc, char **argv) { mactable_t *clist = NULL; FILE *ifh; - char *fname = "/etc/mactab"; + const char *fname = "/etc/mactab"; char *line; - unsigned short linenum = 0; - unsigned char use_syslog = 0; - int ctl_sk = -1; + int ctl_sk; int opt; + int if_index = 1; + mactable_t *ch; - static struct option opts[] = { - {"syslog", 0, NULL, 's'}, - {"configfile", 1, NULL, 'c'}, - {NULL}, - }; - while ((opt = getopt_long(argc, argv, "c:s", opts, NULL)) != -1) { + while ((opt = getopt(argc, argv, "c:s")) != -1) { switch (opt) { case 'c': fname = optarg; @@ -97,120 +120,102 @@ int nameif_main(int argc, char **argv) use_syslog = 1; break; default: - show_usage(); + bb_show_usage(); } } - if ((argc - optind) & 1) { - show_usage(); - } + if ((argc - optind) & 1) + bb_show_usage(); if (optind < argc) { - while (optind < argc) { - struct ether_addr *mac; - mactable_t *ch; - - if (strlen(argv[optind]) > IF_NAMESIZE) { - serror_msg_and_die(use_syslog, "interface name `%s' too long", argv[optind]); - } - optind++; - mac = ether_aton(argv[optind]); - if (mac == NULL) { - serror_msg_and_die(use_syslog, "cannot parse MAC %s", argv[optind]); - } + char **a = argv + optind; + + while (*a) { + + if (strlen(*a) > IF_NAMESIZE) + serror("interface name `%s' too long", *a); ch = xcalloc(1, sizeof(mactable_t)); - ch->ifname = strdup(argv[optind - 1]); - ch->mac = xcalloc(1, ETH_ALEN); - memcpy(ch->mac, &mac, ETH_ALEN); - optind++; + ch->ifname = bb_xstrdup(*a++); + ch->mac = cc_macaddr(*a++); if (clist) - clist->pprev = &ch->next; + clist->prev = ch; ch->next = clist; - ch->pprev = &clist; clist = ch; } } else { - ifh = xfopen(fname, "r"); + ifh = bb_xfopen(fname, "r"); - while ((line = get_line_from_file(ifh)) != NULL) { - struct ether_addr *mac; - mactable_t *ch; + while ((line = bb_get_line_from_file(ifh)) != NULL) { char *line_ptr; - unsigned short name_length; + size_t name_length; line_ptr = line + strspn(line, " \t"); if ((line_ptr[0] == '#') || (line_ptr[0] == '\n')) continue; name_length = strcspn(line_ptr, " \t"); - if (name_length > IF_NAMESIZE) { - serror_msg_and_die(use_syslog, "interface name `%s' too long", argv[optind]); - } ch = xcalloc(1, sizeof(mactable_t)); - ch->ifname = strndup(line_ptr, name_length); + ch->ifname = bb_xstrndup(line_ptr, name_length); + if (name_length > IF_NAMESIZE) + serror("interface name `%s' too long", ch->ifname); line_ptr += name_length; line_ptr += strspn(line_ptr, " \t"); name_length = strspn(line_ptr, "0123456789ABCDEFabcdef:"); line_ptr[name_length] = '\0'; - mac = ether_aton(line_ptr); - if (mac == NULL) { - serror_msg_and_die(use_syslog, "cannot parse MAC %s", argv[optind]); - } - ch->mac = xcalloc(1, ETH_ALEN); - memcpy(ch->mac, mac, ETH_ALEN); + ch->mac = cc_macaddr(line_ptr); if (clist) - clist->pprev = &ch->next; + clist->prev = ch; ch->next = clist; - ch->pprev = &clist; clist = ch; free(line); } fclose(ifh); } - ifh = xfopen("/proc/net/dev", "r"); - while ((line = get_line_from_file(ifh)) != NULL) { - char *line_ptr; - unsigned short iface_name_length; + if ((ctl_sk = socket(PF_INET, SOCK_DGRAM, 0)) == -1) + serror("socket: %m"); + + while (clist) { struct ifreq ifr; - mactable_t *ch = NULL; - linenum++; - if (linenum < 3) - continue; - line_ptr = line + strspn(line, " \t"); - if (line_ptr[0] == '\n') + bzero(&ifr, sizeof(struct ifreq)); + if_index++; + ifr.ifr_ifindex = if_index; + + /* Get ifname by index or die */ + if (ioctl(ctl_sk, SIOCGIFNAME, &ifr)) + break; + + /* Has this device hwaddr? */ + if (ioctl(ctl_sk, SIOCGIFHWADDR, &ifr)) continue; - iface_name_length = strcspn(line_ptr, ":"); - if (ctl_sk < 0) - ctl_sk = socket(PF_INET, SOCK_DGRAM, 0); - memset(&ifr, 0, sizeof(struct ifreq)); - strncpy(ifr.ifr_name, line_ptr, iface_name_length); - 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)); - } + + /* Search for mac like in ifr.ifr_hwaddr.sa_data */ for (ch = clist; ch; ch = ch->next) if (!memcmp(ch->mac, ifr.ifr_hwaddr.sa_data, ETH_ALEN)) break; - if (ch == NULL) { + + /* Nothing found for current ifr.ifr_hwaddr.sa_data */ + if (ch == NULL) continue; - } - strcpy(ifr.ifr_newname, ch->ifname); - if (ioctl(ctl_sk, SIOCSIFNAME, &ifr) < 0) {; - serror_msg_and_die(use_syslog, "cannot change name of %s to %s: %s", ifr.ifr_name, ch->ifname, strerror(errno)); + strcpy(ifr.ifr_newname, ch->ifname); + if (ioctl(ctl_sk, SIOCSIFNAME, &ifr) < 0) + serror("cannot change ifname %s to %s: %m", + ifr.ifr_name, ch->ifname); + + /* Remove list entry of renamed interface */ + if (ch->prev != NULL) { + (ch->prev)->next = ch->next; + } else { + clist = ch->next; } - *ch->pprev = ch->next; - free(ch); - free(line); - } - fclose(ifh); - - while (clist) { - mactable_t *ch; - - ch = clist; - clist = clist->next; + if (ch->next != NULL) + (ch->next)->prev = ch->prev; +#ifdef CONFIG_FEATURE_CLEAN_UP + free(ch->ifname); + free(ch->mac); free(ch); +#endif } return 0;