mirrors/tcpdump
0
0
Fork 0
mirror of https://github.com/the-tcpdump-group/tcpdump.git synced 2024-11-25 02:53:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

If we run out of data in the when processing tagged parameters, return

Browse Source 
"success", not "failure" - there's no special "end of list" parameter.
Get rid of the check for a parameter tag of 0xff, for the same reason.

Take out an extra space between the "[" and the list of rates in a
"supported rates" tagged parameter, and don't print the "[" or the "
Mbit]", or the leading space if there are no supported rates (or there
is no "supported rates" parameter.

Use "fn_print" to print the SSID, in case there are non-printable
characters in it.

Show the channel number in decimal, not hex, as that's how it's given in
the IEEE 802.11 spec.

Show the supported rates in a probe response, if present.

Get rid of random extra trailing space in tagged parameter output.
This commit is contained in:
guy 2002-05-13 08:30:19 +00:00
parent a642694fd0
commit 6c6b1ac0b2
2 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CREDITS
View File

@ -54,6 +54,7 @@ Additional people who have contributed patches:
Lennert Buytenhek <buytenh@gnu.org> Lennert Buytenhek <buytenh@gnu.org>
Love Hörnquist-Åstrand <lha@stacken.kth.se> Love Hörnquist-Åstrand <lha@stacken.kth.se>
Maciej W. Rozycki <macro@ds2.pg.gda.pl> Maciej W. Rozycki <macro@ds2.pg.gda.pl>
Marc A. Lehmann <pcg@goof.com>
Marko Kiiskila <carnil@cs.tut.fi> Marko Kiiskila <carnil@cs.tut.fi>
Marshall Rose <mrose@dbc.mtview.ca.us> Marshall Rose <mrose@dbc.mtview.ca.us>
Martin Husemann <martin@netbsd.org> Martin Husemann <martin@netbsd.org>

70
print-802_11.c
View File

@ -22,7 +22,7 @@
#ifndef lint #ifndef lint
static const char rcsid[] = static const char rcsid[] =
"@(#) $Header: /tcpdump/master/tcpdump/print-802_11.c,v 1.6 2001-09-17 21:57:53 fenner Exp $ (LBL)"; "@(#) $Header: /tcpdump/master/tcpdump/print-802_11.c,v 1.7 2002-05-13 08:30:19 guy Exp $ (LBL)";
#endif #endif
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
@ -47,11 +47,16 @@ static const char rcsid[] =
#include "ieee802_11.h" #include "ieee802_11.h"
#define RATEStoBUF(p, buf) \ #define PRINT_RATES(p) \
do { \ do { \
int z = 0; \ int z; \
for (z = 0 ; z < p.rates.length ; z++) \ char *sep = " ["; \
snprintf(buf, sizeof(buf), "%s %2.1f", buf, (.5 * (p.rates.rate[z] & 0x7f))); \ for (z = 0; z < p.rates.length ; z++) { \
printf("%s%2.1f", sep, (.5 * (p.rates.rate[z] & 0x7f))); \
sep = " "; \
} \
if (p.rates.length != 0) \
printf(" Mbit]"); \
} while (0) } while (0)
static const char *auth_alg_text[]={"Open System","Shared Key","EAP"}; static const char *auth_alg_text[]={"Open System","Shared Key","EAP"};
@ -131,9 +136,7 @@ static int parse_elements(struct mgmt_body_t *pbody,const u_char *p,int offset)
{ {
for (;;) { for (;;) {
if (!TTEST2(*(p + offset), 1)) if (!TTEST2(*(p + offset), 1))
return 0; return 1;
if (*(p + offset) == 0xff)
break;
switch (*(p + offset)) { switch (*(p + offset)) {
case E_SSID: case E_SSID:
if (!TTEST2(*(p+offset), 2)) if (!TTEST2(*(p+offset), 2))
@ -216,9 +219,7 @@ static int handle_beacon(u_int16_t fc, const struct mgmt_header_t *pmh,
{ {
struct mgmt_body_t pbody; struct mgmt_body_t pbody;
int offset = 0; int offset = 0;
char buf[128];
memset(buf, 0, sizeof(buf));
memset(&pbody, 0, sizeof(pbody)); memset(&pbody, 0, sizeof(pbody));
if (!TTEST2(*p, 12)) if (!TTEST2(*p, 12))
@ -233,10 +234,11 @@ static int handle_beacon(u_int16_t fc, const struct mgmt_header_t *pmh,
if (!parse_elements(&pbody,p,offset)) if (!parse_elements(&pbody,p,offset))
return 0; return 0;
RATEStoBUF(pbody, buf); printf("%s (", subtype_text[FC_SUBTYPE(fc)]);
fn_print(pbody.ssid.ssid, NULL);
printf("%s (%s) [%s Mbit] %s CH: %x %s", printf(")");
subtype_text[FC_SUBTYPE(fc)], pbody.ssid.ssid, buf, PRINT_RATES(pbody);
printf(" %s CH: %u %s",
CAPABILITY_ESS(pbody.capability_info) ? "ESS" : "IBSS", CAPABILITY_ESS(pbody.capability_info) ? "ESS" : "IBSS",
pbody.ds.channel, pbody.ds.channel,
CAPABILITY_PRIVACY(pbody.capability_info) ? ", PRIVACY" : "" ); CAPABILITY_PRIVACY(pbody.capability_info) ? ", PRIVACY" : "" );
@ -249,9 +251,7 @@ static int handle_assoc_request(u_int16_t fc, const struct mgmt_header_t *pmh,
{ {
struct mgmt_body_t pbody; struct mgmt_body_t pbody;
int offset = 0; int offset = 0;
char buf[128];
memset(buf, 0, sizeof(buf));
memset(&pbody, 0, sizeof(pbody)); memset(&pbody, 0, sizeof(pbody));
if (!TTEST2(*p, 4)) if (!TTEST2(*p, 4))
@ -264,10 +264,10 @@ static int handle_assoc_request(u_int16_t fc, const struct mgmt_header_t *pmh,
if (!parse_elements(&pbody,p,offset)) if (!parse_elements(&pbody,p,offset))
return 0; return 0;
RATEStoBUF(pbody,buf); printf("%s (", subtype_text[FC_SUBTYPE(fc)]);
fn_print(pbody.ssid.ssid, NULL);
printf("%s (%s) [%s Mbit] ", printf(")");
subtype_text[FC_SUBTYPE(fc)], pbody.ssid.ssid,buf); PRINT_RATES(pbody);
return 1; return 1;
} }
@ -291,7 +291,7 @@ static int handle_assoc_response(u_int16_t fc, const struct mgmt_header_t *pmh,
if (!parse_elements(&pbody,p,offset)) if (!parse_elements(&pbody,p,offset))
return 0; return 0;
printf("%s AID(%x) :%s: %s ", subtype_text[FC_SUBTYPE(fc)], printf("%s AID(%x) :%s: %s", subtype_text[FC_SUBTYPE(fc)],
((u_int16_t)(pbody.aid << 2 )) >> 2 , ((u_int16_t)(pbody.aid << 2 )) >> 2 ,
CAPABILITY_PRIVACY(pbody.capability_info) ? " PRIVACY " : "", CAPABILITY_PRIVACY(pbody.capability_info) ? " PRIVACY " : "",
(pbody.status_code < 19 ? status_text[pbody.status_code] : "n/a")); (pbody.status_code < 19 ? status_text[pbody.status_code] : "n/a"));
@ -320,7 +320,9 @@ static int handle_reassoc_request(u_int16_t fc, const struct mgmt_header_t *pmh,
if (!parse_elements(&pbody,p,offset)) if (!parse_elements(&pbody,p,offset))
return 0; return 0;
printf("%s (%s) AP : %s",subtype_text[FC_SUBTYPE(fc)], pbody.ssid.ssid, etheraddr_string( pbody.ap )); printf("%s (", subtype_text[FC_SUBTYPE(fc)]);
fn_print(pbody.ssid.ssid, NULL);
printf(") AP : %s", etheraddr_string( pbody.ap ));
return 1; return 1;
} }
@ -337,19 +339,16 @@ static int handle_probe_request(u_int16_t fc, const struct mgmt_header_t *pmh,
{ {
struct mgmt_body_t pbody; struct mgmt_body_t pbody;
int offset = 0; int offset = 0;
char buf[128];
memset(buf, 0, sizeof(buf));
memset(&pbody, 0, sizeof(pbody)); memset(&pbody, 0, sizeof(pbody));
if (!parse_elements(&pbody, p, offset)) if (!parse_elements(&pbody, p, offset))
return 0; return 0;
RATEStoBUF(pbody, buf); printf("%s (", subtype_text[FC_SUBTYPE(fc)]);
fn_print(pbody.ssid.ssid, NULL);
printf("%s (%s) [%s Mbit] ", subtype_text[FC_SUBTYPE(fc)], printf(")");
pbody.ssid.ssid,buf); PRINT_RATES(pbody);
return 1; return 1;
} }
@ -359,9 +358,6 @@ static int handle_probe_response(u_int16_t fc, const struct mgmt_header_t *pmh,
{ {
struct mgmt_body_t pbody; struct mgmt_body_t pbody;
int offset = 0; int offset = 0;
char buf[128];
memset(buf, 0, sizeof(buf));
memset(&pbody, 0, sizeof(pbody)); memset(&pbody, 0, sizeof(pbody));
@ -377,8 +373,12 @@ static int handle_probe_response(u_int16_t fc, const struct mgmt_header_t *pmh,
if (!parse_elements(&pbody, p, offset)) if (!parse_elements(&pbody, p, offset))
return 0; return 0;
printf("%s (%s) CH: %x %s", subtype_text[FC_SUBTYPE(fc)], pbody.ssid.ssid,pbody.ds.channel, printf("%s (", subtype_text[FC_SUBTYPE(fc)]);
CAPABILITY_PRIVACY(pbody.capability_info) ? ",PRIVACY " : "" ); fn_print(pbody.ssid.ssid, NULL);
printf(") ");
PRINT_RATES(pbody);
printf(" CH: %u%s", pbody.ds.channel,
CAPABILITY_PRIVACY(pbody.capability_info) ? ", PRIVACY" : "" );
return 1; return 1;
} }
@ -404,7 +404,7 @@ static int handle_disassoc(u_int16_t fc, const struct mgmt_header_t *pmh,
pbody.reason_code = EXTRACT_LE_16BITS(p); pbody.reason_code = EXTRACT_LE_16BITS(p);
offset += 2; offset += 2;
printf("%s: %s ", subtype_text[FC_SUBTYPE(fc)], printf("%s: %s", subtype_text[FC_SUBTYPE(fc)],
pbody.reason_code < 10 ? reason_text[pbody.reason_code] : "Reserved" ); pbody.reason_code < 10 ? reason_text[pbody.reason_code] : "Reserved" );
return 1; return 1;