move wificonf to target/linux/package
authorFelix Fietkau <nbd@openwrt.org>
Sat, 23 Jul 2005 19:04:55 +0000 (19:04 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sat, 23 Jul 2005 19:04:55 +0000 (19:04 +0000)
SVN-Revision: 1537

openwrt/package/Config.in
openwrt/package/Makefile
openwrt/package/wificonf/Config.in [deleted file]
openwrt/package/wificonf/Makefile [deleted file]
openwrt/package/wificonf/ipkg/wificonf.control [deleted file]
openwrt/package/wificonf/wificonf.c [deleted file]
openwrt/target/linux/package/Makefile
openwrt/target/linux/package/wificonf/Config.in [new file with mode: 0644]
openwrt/target/linux/package/wificonf/Makefile [new file with mode: 0644]
openwrt/target/linux/package/wificonf/ipkg/wificonf.control [new file with mode: 0644]
openwrt/target/linux/package/wificonf/wificonf.c [new file with mode: 0644]

index 93e55e73a7d9a0727f469668f710c68137427fdc..52c98588aeef86cecbcaf22b4955abd06644ba30 100644 (file)
@@ -98,7 +98,7 @@ source "package/wol/Config.in"
 source "package/wpa_supplicant/Config.in"
 source "package/wput/Config.in"
 source "package/xinetd/Config.in"
-source "package/wificonf/Config.in"
+source "target/linux/package/wificonf/Config.in"
 
 comment "Libraries"
 source "package/glib/Config.in"
index 0d4d75ebf88826a1e3d6e2404394ef050c970ef3..8e3a29e31756e89a93fcf3d7271f6766367d126e 100644 (file)
@@ -134,7 +134,6 @@ package-$(BR2_PACKAGE_ULOGD) += ulogd
 package-$(BR2_PACKAGE_USBUTILS) += usbutils
 package-$(BR2_PACKAGE_VTUN) += vtun
 package-$(BR2_PACKAGE_VSFTPD) += vsftpd
-package-$(BR2_PACKAGE_WIFICONF) += wificonf
 package-$(BR2_PACKAGE_WIRELESS_TOOLS) += wireless-tools
 package-$(BR2_PACKAGE_WOL) += wol
 package-$(BR2_PACKAGE_WPA_SUPPLICANT) += wpa_supplicant
diff --git a/openwrt/package/wificonf/Config.in b/openwrt/package/wificonf/Config.in
deleted file mode 100644 (file)
index c346f5f..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-config BR2_PACKAGE_WIFICONF
-       tristate "wificonf - replacement utility for wlconf"
-       default y
-       help
-         Replacement utility for wlconf
diff --git a/openwrt/package/wificonf/Makefile b/openwrt/package/wificonf/Makefile
deleted file mode 100644 (file)
index aa03683..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id$
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=wificonf
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/wificonf
-
-include $(TOPDIR)/package/rules.mk
-
-
-
-
-$(eval $(call PKG_template,WIFICONF,$(PKG_NAME),$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.prepared:
-       mkdir -p $@
-       touch $@
-
-$(PKG_BUILD_DIR)/.built:
-       $(TARGET_CC) $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -o $(PKG_BUILD_DIR)/wifi wificonf.c -L$(STAGING_DIR)/usr/lib -lnvram -lshared $(STAGING_DIR)/usr/lib/libiw.so
-       touch $@
-
-$(IPKG_WIFICONF):
-       install -d -m0755 $(IDIR_WIFICONF)/sbin
-       install -m0755 $(PKG_BUILD_DIR)/wifi $(IDIR_WIFICONF)/sbin/
-       $(RSTRIP) $(IDIR_WIFICONF)
-       $(IPKG_BUILD) $(IDIR_WIFICONF) $(PACKAGE_DIR)
diff --git a/openwrt/package/wificonf/ipkg/wificonf.control b/openwrt/package/wificonf/ipkg/wificonf.control
deleted file mode 100644 (file)
index 78e8097..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: wificonf
-Priority: optional
-Section: net
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
-Description: Replacement utility for wlconf
diff --git a/openwrt/package/wificonf/wificonf.c b/openwrt/package/wificonf/wificonf.c
deleted file mode 100644 (file)
index 24a9c2f..0000000
+++ /dev/null
@@ -1,495 +0,0 @@
-/*
- * Wireless Network Adapter configuration utility
- *
- * Copyright (C) 2005 Felix Fietkau <nbd@vd-s.ath.cx>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <iwlib.h>
-#include <bcmnvram.h>
-#include <shutils.h>
-#include <wlioctl.h>
-
-/*------------------------------------------------------------------*/
-/*
- * Macro to handle errors when setting WE
- * Print a nice error message and exit...
- * We define them as macro so that "return" do the right thing.
- * The "do {...} while(0)" is a standard trick
- */
-#define ERR_SET_EXT(rname, request) \
-       fprintf(stderr, "Error for wireless request \"%s\" (%X) :\n", \
-               rname, request)
-
-#define ABORT_ARG_NUM(rname, request) \
-       do { \
-               ERR_SET_EXT(rname, request); \
-               fprintf(stderr, "    too few arguments.\n"); \
-       } 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_SIZE(rname, request, max) \
-       do { \
-               ERR_SET_EXT(rname, request); \
-               fprintf(stderr, "    argument too big (max %d)\n", max); \
-       } while(0)
-
-/*------------------------------------------------------------------*/
-/*
- * Wrapper to push some Wireless Parameter in the driver
- * Use standard wrapper and add pretty error message if fail...
- */
-#define IW_SET_EXT_ERR(skfd, ifname, request, wrq, rname) \
-       do { \
-       if(iw_set_ext(skfd, ifname, request, wrq) < 0) { \
-               ERR_SET_EXT(rname, request); \
-               fprintf(stderr, "    SET failed on device %-1.16s ; %s.\n", \
-                       ifname, strerror(errno)); \
-       } } while(0)
-
-/*------------------------------------------------------------------*/
-/*
- * Wrapper to extract some Wireless Parameter out of the driver
- * Use standard wrapper and add pretty error message if fail...
- */
-#define IW_GET_EXT_ERR(skfd, ifname, request, wrq, rname) \
-       do { \
-       if(iw_get_ext(skfd, ifname, request, wrq) < 0) { \
-               ERR_SET_EXT(rname, request); \
-               fprintf(stderr, "    GET failed on device %-1.16s ; %s.\n", \
-                       ifname, strerror(errno)); \
-       } } while(0)
-
-void set_wext_ssid(int skfd, char *ifname);
-
-char *prefix;
-char buffer[128];
-
-char *wl_var(char *name)
-{
-       strcpy(buffer, prefix);
-       strcat(buffer, name);
-}
-
-int nvram_enabled(char *name)
-{
-       return (nvram_match(name, "1") || nvram_match(name, "on") || nvram_match(name, "enabled") || nvram_match(name, "true") || nvram_match(name, "yes") ? 1 : 0);
-}
-
-int nvram_disabled(char *name)
-{
-       return (nvram_match(name, "0") || nvram_match(name, "off") || nvram_match(name, "disabled") || nvram_match(name, "false") || nvram_match(name, "no") ? 1 : 0);
-}
-
-
-int bcom_ioctl(int skfd, char *ifname, int cmd, void *buf, int len)
-{
-       struct ifreq ifr;
-       wl_ioctl_t ioc;
-       int ret;
-       
-       ioc.cmd = cmd;
-       ioc.buf = buf;
-       ioc.len = len;
-       
-       ifr.ifr_data = (caddr_t) &ioc;
-       strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-
-       ret = ioctl(skfd, SIOCDEVPRIVATE, &ifr);
-
-       return ret;
-}
-
-int bcom_set_val(int skfd, char *ifname, char *var, void *val, int len)
-{
-       char buf[8192];
-       int ret;
-       
-       if (strlen(var) + 1 > sizeof(buf) || len > sizeof(buf))
-               return -1;
-
-       strcpy(buf, var);
-       
-       if ((ret = bcom_ioctl(skfd, ifname, WLC_GET_VAR, buf, sizeof(buf))))
-               return ret;
-
-       memcpy(val, buf, len);
-       return 0;       
-}
-
-int bcom_set_int(int skfd, char *ifname, char *var, int 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;
-       char buf[8192];
-       char wbuf[80];
-       char *v;
-       
-       if (bcom_ioctl(skfd, ifname, WLC_GET_MAGIC, &val, sizeof(val)) < 0)
-               return;
-       
-       stop_bcom(skfd, ifname);
-
-       /* Set Country */
-       strncpy(buf, nvram_safe_get(wl_var("country_code")), 4);
-       buf[3] = 0;
-       bcom_ioctl(skfd, ifname, 273, 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));
-       }
-       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 = nvram_enabled(wl_var("frameburst"));
-       bcom_ioctl(skfd, ifname, WLC_SET_FAKEFRAG, &val, sizeof(val));
-
-       /* Set up MAC list */
-       if (nvram_match(wl_var("macmode"), "allow"))
-               val = WLC_MACMODE_ALLOW;
-       else if (nvram_match(wl_var("macmode"), "deny"))
-               val = WLC_MACMODE_DENY;
-       else
-               val = WLC_MACMODE_DISABLED;
-
-       if ((val != WLC_MACMODE_DISABLED) && (v = nvram_get(wl_var("maclist")))) {
-               struct maclist *mac_list;
-               struct ether_addr *addr;
-               char *next;
-               
-               memset(buf, 0, 8192);
-               mac_list = (struct maclist *) buf;
-               addr = mac_list->ea;
-               
-               foreach(wbuf, v, next) {
-                       if (ether_atoe(wbuf, addr->ether_addr_octet)) {
-                               mac_list->count++;
-                               addr++;
-                       }
-               }
-               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));
-       if (val == 2) {
-               int override = WLC_G_PROTECTION_OFF;
-               int control = WLC_G_PROTECTION_CTL_OFF;
-               
-               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")) {
-                       override = WLC_G_PROTECTION_AUTO;
-                       control = WLC_G_PROTECTION_CTL_OVERLAP;
-               }
-               if (nvram_enabled(wl_var("gmode_protection"))) {
-                       override = WLC_G_PROTECTION_ON;
-                       control = WLC_G_PROTECTION_CTL_OVERLAP;
-               }
-               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));
-               }
-       }
-
-       start_bcom(skfd, ifname);
-
-       if (!(v = nvram_get(wl_var("akm"))))
-               v = nvram_safe_get(wl_var("auth_mode"));
-       
-       if (strstr(v, "wpa") || strstr(v, "psk")) {
-               /* 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));
-       }
-
-
-}
-
-void set_wext_ssid(int skfd, char *ifname)
-{
-       char *buffer;
-       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");
-               }
-       }
-}
-void setup_wext_wep(int skfd, char *ifname)
-{
-       int i, keylen;
-       struct iwreq wrq;
-       char keystr[5];
-       char *keyval;
-       unsigned char key[IW_ENCODING_TOKEN_MAX];
-
-       strcpy(keystr, "key1");
-       for (i = 1; i <= 4; i++) {
-               if (keyval = nvram_get(wl_var(keystr))) {
-                       keylen = iw_in_key(keyval, key);
-                       
-                       if (keylen > 0) {
-                               wrq.u.data.length = keylen;
-                               wrq.u.data.pointer = (caddr_t) key;
-                               wrq.u.data.flags = i;
-                               IW_SET_EXT_ERR(skfd, ifname, SIOCSIWENCODE, &wrq, "Set Encode");
-                       }
-               }
-               keystr[3]++;
-       }
-       
-       
-       i = atoi(nvram_safe_get(wl_var("key")));
-       if (i > 0 && i < 4) {
-               wrq.u.data.flags = i | IW_ENCODE_RESTRICTED;
-               IW_SET_EXT_ERR(skfd, ifname, SIOCSIWENCODE, &wrq, "Set Encode");
-       }
-}
-
-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");
-       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");
-}
-
-void setup_wext(int skfd, char *ifname)
-{
-       char *buffer;
-       struct iwreq wrq;
-
-       /* Set channel */
-       int channel = atoi(nvram_safe_get(wl_var("channel")));
-       
-       wrq.u.freq.m = -1;
-       wrq.u.freq.e = 0;
-       wrq.u.freq.flags = 0;
-
-       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");
-       }
-
-
-       /* 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_DBM;
-       IW_SET_EXT_ERR(skfd, ifname, SIOCSIWTXPOW, &wrq, "Set Tx Power");
-
-       /* Set up WEP */
-       if (nvram_enabled(wl_var("wep")))
-               setup_wext_wep(skfd, ifname);
-       
-       /* Set ESSID */
-       set_wext_ssid(skfd, ifname);
-
-}
-
-
-static int setup_interfaces(int skfd, char *ifname, char *args[], int count)
-{
-       struct iwreq wrq;
-       int rc;
-       
-       /* Avoid "Unused parameter" warning */
-       args = args; count = 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);
-       
-       prefix[2]++;
-}
-
-int main(int argc, char **argv)
-{
-       int skfd;
-       if((skfd = iw_sockets_open()) < 0) {
-               perror("socket");
-               exit(-1);
-       }
-
-       prefix = strdup("wl0_");
-       iw_enum_devices(skfd, &setup_interfaces, NULL, 0);
-       
-       return 0;
-}
index a08d9048ab3272b074df8d4be08948dfcda05151..84402cce2ed73b8704a92535b8ba601d04774d5c 100644 (file)
@@ -8,6 +8,7 @@ package-$(BR2_PACKAGE_KMOD_OPENSWAN) += openswan
 package-y += openwrt
 
 ifeq ($(BOARD),brcm)
+package-$(BR2_PACKAGE_WIFICONF) += wificonf
 package-y += nvram
 
 ifeq ($(LINUX_VERSION),2.4.30)
diff --git a/openwrt/target/linux/package/wificonf/Config.in b/openwrt/target/linux/package/wificonf/Config.in
new file mode 100644 (file)
index 0000000..c346f5f
--- /dev/null
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_WIFICONF
+       tristate "wificonf - replacement utility for wlconf"
+       default y
+       help
+         Replacement utility for wlconf
diff --git a/openwrt/target/linux/package/wificonf/Makefile b/openwrt/target/linux/package/wificonf/Makefile
new file mode 100644 (file)
index 0000000..aa03683
--- /dev/null
@@ -0,0 +1,29 @@
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=wificonf
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/wificonf
+
+include $(TOPDIR)/package/rules.mk
+
+
+
+
+$(eval $(call PKG_template,WIFICONF,$(PKG_NAME),$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.prepared:
+       mkdir -p $@
+       touch $@
+
+$(PKG_BUILD_DIR)/.built:
+       $(TARGET_CC) $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -o $(PKG_BUILD_DIR)/wifi wificonf.c -L$(STAGING_DIR)/usr/lib -lnvram -lshared $(STAGING_DIR)/usr/lib/libiw.so
+       touch $@
+
+$(IPKG_WIFICONF):
+       install -d -m0755 $(IDIR_WIFICONF)/sbin
+       install -m0755 $(PKG_BUILD_DIR)/wifi $(IDIR_WIFICONF)/sbin/
+       $(RSTRIP) $(IDIR_WIFICONF)
+       $(IPKG_BUILD) $(IDIR_WIFICONF) $(PACKAGE_DIR)
diff --git a/openwrt/target/linux/package/wificonf/ipkg/wificonf.control b/openwrt/target/linux/package/wificonf/ipkg/wificonf.control
new file mode 100644 (file)
index 0000000..78e8097
--- /dev/null
@@ -0,0 +1,6 @@
+Package: wificonf
+Priority: optional
+Section: net
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: Replacement utility for wlconf
diff --git a/openwrt/target/linux/package/wificonf/wificonf.c b/openwrt/target/linux/package/wificonf/wificonf.c
new file mode 100644 (file)
index 0000000..24a9c2f
--- /dev/null
@@ -0,0 +1,495 @@
+/*
+ * Wireless Network Adapter configuration utility
+ *
+ * Copyright (C) 2005 Felix Fietkau <nbd@vd-s.ath.cx>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+#include <iwlib.h>
+#include <bcmnvram.h>
+#include <shutils.h>
+#include <wlioctl.h>
+
+/*------------------------------------------------------------------*/
+/*
+ * Macro to handle errors when setting WE
+ * Print a nice error message and exit...
+ * We define them as macro so that "return" do the right thing.
+ * The "do {...} while(0)" is a standard trick
+ */
+#define ERR_SET_EXT(rname, request) \
+       fprintf(stderr, "Error for wireless request \"%s\" (%X) :\n", \
+               rname, request)
+
+#define ABORT_ARG_NUM(rname, request) \
+       do { \
+               ERR_SET_EXT(rname, request); \
+               fprintf(stderr, "    too few arguments.\n"); \
+       } 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_SIZE(rname, request, max) \
+       do { \
+               ERR_SET_EXT(rname, request); \
+               fprintf(stderr, "    argument too big (max %d)\n", max); \
+       } while(0)
+
+/*------------------------------------------------------------------*/
+/*
+ * Wrapper to push some Wireless Parameter in the driver
+ * Use standard wrapper and add pretty error message if fail...
+ */
+#define IW_SET_EXT_ERR(skfd, ifname, request, wrq, rname) \
+       do { \
+       if(iw_set_ext(skfd, ifname, request, wrq) < 0) { \
+               ERR_SET_EXT(rname, request); \
+               fprintf(stderr, "    SET failed on device %-1.16s ; %s.\n", \
+                       ifname, strerror(errno)); \
+       } } while(0)
+
+/*------------------------------------------------------------------*/
+/*
+ * Wrapper to extract some Wireless Parameter out of the driver
+ * Use standard wrapper and add pretty error message if fail...
+ */
+#define IW_GET_EXT_ERR(skfd, ifname, request, wrq, rname) \
+       do { \
+       if(iw_get_ext(skfd, ifname, request, wrq) < 0) { \
+               ERR_SET_EXT(rname, request); \
+               fprintf(stderr, "    GET failed on device %-1.16s ; %s.\n", \
+                       ifname, strerror(errno)); \
+       } } while(0)
+
+void set_wext_ssid(int skfd, char *ifname);
+
+char *prefix;
+char buffer[128];
+
+char *wl_var(char *name)
+{
+       strcpy(buffer, prefix);
+       strcat(buffer, name);
+}
+
+int nvram_enabled(char *name)
+{
+       return (nvram_match(name, "1") || nvram_match(name, "on") || nvram_match(name, "enabled") || nvram_match(name, "true") || nvram_match(name, "yes") ? 1 : 0);
+}
+
+int nvram_disabled(char *name)
+{
+       return (nvram_match(name, "0") || nvram_match(name, "off") || nvram_match(name, "disabled") || nvram_match(name, "false") || nvram_match(name, "no") ? 1 : 0);
+}
+
+
+int bcom_ioctl(int skfd, char *ifname, int cmd, void *buf, int len)
+{
+       struct ifreq ifr;
+       wl_ioctl_t ioc;
+       int ret;
+       
+       ioc.cmd = cmd;
+       ioc.buf = buf;
+       ioc.len = len;
+       
+       ifr.ifr_data = (caddr_t) &ioc;
+       strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
+
+       ret = ioctl(skfd, SIOCDEVPRIVATE, &ifr);
+
+       return ret;
+}
+
+int bcom_set_val(int skfd, char *ifname, char *var, void *val, int len)
+{
+       char buf[8192];
+       int ret;
+       
+       if (strlen(var) + 1 > sizeof(buf) || len > sizeof(buf))
+               return -1;
+
+       strcpy(buf, var);
+       
+       if ((ret = bcom_ioctl(skfd, ifname, WLC_GET_VAR, buf, sizeof(buf))))
+               return ret;
+
+       memcpy(val, buf, len);
+       return 0;       
+}
+
+int bcom_set_int(int skfd, char *ifname, char *var, int 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;
+       char buf[8192];
+       char wbuf[80];
+       char *v;
+       
+       if (bcom_ioctl(skfd, ifname, WLC_GET_MAGIC, &val, sizeof(val)) < 0)
+               return;
+       
+       stop_bcom(skfd, ifname);
+
+       /* Set Country */
+       strncpy(buf, nvram_safe_get(wl_var("country_code")), 4);
+       buf[3] = 0;
+       bcom_ioctl(skfd, ifname, 273, 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));
+       }
+       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 = nvram_enabled(wl_var("frameburst"));
+       bcom_ioctl(skfd, ifname, WLC_SET_FAKEFRAG, &val, sizeof(val));
+
+       /* Set up MAC list */
+       if (nvram_match(wl_var("macmode"), "allow"))
+               val = WLC_MACMODE_ALLOW;
+       else if (nvram_match(wl_var("macmode"), "deny"))
+               val = WLC_MACMODE_DENY;
+       else
+               val = WLC_MACMODE_DISABLED;
+
+       if ((val != WLC_MACMODE_DISABLED) && (v = nvram_get(wl_var("maclist")))) {
+               struct maclist *mac_list;
+               struct ether_addr *addr;
+               char *next;
+               
+               memset(buf, 0, 8192);
+               mac_list = (struct maclist *) buf;
+               addr = mac_list->ea;
+               
+               foreach(wbuf, v, next) {
+                       if (ether_atoe(wbuf, addr->ether_addr_octet)) {
+                               mac_list->count++;
+                               addr++;
+                       }
+               }
+               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));
+       if (val == 2) {
+               int override = WLC_G_PROTECTION_OFF;
+               int control = WLC_G_PROTECTION_CTL_OFF;
+               
+               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")) {
+                       override = WLC_G_PROTECTION_AUTO;
+                       control = WLC_G_PROTECTION_CTL_OVERLAP;
+               }
+               if (nvram_enabled(wl_var("gmode_protection"))) {
+                       override = WLC_G_PROTECTION_ON;
+                       control = WLC_G_PROTECTION_CTL_OVERLAP;
+               }
+               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));
+               }
+       }
+
+       start_bcom(skfd, ifname);
+
+       if (!(v = nvram_get(wl_var("akm"))))
+               v = nvram_safe_get(wl_var("auth_mode"));
+       
+       if (strstr(v, "wpa") || strstr(v, "psk")) {
+               /* 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));
+       }
+
+
+}
+
+void set_wext_ssid(int skfd, char *ifname)
+{
+       char *buffer;
+       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");
+               }
+       }
+}
+void setup_wext_wep(int skfd, char *ifname)
+{
+       int i, keylen;
+       struct iwreq wrq;
+       char keystr[5];
+       char *keyval;
+       unsigned char key[IW_ENCODING_TOKEN_MAX];
+
+       strcpy(keystr, "key1");
+       for (i = 1; i <= 4; i++) {
+               if (keyval = nvram_get(wl_var(keystr))) {
+                       keylen = iw_in_key(keyval, key);
+                       
+                       if (keylen > 0) {
+                               wrq.u.data.length = keylen;
+                               wrq.u.data.pointer = (caddr_t) key;
+                               wrq.u.data.flags = i;
+                               IW_SET_EXT_ERR(skfd, ifname, SIOCSIWENCODE, &wrq, "Set Encode");
+                       }
+               }
+               keystr[3]++;
+       }
+       
+       
+       i = atoi(nvram_safe_get(wl_var("key")));
+       if (i > 0 && i < 4) {
+               wrq.u.data.flags = i | IW_ENCODE_RESTRICTED;
+               IW_SET_EXT_ERR(skfd, ifname, SIOCSIWENCODE, &wrq, "Set Encode");
+       }
+}
+
+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");
+       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");
+}
+
+void setup_wext(int skfd, char *ifname)
+{
+       char *buffer;
+       struct iwreq wrq;
+
+       /* Set channel */
+       int channel = atoi(nvram_safe_get(wl_var("channel")));
+       
+       wrq.u.freq.m = -1;
+       wrq.u.freq.e = 0;
+       wrq.u.freq.flags = 0;
+
+       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");
+       }
+
+
+       /* 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_DBM;
+       IW_SET_EXT_ERR(skfd, ifname, SIOCSIWTXPOW, &wrq, "Set Tx Power");
+
+       /* Set up WEP */
+       if (nvram_enabled(wl_var("wep")))
+               setup_wext_wep(skfd, ifname);
+       
+       /* Set ESSID */
+       set_wext_ssid(skfd, ifname);
+
+}
+
+
+static int setup_interfaces(int skfd, char *ifname, char *args[], int count)
+{
+       struct iwreq wrq;
+       int rc;
+       
+       /* Avoid "Unused parameter" warning */
+       args = args; count = 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);
+       
+       prefix[2]++;
+}
+
+int main(int argc, char **argv)
+{
+       int skfd;
+       if((skfd = iw_sockets_open()) < 0) {
+               perror("socket");
+               exit(-1);
+       }
+
+       prefix = strdup("wl0_");
+       iw_enum_devices(skfd, &setup_interfaces, NULL, 0);
+       
+       return 0;
+}