Changeset 1346

Timestamp:

11/24/05 00:07:30 (3 years ago)

Author:

proski

Message:

Slightly more robust approach to ioctl error reporting - don't
hardcode ioctl numbers as array indices.

Files:

• trunk/tools/athchans.c (modified) (2 diffs)
• trunk/tools/athkey.c (modified) (2 diffs)
• trunk/tools/wlanconfig.c (modified) (2 diffs)

trunk/tools/athchans.c

@@ -68 +68 @@
-}
-
+#define IOCTL_ERR(x) [x - SIOCIWFIRSTPRIV] "ioctl[" #x "]"
-static int
-set80211priv(const char *dev, int op, void *data, int len, int show_err)
@@ -95 +96 @@
-                if (show_err) {
-                        static const char *opnames[] = {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        };
-                        if (IEEE80211_IOCTL_SETPARAM <= op &&

trunk/tools/athkey.c

@@ -68 +68 @@
-}
-
+#define IOCTL_ERR(x) [x - SIOCIWFIRSTPRIV] "ioctl[" #x "]"
-static int
-set80211priv(const char *dev, int op, void *data, int len, int show_err)
@@ -95 +96 @@
-                if (show_err) {
-                        static const char *opnames[] = {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        };
-                        if (IEEE80211_IOCTL_SETPARAM <= op &&

trunk/tools/wlanconfig.c

@@ -831 +831 @@
-}
-
+#define IOCTL_ERR(x) [x - SIOCIWFIRSTPRIV] "ioctl[" #x "]"
-static int
-do80211priv(struct iwreq *iwr, const char *ifname, int op, void *data, size_t len)
@@ -855 +856 @@
-        if (ioctl(getsocket(), op, iwr) < 0) {
-                static const char *opnames[] = {
-"ioctl[IEEE80211_IOCTL_SETPARAM]"
-"ioctl[IEEE80211_IOCTL_GETPARAM]"
-"ioctl[IEEE80211_IOCTL_SETKEY]"
-"ioctl[SIOCIWFIRSTPRIV+3]"
-"ioctl[IEEE80211_IOCTL_DELKEY]"
-"ioctl[SIOCIWFIRSTPRIV+5]"
-"ioctl[IEEE80211_IOCTL_SETMLME]"
-"ioctl[SIOCIWFIRSTPRIV+7]"
-"ioctl[IEEE80211_IOCTL_SETOPTIE]"
-"ioctl[IEEE80211_IOCTL_GETOPTIE]"
-"ioctl[IEEE80211_IOCTL_ADDMAC]"
-"ioctl[SIOCIWFIRSTPRIV+11]"
-"ioctl[IEEE80211_IOCTL_DELMAC]"
-"ioctl[SIOCIWFIRSTPRIV+13]"
-"ioctl[IEEE80211_IOCTL_CHANLIST]"
-"ioctl[SIOCIWFIRSTPRIV+15]"
-"ioctl[IEEE80211_IOCTL_GETRSN]"
-"ioctl[SIOCIWFIRSTPRIV+17]"
-"ioctl[IEEE80211_IOCTL_GETKEY]"
+IOCTL_ERR(IEEE80211_IOCTL_SETPARAM)
+IOCTL_ERR(IEEE80211_IOCTL_GETPARAM)
+IOCTL_ERR(IEEE80211_IOCTL_SETMODE)
+IOCTL_ERR(IEEE80211_IOCTL_GETMODE)
+IOCTL_ERR(IEEE80211_IOCTL_SETWMMPARAMS)
+IOCTL_ERR(IEEE80211_IOCTL_GETWMMPARAMS)
+IOCTL_ERR(IEEE80211_IOCTL_SETCHANLIST)
+IOCTL_ERR(IEEE80211_IOCTL_GETCHANLIST)
+IOCTL_ERR(IEEE80211_IOCTL_CHANSWITCH)
+IOCTL_ERR(IEEE80211_IOCTL_GETCHANINFO)
+IOCTL_ERR(IEEE80211_IOCTL_SETOPTIE)
+IOCTL_ERR(IEEE80211_IOCTL_GETOPTIE)
+IOCTL_ERR(IEEE80211_IOCTL_SETMLME)
+IOCTL_ERR(IEEE80211_IOCTL_SETKEY)
+IOCTL_ERR(IEEE80211_IOCTL_DELKEY)
+IOCTL_ERR(IEEE80211_IOCTL_ADDMAC)
+IOCTL_ERR(IEEE80211_IOCTL_DELMAC)
+IOCTL_ERR(IEEE80211_IOCTL_WDSADDMAC)
+IOCTL_ERR(IEEE80211_IOCTL_WDSDELMAC)
-                };
-                op -= SIOCIWFIRSTPRIV;