From ee68aa36460d7efeca48747f33b7f2adc0900bfb Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Sat, 16 Jun 2018 17:23:21 +0200 Subject: Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer. --- print-openflow.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'print-openflow.c') diff --git a/print-openflow.c b/print-openflow.c index 8a912063..63666336 100644 --- a/print-openflow.c +++ b/print-openflow.c @@ -85,19 +85,19 @@ of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep goto invalid; /* version */ ND_TCHECK_1(cp); - version = EXTRACT_U_1(cp); + version = GET_U_1(cp); cp += 1; /* type */ ND_TCHECK_1(cp); - type = EXTRACT_U_1(cp); + type = GET_U_1(cp); cp += 1; /* length */ ND_TCHECK_2(cp); - length = EXTRACT_BE_U_2(cp); + length = GET_BE_U_2(cp); cp += 2; /* xid */ ND_TCHECK_4(cp); - xid = EXTRACT_BE_U_4(cp); + xid = GET_BE_U_4(cp); cp += 4; /* Message length includes the header length and a message always includes * the basic header. A message length underrun fails decoding of the rest of -- cgit v1.2.1