Ticket #3124: patch.4.fbsdcompat.diff

src/libs/compat/freebsd_network/if.c

@@ -28 +28 @@
 if_alloc(u_char type)
 {
     char semName[64];
+    int i;
 
     struct ifnet *ifp = _kernel_malloc(sizeof(struct ifnet), M_ZERO);
     if (ifp == NULL)
@@ -52 +53 @@
     ifp->flags = 0;
     ifq_init(&ifp->receive_queue, semName);
 
+    for (i=0; i < MAX_DEVICES; i++)
+        if (gDevices[i] == NULL)
+        {
+            ifp->if_index = i;
+            gDevices[i] = ifp;
+            gDeviceCount++;
+            break;
+        }
+
+    if (i == MAX_DEVICES)
+        panic("unit too large");
+
     ifp->if_type = type;
     IF_ADDR_LOCK_INIT(ifp);
     return ifp;
@@ -67 +80 @@
 void
 if_free(struct ifnet *ifp)
 {
+    int i;
+    for (i=0; i < MAX_DEVICES; i++)
+        if (ifp->device_name == gDeviceNameList[i])
+        {
+            int last;
+            for (last = 0; last < MAX_DEVICES; last++)
+                if (gDeviceNameList[last] == NULL)
+                    break;
+            last--;
+
+            if (i == last)
+                gDeviceNameList[i] = NULL;
+            else {
+                gDeviceNameList[i] = gDeviceNameList[last];
+                gDeviceNameList[last] = NULL;
+            }
+            break;
+        }
+
+    gDevices[ifp->if_index] = NULL;
+    gDeviceCount--;
+    
     IF_ADDR_LOCK_DESTROY(ifp);
     if (ifp->if_type == IFT_ETHER)
         _kernel_free(ifp->if_l2com);
@@ -81 +116 @@
 void
 if_initname(struct ifnet *ifp, const char *name, int unit)
 {
+    int i;
     dprintf("if_initname(%p, %s, %d)\n", ifp, name, unit);
 
+//XXX what if name[0] == '\0' ?
     if (name == NULL)
         panic("interface goes unamed");
 
-    if (gDeviceCount >= MAX_DEVICES)
-        panic("unit too large");
-
     ifp->if_dname = name;
     ifp->if_dunit = unit;
-    ifp->if_index = gDeviceCount++;
 
     strlcpy(ifp->if_xname, name, sizeof(ifp->if_xname));
 
@@ -100 +133 @@
 
     driver_printf("%s: /dev/%s\n", gDriverName, ifp->device_name);
 
-    gDeviceNameList[ifp->if_index] = ifp->device_name;
-    gDevices[ifp->if_index] = ifp;
+    for (i=0; i < MAX_DEVICES; i++)
+        if (gDeviceNameList[i] == NULL)
+        {
+            gDeviceNameList[i] = ifp->device_name;
+            break;
+        }
+    if (i == MAX_DEVICES)
+        panic("unit too large");
 
     ifp->root_device = find_root_device(unit);
 }

src/libs/compat/freebsd_network/device.c

@@ -28 +28 @@
     struct ifreq ifr;
     int i;
 
-    for (i = 0; gDeviceNameList[i] != NULL; i++) {
-        if (strcmp(gDeviceNameList[i], name) == 0)
+    for (i = 0; i < MAX_DEVICES; i++) {
+        if (gDevices[i] != NULL
+            && strncmp(gDevices[i]->device_name, name, sizeof(gDevices[i]->device_name))==0)
             break;
     }
 
-    if (gDeviceNameList[i] == NULL)
+    if (i == MAX_DEVICES)
         return B_ERROR;
 
     if (get_module(NET_STACK_MODULE_NAME, (module_info **)&gStack) != B_OK)