summaryrefslogtreecommitdiff
path: root/print-802_11.c
diff options
context:
space:
mode:
authorFrancois-Xavier Le Bail <devel.fx.lebail@orange.fr>2017-11-26 13:02:48 +0100
committerFrancois-Xavier Le Bail <devel.fx.lebail@orange.fr>2017-11-26 15:44:43 +0100
commit1a90fd99d279d63242419a30ba3e0720872bff75 (patch)
treeb8b631a40f376875b5458bd1ec23d8775c0d266d /print-802_11.c
parent575188b5bf4fc1c26a2766319fcb7ca57d393868 (diff)
downloadtcpdump-1a90fd99d279d63242419a30ba3e0720872bff75.tar.gz
Use more the EXTRACT_U_1() macro (28/n)
In ND_PRINT() macro call(s) (step 7). p[n] ...
Diffstat (limited to 'print-802_11.c')
-rw-r--r--print-802_11.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/print-802_11.c b/print-802_11.c
index 67300ee6..a1c5b58a 100644
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -1590,9 +1590,9 @@ handle_action(netdissect_options *ndo,
ND_PRINT((ndo, " (%s): ", etheraddr_string(ndo, src)));
}
switch (p[0]) {
- case 0: ND_PRINT((ndo, "Spectrum Management Act#%d", p[1])); break;
- case 1: ND_PRINT((ndo, "QoS Act#%d", p[1])); break;
- case 2: ND_PRINT((ndo, "DLS Act#%d", p[1])); break;
+ case 0: ND_PRINT((ndo, "Spectrum Management Act#%d", EXTRACT_U_1(p + 1))); break;
+ case 1: ND_PRINT((ndo, "QoS Act#%d", EXTRACT_U_1(p + 1))); break;
+ case 2: ND_PRINT((ndo, "DLS Act#%d", EXTRACT_U_1(p + 1))); break;
case 3: ND_PRINT((ndo, "BA ")); PRINT_BA_ACTION(p[1]); break;
case 7: ND_PRINT((ndo, "HT ")); PRINT_HT_ACTION(p[1]); break;
case 13: ND_PRINT((ndo, "MeshAction ")); PRINT_MESH_ACTION(p[1]); break;
@@ -1602,9 +1602,9 @@ handle_action(netdissect_options *ndo,
case 15:
ND_PRINT((ndo, "SelfprotectAction "));
PRINT_SELFPROT_ACTION(p[1]); break;
- case 127: ND_PRINT((ndo, "Vendor Act#%d", p[1])); break;
+ case 127: ND_PRINT((ndo, "Vendor Act#%d", EXTRACT_U_1(p + 1))); break;
default:
- ND_PRINT((ndo, "Reserved(%d) Act#%d", p[0], p[1]));
+ ND_PRINT((ndo, "Reserved(%d) Act#%d", EXTRACT_U_1(p), EXTRACT_U_1(p + 1)));
break;
}
return 1;