Changeset 6277

Timestamp:

10/12/10 03:27:13 (3 years ago)

Author:

jow

Message:

libiwinfo: ensure that country names are ascii, return txpower list even when no channel is set, bump version

Location:

luci/trunk/contrib/package/iwinfo

Files:

• Makefile (modified) (2 diffs)
• src/iwinfo_lualib.c (modified) (1 diff)
• src/iwinfo_nl80211.c (modified) (3 diffs)

luci/trunk/contrib/package/iwinfo/Makefile

@@ -8 +8 @@
 
 PKG_NAME:=libiwinfo
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
@@ -59 +59 @@
 
 $(eval $(call BuildPackage,libiwinfo))
-

luci/trunk/contrib/package/iwinfo/src/iwinfo_lualib.c

@@ -52 +52 @@
     { 0x4249 /* BI */, "Burundi" },
     { 0x424A /* BJ */, "Benin" },
-    { 0x424C /* BL */, "Saint Barth�my" },
+    { 0x424C /* BL */, "Saint Barthelemy" },
     { 0x424D /* BM */, "Bermuda" },
     { 0x424E /* BN */, "Brunei Darussalam" },

luci/trunk/contrib/package/iwinfo/src/iwinfo_nl80211.c

@@ -132 +132 @@
 static void nl80211_free(struct nl80211_msg_conveyor *cv)
 {
-    if( cv && cv->cb )
-        nl_cb_put(cv->cb);
-
-    if( cv && cv->msg )
-        nlmsg_free(cv->msg);
-
     if( cv )
     {
+        if( cv->cb )
+            nl_cb_put(cv->cb);
+
+        if( cv->msg )
+            nlmsg_free(cv->msg);
+
         cv->cb  = NULL;
         cv->msg = NULL;
@@ -925 +925 @@
 
     if( nl80211_get_channel(ifname, &ch_cur) )
-        return -1;
+        ch_cur = 0;
 
     req = nl80211_msg(ifname, NL80211_CMD_GET_WIPHY, 0);
@@ -948 +948 @@
                         nla_get_u32(freqs[NL80211_FREQUENCY_ATTR_FREQ]));
 
-                    if( (ch_cmp == ch_cur) &&
+                    if( (!ch_cur || (ch_cmp == ch_cur)) &&
                         freqs[NL80211_FREQUENCY_ATTR_MAX_TX_POWER] )
                     {