From: Francois-Xavier Le Bail <devel.fx.lebail@orange.fr>
Date: Sun, 10 Dec 2017 20:33:49 +0000 (+0100)
Subject: Use more the EXTRACT_U_1() macro (55/n)
X-Git-Tag: tcpdump-4.99-bp~1654
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/c56f25c54b87b3edaced56578721c72d7ca9795d

Use more the EXTRACT_U_1() macro (55/n)
---

diff --git a/print-802_11.c b/print-802_11.c
index f86fafe9..17e128d9 100644
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -1953,7 +1953,7 @@ extract_header_length(netdissect_options *ndo,
 static int
 extract_mesh_header_length(const u_char *p)
 {
-	return (p[0] &~ 3) ? 0 : 6*(1 + (p[0] & 3));
+	return (EXTRACT_U_1(p) &~ 3) ? 0 : 6*(1 + (EXTRACT_U_1(p) & 3));
 }
 
 /*
diff --git a/print-babel.c b/print-babel.c
index 10408e9f..5d4c8cb5 100644
--- a/print-babel.c
+++ b/print-babel.c
@@ -519,7 +519,7 @@ babel_print_v2(netdissect_options *ndo,
                        format_prefix(ndo, prefix, plen),
                        metric, seqno, format_interval_update(interval)));
                 if(EXTRACT_U_1(message + 3) & 0x80) {
-                    if(message[2] == 1)
+                    if(EXTRACT_U_1(message + 2) == 1)
                         memcpy(v4_prefix, prefix, 16);
                     else
                         memcpy(v6_prefix, prefix, 16);