diff options
| author | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2020-07-12 22:27:33 +0200 |
|---|---|---|
| committer | Francois-Xavier Le Bail <devel.fx.lebail@orange.fr> | 2020-07-15 09:18:35 +0200 |
| commit | 81dbf4a0b05092760d0ff0cdd48c692e4769ba99 (patch) | |
| tree | 2abaed75f47f71ffe886d35e14ad3ccbcddf9835 /print.c | |
| parent | 96c60029b3f935eff892d1f49b52f305423e4671 (diff) | |
| download | tcpdump-81dbf4a0b05092760d0ff0cdd48c692e4769ba99.tar.gz | |
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.
Diffstat (limited to 'print.c')
| -rw-r--r-- | print.c | 38 |
1 files changed, 19 insertions, 19 deletions
@@ -53,7 +53,6 @@ struct void_printer { }; static const struct uint_printer uint_printers[] = { - { ether_if_print, DLT_EN10MB }, #ifdef DLT_IEEE802_15_4 { ieee802_15_4_if_print, DLT_IEEE802_15_4 }, #endif @@ -63,12 +62,6 @@ static const struct uint_printer uint_printers[] = { #ifdef DLT_IEEE802_15_4_TAP { ieee802_15_4_tap_if_print, DLT_IEEE802_15_4_TAP }, #endif -#ifdef DLT_NETANALYZER - { netanalyzer_if_print, DLT_NETANALYZER }, -#endif -#ifdef DLT_NETANALYZER_TRANSPARENT - { netanalyzer_transparent_if_print, DLT_NETANALYZER_TRANSPARENT }, -#endif #ifdef DLT_CIP { cip_if_print, DLT_CIP }, #endif @@ -184,21 +177,9 @@ static const struct uint_printer uint_printers[] = { #ifdef DLT_PPP_SERIAL { ppp_hdlc_if_print, DLT_PPP_SERIAL }, #endif -#ifdef DLT_DSA_TAG_BRCM - { brcm_tag_if_print, DLT_DSA_TAG_BRCM }, -#endif -#ifdef DLT_DSA_TAG_BRCM_PREPEND - { brcm_tag_prepend_if_print, DLT_DSA_TAG_BRCM_PREPEND }, -#endif #ifdef DLT_VSOCK { vsock_if_print, DLT_VSOCK }, #endif -#ifdef DLT_DSA_TAG_DSA - { dsa_if_print, DLT_DSA_TAG_DSA }, -#endif -#ifdef DLT_DSA_TAG_EDSA - { edsa_if_print, DLT_DSA_TAG_EDSA }, -#endif { NULL, 0 }, }; @@ -210,15 +191,34 @@ static const struct void_printer void_printers[] = { #ifdef DLT_ARCNET_LINUX { arcnet_linux_if_print, DLT_ARCNET_LINUX }, #endif +#ifdef DLT_DSA_TAG_BRCM + { brcm_tag_if_print, DLT_DSA_TAG_BRCM }, +#endif +#ifdef DLT_DSA_TAG_BRCM_PREPEND + { brcm_tag_prepend_if_print, DLT_DSA_TAG_BRCM_PREPEND }, +#endif #ifdef DLT_BLUETOOTH_HCI_H4_WITH_PHDR { bt_if_print, DLT_BLUETOOTH_HCI_H4_WITH_PHDR}, #endif +#ifdef DLT_DSA_TAG_DSA + { dsa_if_print, DLT_DSA_TAG_DSA }, +#endif +#ifdef DLT_DSA_TAG_EDSA + { edsa_if_print, DLT_DSA_TAG_EDSA }, +#endif #ifdef DLT_ENC { enc_if_print, DLT_ENC }, #endif + { ether_if_print, DLT_EN10MB }, #ifdef DLT_IPNET { ipnet_if_print, DLT_IPNET }, #endif +#ifdef DLT_NETANALYZER + { netanalyzer_if_print, DLT_NETANALYZER }, +#endif +#ifdef DLT_NETANALYZER_TRANSPARENT + { netanalyzer_transparent_if_print, DLT_NETANALYZER_TRANSPARENT }, +#endif #ifdef DLT_NFLOG { nflog_if_print, DLT_NFLOG}, #endif |