Patch from Eric Norum <eric@skatter.usask.ca> to improve parsing of

network interface names.  This change does not introduce any
compatibility problems.

2 files changed, 45 insertions, 0 deletions

diff --git a/c/src/libnetworking/rtems/rtems_bsdnet_internal.h b/c/src/libnetworking/rtems/rtems_bsdnet_internal.h
index adaecbd5f9..ae1a419bd8 100644
--- a/c/src/libnetworking/rtems/rtems_bsdnet_internal.h
+++ b/c/src/libnetworking/rtems/rtems_bsdnet_internal.h
@@ -116,6 +116,7 @@ struct	file;
 struct	buf;
 struct	tty;
 struct	uio;
+struct	rtems_bsdnet_ifconfig;
 
 /*
  * Redo kernel memory allocation
@@ -130,6 +131,7 @@ void rtems_bsdnet_free (void *addr, int type);
 void rtems_bsdnet_semaphore_obtain (void);
 void rtems_bsdnet_semaphore_release (void);
 void rtems_bsdnet_schednetisr (int n);
+int rtems_bsdnet_parse_driver_name (const struct rtems_bsdnet_ifconfig *config, char **namep);
 
 unsigned long rtems_bsdnet_seconds_since_boot (void);
 unsigned long rtems_bsdnet_random (void);
diff --git a/c/src/libnetworking/rtems/rtems_glue.c b/c/src/libnetworking/rtems/rtems_glue.c
index 0601e5659f..ab734c1aca 100644
--- a/c/src/libnetworking/rtems/rtems_glue.c
+++ b/c/src/libnetworking/rtems/rtems_glue.c
@@ -882,3 +882,46 @@ rtems_bsdnet_initialize_network (void)
 		(*rtems_bsdnet_config.bootp)();
 	return 0;
 }
+
+/*
+ * Parse a network driver name into a name and a unit number
+ */
+int
+rtems_bsdnet_parse_driver_name (const struct rtems_bsdnet_ifconfig *config, char **namep)
+{
+	const char *cp = config->name;
+	char c;
+	int unitNumber = 0;
+
+	if (cp == NULL) {
+		printf ("No network driver name");
+		return -1;
+	}
+	while ((c = *cp++) != '\0') {
+		if ((c >= '0') && (c <= '9')) {
+			int len = cp - config->name - 1;
+			if ((len < 2) || (len > 50))
+				break;
+			for (;;) {
+				unitNumber = (unitNumber * 10) + (c - '0');
+				c = *cp++;
+				if (c == '\0') {
+					char *unitName = malloc (len);
+					if (unitName == NULL) {
+						printf ("No memory");
+						return -1;
+					}
+					strncpy (unitName, config->name, len - 1);
+					unitName[len-1] = '\0';
+					*namep = unitName;
+					return unitNumber;
+				}
+				if ((c < '0') || (c > '9'))
+					break;
+			}
+			break;
+		}
+	}
+	printf ("Bad network driver name `%s'", config->name);
+	return -1;
+}