From 81dbf4a0b05092760d0ff0cdd48c692e4769ba99 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Le Bail Date: Sun, 12 Jul 2020 22:27:33 +0200 Subject: Update more link-layer dissectors to void functions brcm_tag_if_print() brcm_tag_prepend_if_print() dsa_if_print() edsa_if_print() ether_if_print() netanalyzer_if_print() netanalyzer_transparent_if_print() Update ether_print(), ether_common_print() and ether_switch_tag_print() to void functions. Add a flag parameter to ether_print(), ether_common_print() and ether_switch_tag_print() to increment the link-layer header length field of the netdissect_options when needed. The calls use TRUE when the return value of the funtions was used. The calls with FALSE avoid increments when the calls are nested. Moreover: Remove trailing "_if" from some protocol names. --- print-geneve.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'print-geneve.c') diff --git a/print-geneve.c b/print-geneve.c index 0b7ff6e5..d3e5e87e 100644 --- a/print-geneve.c +++ b/print-geneve.c @@ -232,7 +232,7 @@ geneve_print(netdissect_options *ndo, const u_char *bp, u_int len) if (ethertype_print(ndo, prot, bp, len, ND_BYTES_AVAILABLE_AFTER(bp), NULL, NULL) == 0) { if (prot == ETHERTYPE_TEB) - ether_print(ndo, bp, len, ND_BYTES_AVAILABLE_AFTER(bp), NULL, NULL); + ether_print(ndo, bp, len, ND_BYTES_AVAILABLE_AFTER(bp), NULL, NULL, FALSE); else ND_PRINT("geneve-proto-0x%x", prot); } -- cgit v1.2.1