add libvorbisidec package (thanks to David Collet)

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

diff --git a/package/wificonf/wificonf.c b/package/wificonf/wificonf.c
index b8eae25..b3acbff 100644 (file)
--- a/package/wificonf/wificonf.c
+++ b/package/wificonf/wificonf.c
@@ -80,6 +80,7 @@ void set_wext_ssid(int skfd, char *ifname);
 
 char *prefix;
 char buffer[128];
+int wpa_enc = 0;
 
 char *wl_var(char *name)
 {
@@ -125,11 +126,11 @@ int bcom_set_val(int skfd, char *ifname, char *var, void *val, int len)
                return -1;
 
        strcpy(buf, var);
+       memcpy(&buf[strlen(var) + 1], val, len);
        
        if ((ret = bcom_ioctl(skfd, ifname, WLC_SET_VAR, buf, sizeof(buf))))
                return ret;
 
-       memcpy(val, buf, len);
        return 0;       
 }
 
@@ -171,10 +172,13 @@ void setup_bcom(int skfd, char *ifname)
        char buf[8192];
        char wbuf[80];
        char *v;
+       int wds_enabled = 0;
        
        if (bcom_ioctl(skfd, ifname, WLC_GET_MAGIC, &val, sizeof(val)) < 0)
                return;
        
+       nvram_set(wl_var("ifname"), ifname);
+       
        stop_bcom(skfd, ifname);
 
        /* Set Country */
@@ -182,19 +186,11 @@ void setup_bcom(int skfd, char *ifname)
        buf[3] = 0;
        bcom_ioctl(skfd, ifname, WLC_SET_COUNTRY, buf, 4);
        
-       /* Set up afterburner */
-       val = ABO_AUTO;
-       if (nvram_enabled(wl_var("afterburner")))
-               val = ABO_ON;
-       if (nvram_disabled(wl_var("afterburner")))
-               val = ABO_OFF;
-       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"));
+       wds_enabled = val;
+       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));
@@ -268,11 +264,25 @@ void setup_bcom(int skfd, char *ifname)
                        if (ether_atoe(wbuf, addr->ether_addr_octet)) {
                                wdslist->count++;
                                addr++;
+                               wds_enabled = 1;
                        }
                }
                bcom_ioctl(skfd, ifname, WLC_SET_WDSLIST, buf, sizeof(buf));
        }
        
+       /* Set up afterburner, disabled it if WDS is enabled */
+       if (wds_enabled) {
+               val = ABO_OFF;
+       } else {
+               val = ABO_AUTO;
+               if (nvram_enabled(wl_var("afterburner")))
+                       val = ABO_ON;
+               if (nvram_disabled(wl_var("afterburner")))
+                       val = ABO_OFF;
+       }
+       
+       bcom_set_val(skfd, ifname, "afterburner_override", &val, sizeof(val));
+       
        /* Set up G mode */
        bcom_ioctl(skfd, ifname, WLC_GET_PHYTYPE, &val, sizeof(val));
        if (val == 2) {
@@ -316,12 +326,14 @@ void setup_bcom(int skfd, char *ifname)
                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"))
+               else if (nvram_match(wl_var("crypto"), "tkip+aes") || nvram_match(wl_var("crypto"), "aes+tkip"))
                        val = TKIP_ENABLED | AES_ENABLED;
                else
                        val = 0;
@@ -355,30 +367,29 @@ void setup_bcom(int skfd, char *ifname)
 
                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 set_wext_ssid(int skfd, char *ifname)
 {
        char *buffer;
+       char essid[IW_ESSID_MAX_SIZE + 1];
        struct iwreq wrq;
 
-       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");
-               }
-       }
+       buffer = nvram_get(wl_var("ssid"));
+       
+       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)
 {
        int i, keylen;
@@ -386,7 +397,8 @@ void setup_wext_wep(int skfd, char *ifname)
        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))) {
@@ -402,7 +414,7 @@ void setup_wext_wep(int skfd, char *ifname)
                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;
@@ -418,7 +430,7 @@ void set_wext_mode(skfd, ifname)
        /* 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");
+       wet = !ap && !nvram_disabled(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");
@@ -452,7 +464,7 @@ void setup_wext(int skfd, char *ifname)
        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);
        
        /* Set ESSID */
@@ -472,10 +484,15 @@ static int setup_interfaces(int skfd, char *ifname, char *args[], int count)
        if(iw_get_ext(skfd, ifname, SIOCGIWNAME, &wrq) < 0)
                return 0;
 
-       stop_bcom(skfd, ifname);
-       set_wext_mode(skfd, ifname);
-       setup_bcom(skfd, ifname);
-       setup_wext(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]++;
 }