802.11: make the length in the IE structures a u_int.

This avoids narrowing warnings. Clean up PRINT_RATE() a bit while we're at it (avoiding signed vs. unsigned comparison warnings).

Author: guyharris

print-802_11.c

@@ -193,43 +193,43 @@ struct mgmt_header_t {
 #defineCAPABILITY_PRIVACY(cap)	((cap) & 0x0010)
 
 struct ssid_t {
-uint8_tlength;
+u_intlength;
 u_charssid[33]; /* 32 + 1 for null */
 };
 
 struct rates_t {
-uint8_tlength;
+u_intlength;
 uint8_trate[16];
 };
 
 struct challenge_t {
-uint8_tlength;
+u_intlength;
 uint8_ttext[254]; /* 1-253 + 1 for null */
 };
 
 struct fh_t {
-uint8_tlength;
+u_intlength;
 uint16_tdwell_time;
 uint8_thop_set;
 uint8_thop_pattern;
 uint8_thop_index;
 };
 
 struct ds_t {
-uint8_tlength;
+u_intlength;
 uint8_tchannel;
 };
 
 struct cf_t {
-uint8_tlength;
+u_intlength;
 uint8_tcount;
 uint8_tperiod;
 uint16_tmax_duration;
 uint16_tdur_remaining;
 };
 
 struct tim_t {
-uint8_tlength;
+u_intlength;
 uint8_tcount;
 uint8_tperiod;
 uint8_tbitmap_control;
@@ -403,15 +403,15 @@ struct meshcntl_t {
 ND_PRINT("%s%2.1f%s", _sep, (.5 * ((_r) & 0x7f)), _suf)
 #define PRINT_RATES(p) \
 if (p.rates_present) { \
-int z; \
 const char *sep = " ["; \
-for (z = 0; z < p.rates.length ; z++) { \
-PRINT_RATE(sep, p.rates.rate[z], \
-(p.rates.rate[z] & 0x80 ? "*" : "")); \
-sep = " "; \
-} \
-if (p.rates.length != 0) \
+if (p.rates.length != 0) { \
+for (u_int z = 0; z < p.rates.length ; z++) { \
+PRINT_RATE(sep, p.rates.rate[z], \
+(p.rates.rate[z] & 0x80 ? "*" : "")); \
+sep = " "; \
+} \
 ND_PRINT(" Mbit]"); \
+} \
 }
 
 #define PRINT_DS_CHANNEL(p) \