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); \
- 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); \
- return; \
} while(0)
/*------------------------------------------------------------------*/
ERR_SET_EXT(rname, request); \
fprintf(stderr, " SET failed on device %-1.16s ; %s.\n", \
ifname, strerror(errno)); \
- return; \
} } while(0)
/*------------------------------------------------------------------*/
ERR_SET_EXT(rname, request); \
fprintf(stderr, " GET failed on device %-1.16s ; %s.\n", \
ifname, strerror(errno)); \
- return; \
} } while(0)
char *prefix;
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;
}
void setup_bcom(int skfd, char *ifname)
{
int val = 0;
+ char buf[8192];
+ char wbuf[80];
char *v;
if (bcom_ioctl(skfd, ifname, WLC_GET_MAGIC, &val, sizeof(val)) < 0)
bcom_ioctl(skfd, ifname, WLC_DOWN, NULL, 0);
- /* 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));
+ 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));
+ }
}
/* Set up afterburner */
bcom_set_val(skfd, ifname, "afterburner_override", &val, sizeof(val));
/* Set other options */
- val = atoi(nvram_safe_get(wl_var("lazywds")));
- bcom_ioctl(skfd, ifname, WLC_SET_LAZYWDS, &val, sizeof(val));
- val = atoi(nvram_safe_get(wl_var("frag")));
- bcom_ioctl(skfd, ifname, WLC_SET_FRAG, &val, sizeof(val));
- val = atoi(nvram_safe_get(wl_var("dtim")));
- bcom_ioctl(skfd, ifname, WLC_SET_DTIMPRD, &val, sizeof(val));
- val = atoi(nvram_safe_get(wl_var("bcn")));
- bcom_ioctl(skfd, ifname, WLC_SET_BCNPRD, &val, sizeof(val));
- val = atoi(nvram_safe_get(wl_var("rts")));
- bcom_ioctl(skfd, ifname, WLC_SET_RTS, &val, sizeof(val));
- val = atoi(nvram_safe_get(wl_var("antdiv")));
- bcom_ioctl(skfd, ifname, WLC_SET_ANTDIV, &val, sizeof(val));
- val = atoi(nvram_safe_get(wl_var("txant")));
- bcom_ioctl(skfd, ifname, WLC_SET_TXANT, &val, sizeof(val));
+ if (v = nvram_get(wl_var("lazywds"))) {
+ val = atoi(v);
+ 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("dtim"))) {
+ val = atoi(v);
+ bcom_ioctl(skfd, ifname, WLC_SET_DTIMPRD, &val, sizeof(val));
+ }
+ if (v = nvram_get(wl_var("bcn"))) {
+ val = atoi(v);
+ bcom_ioctl(skfd, ifname, WLC_SET_BCNPRD, &val, sizeof(val));
+ }
+ if (v = nvram_get(wl_var("rts"))) {
+ val = atoi(v);
+ bcom_ioctl(skfd, ifname, WLC_SET_RTS, &val, sizeof(val));
+ }
+ if (v = nvram_get(wl_var("antdiv"))) {
+ val = atoi(v);
+ bcom_ioctl(skfd, ifname, WLC_SET_ANTDIV, &val, sizeof(val));
+ }
+ if (v = nvram_get(wl_var("txant"))) {
+ val = atoi(v);
+ bcom_ioctl(skfd, ifname, WLC_SET_TXANT, &val, sizeof(val));
+ }
+
+ val = nvram_enabled(wl_var("closed"));
+ bcom_ioctl(skfd, ifname, WLC_SET_CLOSED, &val, sizeof(val));
val = nvram_enabled(wl_var("ap_isolate"));
bcom_set_int(skfd, ifname, "ap_isolate", val);
val = WLC_MACMODE_DISABLED;
if ((val != WLC_MACMODE_DISABLED) && (v = nvram_get(wl_var("maclist")))) {
- char buf[8192];
struct maclist *mac_list;
struct ether_addr *addr;
char *next;
mac_list = (struct maclist *) buf;
addr = mac_list->ea;
- v = malloc(80);
- foreach(v, nvram_safe_get(wl_var("maclist")), next) {
- if (ether_atoe(v, addr->ether_addr_octet)) {
+ foreach(wbuf, v, next) {
+ if (ether_atoe(wbuf, addr->ether_addr_octet)) {
mac_list->count++;
addr++;
}
}
- free(v);
bcom_ioctl(skfd, ifname, WLC_SET_MACLIST, buf, sizeof(buf));
} else {
val = WLC_MACMODE_DISABLED;
}
bcom_ioctl(skfd, ifname, WLC_SET_MACMODE, &val, sizeof(val));
+
+ if (v = nvram_get(wl_var("wds"))) {
+ struct maclist *wdslist = (struct maclist *) buf;
+ struct ether_addr *addr = wdslist->ea;
+ char *next;
+
+ memset(buf, 0, 8192);
+ foreach(wbuf, v, next) {
+ if (ether_atoe(wbuf, addr->ether_addr_octet)) {
+ wdslist->count++;
+ addr++;
+ }
+ }
+ bcom_ioctl(skfd, ifname, WLC_SET_WDSLIST, buf, sizeof(buf));
+ }
/* Set up G mode */
bcom_ioctl(skfd, ifname, WLC_GET_PHYTYPE, &val, sizeof(val));
int override = WLC_G_PROTECTION_OFF;
int control = WLC_G_PROTECTION_CTL_OFF;
- val = atoi(nvram_safe_get(wl_var("gmode")));
+ if (v = nvram_get(wl_var("gmode")))
+ val = atoi(v);
+ else
+ val = 1;
+
if (val > 5)
val = 1;
+
bcom_ioctl(skfd, ifname, WLC_SET_GMODE, &val, sizeof(val));
if (nvram_match(wl_var("gmode_protection"), "auto")) {
}
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)
if (channel > 0) {
wrq.u.freq.flags = IW_FREQ_FIXED;
wrq.u.freq.m = channel;
+ IW_SET_EXT_ERR(skfd, ifname, SIOCSIWFREQ, &wrq, "Set Frequency");
}
- 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"), "ap") || nvram_match(wl_var("mode"), "wds"));
- infra = nvram_enabled(wl_var("infra"));
+ 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 */
- if (nvram_disabled(wl_var("radio")))
- wrq.u.txpower.disabled = 1;
- else
- wrq.u.txpower.disabled = 0;
+ 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 */
projects / openwrt.git / blobdiff