EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iw: enable print wpa ie for scan

Browse Source 
This increases the size of the iw_5.9-8fab0c9e-3_mips_24kc.ipk from
41166 to 41942 bytes by 776 bytes.

Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
This commit is contained in:
Jianhui Zhao 2021-08-02 07:08:46 +00:00 committed by Hauke Mehrtens
parent 0af0ec1b7d
commit 9df7eadcfd
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
package/network/utils/iw/patches/200-reduce_size.patch
View File

@ -187,23 +187,29 @@
}; };
static void print_wifi_wpa(const uint8_t type, uint8_t len, const uint8_t *data, static void print_wifi_wpa(const uint8_t type, uint8_t len, const uint8_t *data,
@@ -2326,6 +2331,7 @@ void print_ies(unsigned char *ie, int ie @@ -2080,8 +2085,10 @@ static void print_wifi_wps(const uint8_t
ieprinters[ie[0]].flags & BIT(ptype)) {
print_ie(&ieprinters[ie[0]], static const struct ie_print wifiprinters[] = {
ie[0], ie[1], ie + 2, &ie_buffer); [1] = { "WPA", print_wifi_wpa, 2, 255, BIT(PRINT_SCAN), },
+#ifdef IW_FULL +#ifdef IW_FULL
} else if (ie[0] == 221 /* vendor */) { [2] = { "WMM", print_wifi_wmm, 1, 255, BIT(PRINT_SCAN), },
print_vendor(ie[1], ie + 2, unknown, ptype); [4] = { "WPS", print_wifi_wps, 0, 255, BIT(PRINT_SCAN), },
} else if (ie[0] == 255 /* extension */) {
@@ -2337,6 +2343,7 @@ void print_ies(unsigned char *ie, int ie
for (i=0; i<ie[1]; i++)
printf(" %.2x", ie[2+i]);
printf("\n");
+#endif +#endif
} };
ielen -= ie[1] + 2;
ie += ie[1] + 2; static inline void print_p2p(const uint8_t type, uint8_t len,
@@ -2377,6 +2384,7 @@ static void print_capa_non_dmg(__u16 cap @@ -2244,6 +2251,10 @@ static void print_vendor(unsigned char l
return;
}
+#ifdef IW_FULL
+ return;
+#endif
+
if (len >= 4 && memcmp(data, wfa_oui, 3) == 0) {
if (data[3] < ARRAY_SIZE(wfa_printers) &&
wfa_printers[data[3]].name &&
@@ -2377,6 +2388,7 @@ static void print_capa_non_dmg(__u16 cap
printf(" ESS"); printf(" ESS");
if (capa & WLAN_CAPABILITY_IBSS) if (capa & WLAN_CAPABILITY_IBSS)
printf(" IBSS"); printf(" IBSS");
@ -211,7 +217,7 @@
if (capa & WLAN_CAPABILITY_CF_POLLABLE) if (capa & WLAN_CAPABILITY_CF_POLLABLE)
printf(" CfPollable"); printf(" CfPollable");
if (capa & WLAN_CAPABILITY_CF_POLL_REQUEST) if (capa & WLAN_CAPABILITY_CF_POLL_REQUEST)
@@ -2405,6 +2413,7 @@ static void print_capa_non_dmg(__u16 cap @@ -2405,6 +2417,7 @@ static void print_capa_non_dmg(__u16 cap
printf(" DelayedBACK"); printf(" DelayedBACK");
if (capa & WLAN_CAPABILITY_IMM_BACK) if (capa & WLAN_CAPABILITY_IMM_BACK)
printf(" ImmediateBACK"); printf(" ImmediateBACK");
@ -219,7 +225,7 @@
} }
static int print_bss_handler(struct nl_msg *msg, void *arg) static int print_bss_handler(struct nl_msg *msg, void *arg)
@@ -2489,8 +2498,10 @@ static int print_bss_handler(struct nl_m @@ -2489,8 +2502,10 @@ static int print_bss_handler(struct nl_m
if (bss[NL80211_BSS_FREQUENCY]) { if (bss[NL80211_BSS_FREQUENCY]) {
int freq = nla_get_u32(bss[NL80211_BSS_FREQUENCY]); int freq = nla_get_u32(bss[NL80211_BSS_FREQUENCY]);
printf("\tfreq: %d\n", freq); printf("\tfreq: %d\n", freq);
@ -230,7 +236,7 @@
} }
if (bss[NL80211_BSS_BEACON_INTERVAL]) if (bss[NL80211_BSS_BEACON_INTERVAL])
printf("\tbeacon interval: %d TUs\n", printf("\tbeacon interval: %d TUs\n",
@@ -2684,6 +2695,7 @@ static int handle_stop_sched_scan(struct @@ -2684,6 +2699,7 @@ static int handle_stop_sched_scan(struct
return 0; return 0;
} }
@ -238,7 +244,7 @@
COMMAND(scan, sched_start, COMMAND(scan, sched_start,
SCHED_SCAN_OPTIONS, SCHED_SCAN_OPTIONS,
NL80211_CMD_START_SCHED_SCAN, 0, CIB_NETDEV, handle_start_sched_scan, NL80211_CMD_START_SCHED_SCAN, 0, CIB_NETDEV, handle_start_sched_scan,
@@ -2694,3 +2706,4 @@ COMMAND(scan, sched_start, @@ -2694,3 +2710,4 @@ COMMAND(scan, sched_start,
COMMAND(scan, sched_stop, "", COMMAND(scan, sched_stop, "",
NL80211_CMD_STOP_SCHED_SCAN, 0, CIB_NETDEV, handle_stop_sched_scan, NL80211_CMD_STOP_SCHED_SCAN, 0, CIB_NETDEV, handle_stop_sched_scan,
"Stop an ongoing scheduled scan."); "Stop an ongoing scheduled scan.");