small image builder change

[openwrt.git] / openwrt / package / wificonf / wificonf.c

diff --git a/openwrt/package/wificonf/wificonf.c b/openwrt/package/wificonf/wificonf.c
index 519596c..b76f697 100644 (file)
--- a/openwrt/package/wificonf/wificonf.c
+++ b/openwrt/package/wificonf/wificonf.c
@@ -36,21 +36,18 @@
        do { \
                ERR_SET_EXT(rname, request); \
                fprintf(stderr, "    too few arguments.\n"); \
        do { \
                ERR_SET_EXT(rname, request); \
                fprintf(stderr, "    too few arguments.\n"); \

-               return; \

        } while(0)
 
 #define ABORT_ARG_TYPE(rname, request, arg) \
        do { \
                ERR_SET_EXT(rname, request); \
                fprintf(stderr, "    invalid argument \"%s\".\n", arg); \
        } while(0)
 
 #define ABORT_ARG_TYPE(rname, request, arg) \
        do { \
                ERR_SET_EXT(rname, request); \
                fprintf(stderr, "    invalid argument \"%s\".\n", arg); \

-               return; \

        } while(0)
 
 #define ABORT_ARG_SIZE(rname, request, max) \
        do { \
                ERR_SET_EXT(rname, request); \
                fprintf(stderr, "    argument too big (max %d)\n", max); \
        } while(0)
 
 #define ABORT_ARG_SIZE(rname, request, max) \
        do { \
                ERR_SET_EXT(rname, request); \
                fprintf(stderr, "    argument too big (max %d)\n", max); \

-               return; \

        } while(0)
 
 /*------------------------------------------------------------------*/
        } while(0)
 
 /*------------------------------------------------------------------*/


@@ -64,7 +61,6 @@
                ERR_SET_EXT(rname, request); \
                fprintf(stderr, "    SET failed on device %-1.16s ; %s.\n", \
                        ifname, strerror(errno)); \
                ERR_SET_EXT(rname, request); \
                fprintf(stderr, "    SET failed on device %-1.16s ; %s.\n", \
                        ifname, strerror(errno)); \

-               return; \

        } } while(0)
 
 /*------------------------------------------------------------------*/
        } } while(0)
 
 /*------------------------------------------------------------------*/


@@ -78,11 +74,13 @@
                ERR_SET_EXT(rname, request); \
                fprintf(stderr, "    GET failed on device %-1.16s ; %s.\n", \
                        ifname, strerror(errno)); \
                ERR_SET_EXT(rname, request); \
                fprintf(stderr, "    GET failed on device %-1.16s ; %s.\n", \
                        ifname, strerror(errno)); \

-               return; \

        } } while(0)
 
        } } while(0)
 

+void set_wext_ssid(int skfd, char *ifname);
+

 char *prefix;
 char buffer[128];
 char *prefix;
 char buffer[128];

+int wpa_enc = 0;

 
 char *wl_var(char *name)
 {
 
 char *wl_var(char *name)
 {


@@ -115,8 +113,6 @@ int bcom_ioctl(int skfd, char *ifname, int cmd, void *buf, int len)
        strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
 
        ret = ioctl(skfd, SIOCDEVPRIVATE, &ifr);
        strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
 
        ret = ioctl(skfd, SIOCDEVPRIVATE, &ifr);

-       if (ret < 0)
-               fprintf(stderr, "bcom_ioctl [cmd=%d, buf=%08x, len=%d] failed: %d\n", cmd, buf, len, ret);

 
        return ret;
 }
 
        return ret;
 }


@@ -131,7 +127,7 @@ int bcom_set_val(int skfd, char *ifname, char *var, void *val, int len)
 
        strcpy(buf, var);
        
 
        strcpy(buf, var);
        

-       if ((ret = bcom_ioctl(skfd, ifname, WLC_GET_VAR, buf, sizeof(buf))))
+       if ((ret = bcom_ioctl(skfd, ifname, WLC_SET_VAR, buf, sizeof(buf))))

                return ret;
 
        memcpy(val, buf, len);
                return ret;
 
        memcpy(val, buf, len);


@@ -143,6 +139,33 @@ int bcom_set_int(int skfd, char *ifname, char *var, int val)
        return bcom_set_val(skfd, ifname, var, &val, sizeof(val));
 }
 
        return bcom_set_val(skfd, ifname, var, &val, sizeof(val));
 }
 

+void stop_bcom(int skfd, char *ifname)
+{
+       int val = 0;
+       wlc_ssid_t ssid;
+       
+       if (bcom_ioctl(skfd, ifname, WLC_GET_MAGIC, &val, sizeof(val)) < 0)
+               return;
+       
+       ssid.SSID_len = 0;
+       ssid.SSID[0] = 0;
+       bcom_ioctl(skfd, ifname, WLC_SET_SSID, &ssid, sizeof(ssid));
+       bcom_ioctl(skfd, ifname, WLC_DOWN, NULL, 0);
+
+}
+
+void start_bcom(int skfd, char *ifname)
+{
+       int val = 0;
+       
+       if (bcom_ioctl(skfd, ifname, WLC_GET_MAGIC, &val, sizeof(val)) < 0)
+               return;
+
+       bcom_ioctl(skfd, ifname, WLC_UP, &val, sizeof(val));
+       set_wext_ssid(skfd, ifname);
+}
+
+

 void setup_bcom(int skfd, char *ifname)
 {
        int val = 0;
 void setup_bcom(int skfd, char *ifname)
 {
        int val = 0;


@@ -152,27 +175,14 @@ void setup_bcom(int skfd, char *ifname)
        
        if (bcom_ioctl(skfd, ifname, WLC_GET_MAGIC, &val, sizeof(val)) < 0)
                return;
        
        if (bcom_ioctl(skfd, ifname, WLC_GET_MAGIC, &val, sizeof(val)) < 0)
                return;

-
-       bcom_ioctl(skfd, ifname, WLC_DOWN, NULL, 0);

        
        

-       if (nvram_match(wl_var("auth_mode"), "wpa") || nvram_match(wl_var("auth_mode"), "psk") || (nvram_get(wl_var("akm")) && !nvram_disabled(wl_var("akm")))) {
-               /* Set up WPA */
-               if (nvram_match(wl_var("crypto"), "tkip"))
-                       val = TKIP_ENABLED;
-               else if (nvram_match(wl_var("crypto"), "aes"))
-                       val = AES_ENABLED;
-               else if (nvram_match(wl_var("crypto"), "tkip+aes"))
-                       val = TKIP_ENABLED | AES_ENABLED;
-               else
-                       val = 0;
-               bcom_ioctl(skfd, ifname, WLC_SET_WSEC, &val, sizeof(val));
-
-               if (val && nvram_get(wl_var("wpa_psk"))) {
-                       val = 1;
-                       bcom_ioctl(skfd, ifname, WLC_SET_EAP_RESTRICT, &val, sizeof(val));
-               }
-       }
+       stop_bcom(skfd, ifname);

 
 

+       /* Set Country */
+       strncpy(buf, nvram_safe_get(wl_var("country_code")), 4);
+       buf[3] = 0;
+       bcom_ioctl(skfd, ifname, WLC_SET_COUNTRY, buf, 4);
+       

        /* Set up afterburner */
        val = ABO_AUTO;
        if (nvram_enabled(wl_var("afterburner")))
        /* Set up afterburner */
        val = ABO_AUTO;
        if (nvram_enabled(wl_var("afterburner")))


@@ -182,10 +192,9 @@ void setup_bcom(int skfd, char *ifname)
        bcom_set_val(skfd, ifname, "afterburner_override", &val, sizeof(val));
        
        /* Set other options */
        bcom_set_val(skfd, ifname, "afterburner_override", &val, sizeof(val));
        
        /* Set other options */

-       if (v = nvram_get(wl_var("lazywds"))) {
-               val = atoi(v);
-               bcom_ioctl(skfd, ifname, WLC_SET_LAZYWDS, &val, sizeof(val));
-       }
+       val = nvram_enabled(wl_var("lazywds"));
+       bcom_ioctl(skfd, ifname, WLC_SET_LAZYWDS, &val, sizeof(val));
+       

        if (v = nvram_get(wl_var("frag"))) {
                val = atoi(v);
                bcom_ioctl(skfd, ifname, WLC_SET_FRAG, &val, sizeof(val));
        if (v = nvram_get(wl_var("frag"))) {
                val = atoi(v);
                bcom_ioctl(skfd, ifname, WLC_SET_FRAG, &val, sizeof(val));


@@ -290,40 +299,85 @@ void setup_bcom(int skfd, char *ifname)
                }
                bcom_ioctl(skfd, ifname, WLC_SET_GMODE_PROTECTION_CONTROL, &override, sizeof(control));
                bcom_ioctl(skfd, ifname, WLC_SET_GMODE_PROTECTION_OVERRIDE, &override, sizeof(override));
                }
                bcom_ioctl(skfd, ifname, WLC_SET_GMODE_PROTECTION_CONTROL, &override, sizeof(control));
                bcom_ioctl(skfd, ifname, WLC_SET_GMODE_PROTECTION_OVERRIDE, &override, sizeof(override));

+
+               if (val = 0) {
+                       if (nvram_match(wl_var("plcphdr"), "long"))
+                               val = WLC_PLCP_AUTO;
+                       else
+                               val = WLC_PLCP_SHORT;
+
+                       bcom_ioctl(skfd, ifname, WLC_SET_PLCPHDR, &val, sizeof(val));
+               }

        }
        }

-}

 
 

-void set_wext_ssid(int skfd, char *ifname)
-{
-       char *buffer;
-       struct iwreq wrq;
+       start_bcom(skfd, ifname);

 
 

-       if (buffer = nvram_get(wl_var("ssid"))) {
-               if (strlen(buffer) > IW_ESSID_MAX_SIZE) {
-                       ABORT_ARG_SIZE("Set ESSID", SIOCSIWESSID, IW_ESSID_MAX_SIZE);
-               } else {
-                       char essid[IW_ESSID_MAX_SIZE + 1];
-
-                       wrq.u.essid.flags = 1;
-                       strcpy(essid, buffer);
-                       wrq.u.essid.pointer = (caddr_t) essid;
-                       wrq.u.essid.length = strlen(essid) + 1;
-                       IW_SET_EXT_ERR(skfd, ifname, SIOCSIWESSID, &wrq, "Set ESSID");
+       if (!(v = nvram_get(wl_var("akm"))))
+               v = nvram_safe_get(wl_var("auth_mode"));
+       
+       if (strstr(v, "wpa") || strstr(v, "psk")) {
+               wpa_enc = 1;
+
+               /* Set up WPA */
+               if (nvram_match(wl_var("crypto"), "tkip"))
+                       val = TKIP_ENABLED;
+               else if (nvram_match(wl_var("crypto"), "aes"))
+                       val = AES_ENABLED;
+               else if (nvram_match(wl_var("crypto"), "tkip+aes"))
+                       val = TKIP_ENABLED | AES_ENABLED;
+               else
+                       val = 0;
+               bcom_ioctl(skfd, ifname, WLC_SET_WSEC, &val, sizeof(val));
+
+               if (val && strstr(v, "psk")) {
+                       v = nvram_safe_get(wl_var("wpa_psk"));
+
+                       if ((strlen(v) >= 8) && (strlen(v) < 63)) {
+                               val = 4;
+                               bcom_ioctl(skfd, ifname, WLC_SET_WPA_AUTH, &val, sizeof(val));
+                               
+                               bcom_ioctl(skfd, ifname, WLC_GET_AP, &val, sizeof(val));
+                               if (!val) {
+                                       /* Enable in-driver WPA supplicant */
+                                       wsec_pmk_t pmk;
+                                       
+                                       pmk.key_len = (unsigned short) strlen(v);
+                                       pmk.flags = WSEC_PASSPHRASE;
+                                       strcpy(pmk.key, v);
+                                       bcom_ioctl(skfd, ifname, WLC_SET_WSEC_PMK, &pmk, sizeof(pmk));
+                                       bcom_set_int(skfd, ifname, "sup_wpa", 1);
+                               }
+                       }
+               } else  {
+                       val = 1;
+                       bcom_ioctl(skfd, ifname, WLC_SET_EAP_RESTRICT, &val, sizeof(val));

                }
                }

+       } else {
+               val = 0;
+
+               bcom_ioctl(skfd, ifname, WLC_SET_WSEC, &val, sizeof(val));
+               bcom_ioctl(skfd, ifname, WLC_SET_WPA_AUTH, &val, sizeof(val));
+               bcom_ioctl(skfd, ifname, WLC_SET_EAP_RESTRICT, &val, sizeof(val));
+               bcom_set_int(skfd, ifname, "sup_wpa", 0);

        }
 }
 
        }
 }
 

-void start_bcom(int skfd, char *ifname)
+void set_wext_ssid(int skfd, char *ifname)

 {
 {

-       int val = 0;
-       
-       if (bcom_ioctl(skfd, ifname, WLC_GET_MAGIC, &val, sizeof(val)) < 0)
-               return;
+       char *buffer;
+       char essid[IW_ESSID_MAX_SIZE + 1];
+       struct iwreq wrq;

 
 

-       bcom_ioctl(skfd, ifname, WLC_UP, &val, sizeof(val));
+       buffer = nvram_get(wl_var("ssid"));

        
        

-       /* Need to re-set SSID after WLC_UP */
-       set_wext_ssid(skfd, ifname);
+       if (!buffer || (strlen(buffer) > IW_ESSID_MAX_SIZE)) 
+               buffer = "OpenWrt";
+
+       wrq.u.essid.flags = 1;
+       strcpy(essid, buffer);
+       wrq.u.essid.pointer = (caddr_t) essid;
+       wrq.u.essid.length = strlen(essid) + 1;
+       IW_SET_EXT_ERR(skfd, ifname, SIOCSIWESSID, &wrq, "Set ESSID");

 }
 
 void setup_wext_wep(int skfd, char *ifname)
 }
 
 void setup_wext_wep(int skfd, char *ifname)


@@ -333,7 +387,8 @@ void setup_wext_wep(int skfd, char *ifname)
        char keystr[5];
        char *keyval;
        unsigned char key[IW_ENCODING_TOKEN_MAX];
        char keystr[5];
        char *keyval;
        unsigned char key[IW_ENCODING_TOKEN_MAX];

-
+       
+       memset(&wrq, 0, sizeof(wrq));

        strcpy(keystr, "key1");
        for (i = 1; i <= 4; i++) {
                if (keyval = nvram_get(wl_var(keystr))) {
        strcpy(keystr, "key1");
        for (i = 1; i <= 4; i++) {
                if (keyval = nvram_get(wl_var(keystr))) {


@@ -349,7 +404,7 @@ void setup_wext_wep(int skfd, char *ifname)
                keystr[3]++;
        }
        
                keystr[3]++;
        }
        

-       
+       memset(&wrq, 0, sizeof(wrq));

        i = atoi(nvram_safe_get(wl_var("key")));
        if (i > 0 && i < 4) {
                wrq.u.data.flags = i | IW_ENCODE_RESTRICTED;
        i = atoi(nvram_safe_get(wl_var("key")));
        if (i > 0 && i < 4) {
                wrq.u.data.flags = i | IW_ENCODE_RESTRICTED;


@@ -357,14 +412,25 @@ void setup_wext_wep(int skfd, char *ifname)
        }
 }
 
        }
 }
 

+void set_wext_mode(skfd, ifname)
+{
+       struct iwreq wrq;
+       int ap = 0, infra = 0, wet = 0;
+       
+       /* Set operation mode */
+       ap = !nvram_match(wl_var("mode"), "sta") && !nvram_match(wl_var("mode"), "wet");
+       infra = !nvram_disabled(wl_var("infra"));
+       wet = nvram_enabled(wl_var("wet")) || !nvram_match(wl_var("mode"), "wet");
+
+       wrq.u.mode = (!infra ? IW_MODE_ADHOC : (ap ? IW_MODE_MASTER : (wet ? IW_MODE_REPEAT : IW_MODE_INFRA)));
+       IW_SET_EXT_ERR(skfd, ifname, SIOCSIWMODE, &wrq, "Set Mode");
+}
+

 void setup_wext(int skfd, char *ifname)
 {
        char *buffer;
        struct iwreq wrq;
 
 void setup_wext(int skfd, char *ifname)
 {
        char *buffer;
        struct iwreq wrq;
 

-       /* Set ESSID */
-       set_wext_ssid(skfd, ifname);
-       

        /* Set channel */
        int channel = atoi(nvram_safe_get(wl_var("channel")));
        
        /* Set channel */
        int channel = atoi(nvram_safe_get(wl_var("channel")));
        


@@ -377,28 +443,22 @@ void setup_wext(int skfd, char *ifname)
                wrq.u.freq.m = channel;
                IW_SET_EXT_ERR(skfd, ifname, SIOCSIWFREQ, &wrq, "Set Frequency");
        }
                wrq.u.freq.m = channel;
                IW_SET_EXT_ERR(skfd, ifname, SIOCSIWFREQ, &wrq, "Set Frequency");
        }

-       
-       /* Set operation mode */
-       int ap = 0, infra = 0, wet = 0;
-       
-       ap = !nvram_match(wl_var("mode"), "sta");
-       infra = !nvram_disabled(wl_var("infra"));
-       wet = nvram_enabled(wl_var("wet"));

 
 

-       wrq.u.mode = (!infra ? IW_MODE_ADHOC : (ap ? IW_MODE_MASTER : (wet ? IW_MODE_REPEAT : IW_MODE_INFRA)));
-       IW_SET_EXT_ERR(skfd, ifname, SIOCSIWMODE, &wrq, "Set Mode");

 
        /* Disable radio if wlX_radio is set and not enabled */
        wrq.u.txpower.disabled = nvram_disabled(wl_var("radio"));
 
        wrq.u.txpower.value = -1;
        wrq.u.txpower.fixed = 1;
 
        /* Disable radio if wlX_radio is set and not enabled */
        wrq.u.txpower.disabled = nvram_disabled(wl_var("radio"));
 
        wrq.u.txpower.value = -1;
        wrq.u.txpower.fixed = 1;

-       wrq.u.txpower.flags = IW_TXPOW_MWATT;
+       wrq.u.txpower.flags = IW_TXPOW_DBM;

        IW_SET_EXT_ERR(skfd, ifname, SIOCSIWTXPOW, &wrq, "Set Tx Power");
 
        /* Set up WEP */
        IW_SET_EXT_ERR(skfd, ifname, SIOCSIWTXPOW, &wrq, "Set Tx Power");
 
        /* Set up WEP */

-       if (nvram_enabled(wl_var("wep")))
+       if (nvram_enabled(wl_var("wep")) && !wpa_enc)

                setup_wext_wep(skfd, ifname);
                setup_wext_wep(skfd, ifname);

+       
+       /* Set ESSID */
+       set_wext_ssid(skfd, ifname);

 
 }
 
 
 }
 


@@ -414,9 +474,16 @@ static int setup_interfaces(int skfd, char *ifname, char *args[], int count)
        if(iw_get_ext(skfd, ifname, SIOCGIWNAME, &wrq) < 0)
                return 0;
 
        if(iw_get_ext(skfd, ifname, SIOCGIWNAME, &wrq) < 0)
                return 0;
 

-       setup_bcom(skfd, ifname);
-       setup_wext(skfd, ifname);
-       start_bcom(skfd, ifname);
+       if (strncmp(ifname, "ath", 3) == 0) {
+               set_wext_mode(skfd, ifname);
+               setup_wext(skfd, ifname);
+       } else {
+               stop_bcom(skfd, ifname);
+               set_wext_mode(skfd, ifname);
+               setup_bcom(skfd, ifname);
+               setup_wext(skfd, ifname);
+       }
+       

        prefix[2]++;
 }
 
        prefix[2]++;
 }