diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2017-12-09 12:32:00 +0100 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2017-12-09 14:05:25 +0100 |
| commit | 07ac438e08e5ffed3539e10d78f1cfc7d221d591 (patch) | |
| tree | 8e07185c1f646ef08c85bbb7d9a075b32e65272f /print-babel.c | |
| parent | 1cfd6cd2ac8acecbcf16e083a6cd272a19ec994e (diff) | |
| download | tcpdump-07ac438e08e5ffed3539e10d78f1cfc7d221d591.tar.gz | |
Use more the EXTRACT_U_1() macro (52/n)
Assignment, p[n]
Diffstat (limited to 'print-babel.c')
| -rw-r--r-- | print-babel.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/print-babel.c b/print-babel.c index d571bc11..5c5ab308 100644 --- a/print-babel.c +++ b/print-babel.c @@ -375,7 +375,7 @@ babel_print_v2(netdissect_options *ndo, ND_TCHECK_2(message); ICHECK(i, 2); - len = message[1]; + len = EXTRACT_U_1(message + 1); ND_TCHECK2(*message, 2 + len); ICHECK(i, 2 + len); @@ -606,10 +606,10 @@ babel_print_v2(netdissect_options *ndo, int parsed_len = 10; ND_PRINT((ndo, "\n\tSS-Update")); if(len < 10) goto invalid; - ae = message[2]; - src_plen = message[3]; - plen = message[4]; - omitted = message[5]; + ae = EXTRACT_U_1(message + 2); + src_plen = EXTRACT_U_1(message + 3); + plen = EXTRACT_U_1(message + 4); + omitted = EXTRACT_U_1(message + 5); interval = EXTRACT_BE_U_2(message + 6); seqno = EXTRACT_BE_U_2(message + 8); metric = EXTRACT_BE_U_2(message + 10); @@ -647,9 +647,9 @@ babel_print_v2(netdissect_options *ndo, u_char ae, plen, src_plen, prefix[16], src_prefix[16]; ND_PRINT((ndo, "\n\tSS-Request ")); if(len < 3) goto invalid; - ae = message[2]; - plen = message[3]; - src_plen = message[4]; + ae = EXTRACT_U_1(message + 2); + plen = EXTRACT_U_1(message + 3); + src_plen = EXTRACT_U_1(message + 4); rc = network_prefix(ae, plen, 0, message + 2 + parsed_len, NULL, len - parsed_len, prefix); if(rc < 0) goto invalid; @@ -682,11 +682,11 @@ babel_print_v2(netdissect_options *ndo, const u_char *router_id = NULL; ND_PRINT((ndo, "\n\tSS-MH-Request ")); if(len < 14) goto invalid; - ae = message[2]; - plen = message[3]; + ae = EXTRACT_U_1(message + 2); + plen = EXTRACT_U_1(message + 3); seqno = EXTRACT_BE_U_2(message + 4); - hopc = message[6]; - src_plen = message[7]; + hopc = EXTRACT_U_1(message + 6); + src_plen = EXTRACT_U_1(message + 7); router_id = message + 8; rc = network_prefix(ae, plen, 0, message + 2 + parsed_len, NULL, len - parsed_len, prefix); |