[BusyBox-cvs] busybox/networking nameif.c,NONE,1.1 Config.in,1.3,1.4 Makefile.in,1.9,1.10

Glenn McGrath bug1 at busybox.net
Fri Dec 13 00:01:48 UTC 2002


Update of /var/cvs/busybox/networking
In directory winder:/tmp/cvs-serv16637/networking

Modified Files:
	Config.in Makefile.in 
Added Files:
	nameif.c 
Log Message:
New applet, nameif by Nick Fedchik and myself.


--- NEW FILE: nameif.c ---
/* 
 * nameif.c - Naming Interfaces based on MAC address for busybox.
 *
 * Writen 2000 by Andi Kleen.
 * Busybox port 2002 by Nick Fedchik <nick at fedchik.org.ua>
 *			Glenn McGrath <bug1 at optushome.com.au>
 *
 * 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
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 * 02111-1307 USA
 *
 */

#include <sys/syslog.h>
#include <sys/socket.h>
#include <sys/ioctl.h>

#include <errno.h>
#include <getopt.h>
#include <stdlib.h>
#include <string.h>
#include <net/if.h>
#include <netinet/ether.h>

#include "busybox.h"

/* set interface name, from <linux/sockios.h> */
#define SIOCSIFNAME	0x8923
/* Octets in one ethernet addr, from <linux/if_ether.h>	 */
#define ETH_ALEN	6

#ifndef ifr_newname
#define ifr_newname ifr_ifru.ifru_slave
#endif

typedef struct mactable_s {
	struct mactable_s *next;
	struct mactable_s **pprev;
	char *ifname;
	struct ether_addr *mac;
} mactable_t;

static void serror_msg_and_die(const char use_syslog, const char *s, ...)
{
	va_list ap;

	va_start(ap, s);

	if (use_syslog) {
		openlog("nameif", 0, LOG_LOCAL0);
		syslog(LOG_ERR, s, ap);
		closelog();
	} else {
		vfprintf(stderr, s, ap);
		putc('\n', stderr);
	}

	va_end(ap);

	exit(EXIT_FAILURE);
}

int nameif_main(int argc, char **argv)
{
	mactable_t *clist = NULL;
	FILE *ifh;
	char *fname = "/etc/mactab";
	char *line;
	unsigned short linenum = 0;
	unsigned char use_syslog = 0;
	int ctl_sk = -1;
	int opt;

	static struct option opts[] = {
		{"syslog", 0, NULL, 's'},
		{"configfile", 1, NULL, 'c'},
		{NULL},
	};

	while ((opt = getopt_long(argc, argv, "c:s", opts, NULL)) != -1) {
		switch (opt) {
		case 'c':
			fname = optarg;
			break;
		case 's':
			use_syslog = 1;
			break;
		default:
			show_usage();
		}
	}

	if ((argc - optind) & 1) {
		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]);
			}
			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++;
			if (clist)
				clist->pprev = &ch->next;
			ch->next = clist;
			ch->pprev = &clist;
			clist = ch;
		}
	} else {
		ifh = xfopen(fname, "r");

		while ((line = get_line_from_file(ifh)) != NULL) {
			struct ether_addr *mac;
			mactable_t *ch;
			char *line_ptr;
			unsigned short 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);
			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);
			if (clist)
				clist->pprev = &ch->next;
			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;
		struct ifreq ifr;
		mactable_t *ch = NULL;

		linenum++;
		if (linenum < 3)
			continue;
		line_ptr = line + strspn(line, " \t");
		if (line_ptr[0] == '\n')
			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));
		}
		for (ch = clist; ch; ch = ch->next)
			if (!memcmp(ch->mac, ifr.ifr_hwaddr.sa_data, ETH_ALEN))
				break;
		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));
		}
		*ch->pprev = ch->next;
		free(ch);
		free(line);
	}
	fclose(ifh);

	while (clist) {
		mactable_t *ch;

		ch = clist;
		clist = clist->next;
		free(ch);
	}

	return 0;
}

Index: Config.in
===================================================================
RCS file: /var/cvs/busybox/networking/Config.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Config.in	6 Dec 2002 23:11:30 -0000	1.3
+++ Config.in	13 Dec 2002 00:01:44 -0000	1.4
@@ -192,6 +192,20 @@
 	help
 	  Please submit a patch to add help text for this item.
 
+config CONFIG_NAMEIF
+	bool "nameif"
+	default n
+	help
+	  nameif used to rename network interface by its MAC address.
+	  Renamed interfaces MUST be in the down state.
+	  It is possible to use file (default: /etc/mactab)
+	  with list of new interface names and MACs.
+	  Maximum interface name length: IF_NAMESIZE = 16
+	  File fields are sepatated by space or tab.
+	  File format:
+	  # Comment
+	  new_interface_name	XX:XX:XX:XX:XX:XX
+
 config CONFIG_NC
 	bool "nc"
 	default n

Index: Makefile.in
===================================================================
RCS file: /var/cvs/busybox/networking/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.in	1 Dec 2002 23:04:05 -0000	1.9
+++ Makefile.in	13 Dec 2002 00:01:44 -0000	1.10
@@ -32,6 +32,7 @@
 NETWORKING-$(CONFIG_IPLINK)		+= iplink.o
 NETWORKING-$(CONFIG_IPROUTE)	+= iproute.o
 NETWORKING-$(CONFIG_IPTUNNEL)	+= iptunnel.o
+NETWORKING-$(CONFIG_NAMEIF)	+= nameif.o
 NETWORKING-$(CONFIG_NC)		    += nc.o
 NETWORKING-$(CONFIG_NETSTAT)	+= netstat.o
 NETWORKING-$(CONFIG_NSLOOKUP)	+= nslookup.o




More information about the busybox-cvs mailing list