Changeset 14332

Timestamp:

04/27/10 14:02:19 (3 years ago)

Author:

BrainSlayer

Message:

allow to clone macs in ap mode too

File:

• src/router/services/networking/network.c (modified) (4 diffs)

src/router/services/networking/network.c

@@ -1701 +1701 @@
                                                 wl_iovar_set(name,
                                                              "wet_host_mac",
-                                                             ifr.
-                                                             ifr_hwaddr.sa_data,
+                                                             ifr.ifr_hwaddr.
+                                                             sa_data,
                                                              ETHER_ADDR_LEN);
                                         }
@@ -1835 +1835 @@
                            ifr.ifr_hwaddr.sa_data);
                 ifr.ifr_hwaddr.sa_family = ARPHRD_IEEE80211;
-                char *ifs = getSTA();
-                char *wifi = NULL;
-
-                if (ifs)
-                        wifi = getWifi(ifs);
-                if (wifi) {
-                        strncpy(ifr.ifr_name, wifi, IFNAMSIZ);
-                        eval("ifconfig", wifi, "down");
-                        if (ioctl(s, SIOCSIFHWADDR, &ifr) == -1)
-                                perror("Write wireless mac fail : ");
-                        else
-                                cprintf("Write wireless mac successfully\n");
-                        eval("ifconfig", wifi, "up");
-                }
+#ifdef HAVE_MADWIFI
+                char *wifi = "wifi0";
+#else
+                char *wifi = "ra0";
+#endif
+
+                strncpy(ifr.ifr_name, wifi, IFNAMSIZ);
+                eval("ifconfig", wifi, "down");
+                if (ioctl(s, SIOCSIFHWADDR, &ifr) == -1)
+                        perror("Write wireless mac fail : ");
+                else
+                        cprintf("Write wireless mac successfully\n");
+                eval("ifconfig", wifi, "up");
         }
         if (nvram_match("mac_clone_enable", "1") &&
@@ -1856 +1855 @@
                            ifr.ifr_hwaddr.sa_data);
                 ifr.ifr_hwaddr.sa_family = ARPHRD_IEEE80211;
-                char *ifs = getWDSSTA();
-                char *wifi = NULL;
-
-                if (!ifs)
-                        ifs = getWET();
-                if (ifs)
-                        wifi = getWifi(ifs);
-                if (wifi) {
-                        strncpy(ifr.ifr_name, wifi, IFNAMSIZ);
-                        eval("ifconfig", wifi, "down");
-                        if (ioctl(s, SIOCSIFHWADDR, &ifr) == -1)
-                                perror("Write wireless mac fail : ");
-                        else
-                                cprintf("Write wireless mac successfully\n");
-                        eval("ifconfig", wifi, "up");
-                }
+#ifdef HAVE_MADWIFI
+                char *wifi = "wifi0";
+#else
+                char *wifi = "ra0";
+#endif
+                strncpy(ifr.ifr_name, wifi, IFNAMSIZ);
+                eval("ifconfig", wifi, "down");
+                if (ioctl(s, SIOCSIFHWADDR, &ifr) == -1)
+                        perror("Write wireless mac fail : ");
+                else
+                        cprintf("Write wireless mac successfully\n");
+                eval("ifconfig", wifi, "up");
         }
         configure_wifi();
@@ -3384 +3379 @@
                     nvram_safe_get("wan_gateway");
                 if (strcmp(gateway, "0.0.0.0")) {
-                        route_add(wan_ifname, 0, gateway, NULL,"255.255.255.255");
+                        route_add(wan_ifname, 0, gateway, NULL,
+                                  "255.255.255.255");
 
                         while (route_add