[package] iwinfo: properly cast nl80211 mBm signal levels to reported dBm values...

[openwrt.git] / package / iwinfo / src / iwinfo_wext.c

diff --git a/package/iwinfo/src/iwinfo_wext.c b/package/iwinfo/src/iwinfo_wext.c
index 314882a..cf3dccc 100644 (file)
--- a/package/iwinfo/src/iwinfo_wext.c
+++ b/package/iwinfo/src/iwinfo_wext.c
@@ -70,7 +70,7 @@ void wext_close(void)
        /* Nop */
 }
 
        /* Nop */
 }
 

-int wext_get_mode(const char *ifname, char *buf)
+int wext_get_mode(const char *ifname, int *buf)

 {
        struct iwreq wrq;
 
 {
        struct iwreq wrq;
 


@@ -78,36 +78,25 @@ int wext_get_mode(const char *ifname, char *buf)
        {
                switch(wrq.u.mode)
                {
        {
                switch(wrq.u.mode)
                {

-                       case 0:
-                               sprintf(buf, "Auto");
-                               break;
-

                        case 1:
                        case 1:

-                               sprintf(buf, "Ad-Hoc");
+                               *buf = IWINFO_OPMODE_ADHOC;

                                break;
 
                        case 2:
                                break;
 
                        case 2:

-                               sprintf(buf, "Client");
+                               *buf = IWINFO_OPMODE_CLIENT;

                                break;
 
                        case 3:
                                break;
 
                        case 3:

-                               sprintf(buf, "Master");
-                               break;
-
-                       case 4:
-                               sprintf(buf, "Repeater");
-                               break;
-
-                       case 5:
-                               sprintf(buf, "Secondary");
+                               *buf = IWINFO_OPMODE_MASTER;

                                break;
 
                        case 6:
                                break;
 
                        case 6:

-                               sprintf(buf, "Monitor");
+                               *buf = IWINFO_OPMODE_MONITOR;

                                break;
 
                        default:
                                break;
 
                        default:

-                               sprintf(buf, "Unknown");
+                               *buf = IWINFO_OPMODE_UNKNOWN;
+                               break;

                }
 
                return 0;
                }
 
                return 0;


@@ -428,6 +417,8 @@ int wext_get_hwmodelist(const char *ifname, int *buf)
        struct iwinfo_freqlist_entry *e = NULL;
        int len = 0;
 
        struct iwinfo_freqlist_entry *e = NULL;
        int len = 0;
 

+       *buf = 0;
+

        if( !wext_get_freqlist(ifname, chans, &len) )
        {
                for( e = (struct iwinfo_freqlist_entry *)chans; e->channel; e++ )
        if( !wext_get_freqlist(ifname, chans, &len) )
        {
                for( e = (struct iwinfo_freqlist_entry *)chans; e->channel; e++ )


@@ -460,3 +451,70 @@ int wext_get_mbssid_support(const char *ifname, int *buf)
        /* No multi bssid support atm */
        return -1;
 }
        /* No multi bssid support atm */
        return -1;
 }

+
+static char * wext_sysfs_ifname_file(const char *ifname, const char *path)
+{
+       FILE *f;
+       static char buf[128];
+       char *rv = NULL;
+
+       snprintf(buf, sizeof(buf), "/sys/class/net/%s/%s", ifname, path);
+
+       if ((f = fopen(buf, "r")) != NULL)
+       {
+               memset(buf, 0, sizeof(buf));
+
+               if (fread(buf, 1, sizeof(buf), f))
+                       rv = buf;
+
+               fclose(f);
+       }
+
+       return rv;
+}
+
+int wext_get_hardware_id(const char *ifname, char *buf)
+{
+       char *data;
+       struct iwinfo_hardware_id *id = (struct iwinfo_hardware_id *)buf;
+
+       memset(id, 0, sizeof(struct iwinfo_hardware_id));
+
+       data = wext_sysfs_ifname_file(ifname, "device/vendor");
+       if (data)
+               id->vendor_id = strtoul(data, NULL, 16);
+
+       data = wext_sysfs_ifname_file(ifname, "device/device");
+       if (data)
+               id->device_id = strtoul(data, NULL, 16);
+
+       data = wext_sysfs_ifname_file(ifname, "device/subsystem_device");
+       if (data)
+               id->subsystem_device_id = strtoul(data, NULL, 16);
+
+       data = wext_sysfs_ifname_file(ifname, "device/subsystem_vendor");
+       if (data)
+               id->subsystem_vendor_id = strtoul(data, NULL, 16);
+
+       return (id->vendor_id > 0 && id->device_id > 0) ? 0 : -1;
+}
+
+int wext_get_hardware_name(const char *ifname, char *buf)
+{
+       sprintf(buf, "Generic WEXT");
+       return 0;
+}
+
+int wext_get_txpower_offset(const char *ifname, int *buf)
+{
+       /* Stub */
+       *buf = 0;
+       return -1;
+}
+
+int wext_get_frequency_offset(const char *ifname, int *buf)
+{
+       /* Stub */
+       *buf = 0;
+       return -1;
+}