libiwinfo: madwifi fixes, use direct ioctl calls for vap creation, ifup and ifdown...

[project/luci.git] / contrib / package / iwinfo / src / iwinfo_wext.c

diff --git a/contrib/package/iwinfo/src/iwinfo_wext.c b/contrib/package/iwinfo/src/iwinfo_wext.c
index 8ea3802..5300f1b 100644 (file)
--- a/contrib/package/iwinfo/src/iwinfo_wext.c
+++ b/contrib/package/iwinfo/src/iwinfo_wext.c
@@ -89,7 +89,10 @@ static int wext_ioctl(const char *ifname, int cmd, struct iwreq *wrq)
 {
        /* prepare socket */
        if( ioctl_socket == -1 )
+       {
                ioctl_socket = socket(AF_INET, SOCK_DGRAM, 0);
+               fcntl(ioctl_socket, F_SETFD, fcntl(ioctl_socket, F_GETFD) | FD_CLOEXEC);
+       }
 
        if( !strncmp(ifname, "mon.", 4) )
                strncpy(wrq->ifr_name, &ifname[4], IFNAMSIZ);
@@ -110,6 +113,14 @@ int wext_probe(const char *ifname)
        return 0;
 }
 
+void wext_close(void)
+{
+       wext_scan_close();
+
+       if( ioctl_socket > -1 )
+               close(ioctl_socket);
+}
+
 int wext_get_mode(const char *ifname, char *buf)
 {
        struct iwreq wrq;
@@ -184,7 +195,7 @@ int wext_get_bssid(const char *ifname, char *buf)
                return 0;
        }
 
-       return -1;      
+       return -1;
 }
 
 int wext_get_bitrate(const char *ifname, int *buf)
@@ -197,7 +208,7 @@ int wext_get_bitrate(const char *ifname, int *buf)
                return 0;
        }
 
-       return -1;      
+       return -1;
 }
 
 int wext_get_channel(const char *ifname, int *buf)
@@ -235,7 +246,7 @@ int wext_get_channel(const char *ifname, int *buf)
                }
        }
 
-       return -1;      
+       return -1;
 }
 
 int wext_get_frequency(const char *ifname, int *buf)
@@ -273,7 +284,7 @@ int wext_get_frequency(const char *ifname, int *buf)
                }
        }
 
-       return -1;      
+       return -1;
 }
 
 int wext_get_txpower(const char *ifname, int *buf)
@@ -394,16 +405,18 @@ int wext_get_txpwrlist(const char *ifname, char *buf, int *len)
        ) {
                for( i = 0; i < range.num_txpower; i++ )
                {
-                       if( range.txpower_capa & IW_TXPOW_DBM )
+                       if( range.txpower_capa & IW_TXPOW_MWATT )
                        {
-                               entry.dbm = range.txpower[i];
-                               entry.mw  = wext_dbm2mw(range.txpower[i]);
+                               entry.dbm = wext_mw2dbm(range.txpower[i]);
+                               entry.mw  = range.txpower[i];
                        }
 
-                       else if( range.txpower_capa & IW_TXPOW_MWATT )
+                       /* Madwifi does neither set mW not dBm caps, also iwlist assumes
+                        * dBm if mW is not set, so don't check here... */
+                       else /* if( range.txpower_capa & IW_TXPOW_DBM ) */
                        {
-                               entry.dbm = wext_mw2dbm(range.txpower[i]);
-                               entry.mw  = range.txpower[i];
+                               entry.dbm = range.txpower[i];
+                               entry.mw  = wext_dbm2mw(range.txpower[i]);
                        }
 
                        memcpy(&buf[i*sizeof(entry)], &entry, sizeof(entry));
@@ -413,7 +426,7 @@ int wext_get_txpwrlist(const char *ifname, char *buf, int *len)
                return 0;
        }
 
-       return -1;      
+       return -1;
 }
 
 int wext_get_freqlist(const char *ifname, char *buf, int *len)
@@ -433,8 +446,9 @@ int wext_get_freqlist(const char *ifname, char *buf, int *len)
 
                for(i = 0; i < range.num_frequency; i++)
                {
-                       entry.mhz     = wext_freq2mhz(&range.freq[i]);
-                       entry.channel = range.freq[i].i;
+                       entry.mhz        = wext_freq2mhz(&range.freq[i]);
+                       entry.channel    = range.freq[i].i;
+                       entry.restricted = 0;
 
                        memcpy(&buf[bl], &entry, sizeof(struct iwinfo_freqlist_entry));
                        bl += sizeof(struct iwinfo_freqlist_entry);
@@ -447,6 +461,45 @@ int wext_get_freqlist(const char *ifname, char *buf, int *len)
        return -1;
 }
 
+int wext_get_country(const char *ifname, char *buf)
+{
+       sprintf(buf, "00");
+       return 0;
+}
+
+int wext_get_countrylist(const char *ifname, char *buf, int *len)
+{
+       /* Stub */
+       return -1;
+}
+
+int wext_get_hwmodelist(const char *ifname, int *buf)
+{
+       char chans[IWINFO_BUFSIZE] = { 0 };
+       struct iwinfo_freqlist_entry *e = NULL;
+       int len = 0;
+
+       if( !wext_get_freqlist(ifname, chans, &len) )
+       {
+               for( e = (struct iwinfo_freqlist_entry *)chans; e->channel; e++ )
+               {
+                       if( e->channel <= 14 )
+                       {
+                               *buf |= IWINFO_80211_B;
+                               *buf |= IWINFO_80211_G;
+                       }
+                       else
+                       {
+                               *buf |= IWINFO_80211_A;
+                       }
+               }
+
+               return 0;
+       }
+
+       return -1;
+}
+
 int wext_get_encryption(const char *ifname, char *buf)
 {
        /* No reliable crypto info in wext */
@@ -458,4 +511,3 @@ int wext_get_mbssid_support(const char *ifname, int *buf)
        /* No multi bssid support atm */
        return -1;
 }
-