X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/f9b3c51da6c9454af79601666b5afe705901c126..a3d09832c69a1b261d0e1f1fc61d4b14ddd5f4a4:/tcpdump.c diff --git a/tcpdump.c b/tcpdump.c index 37c76e2a..2fc257ac 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -167,10 +167,6 @@ struct ndo_printer { static const struct printer printers[] = { - { sl_if_print, DLT_SLIP }, -#ifdef DLT_SLIP_BSDOS - { sl_bsdos_if_print, DLT_SLIP_BSDOS }, -#endif { ppp_if_print, DLT_PPP }, #ifdef DLT_PPP_WITHDIRECTION { ppp_if_print, DLT_PPP_WITHDIRECTION }, @@ -178,37 +174,21 @@ static const struct printer printers[] = { #ifdef DLT_PPP_BSDOS { ppp_bsdos_if_print, DLT_PPP_BSDOS }, #endif - { atm_if_print, DLT_ATM_RFC1483 }, #ifdef DLT_PPP_SERIAL { ppp_hdlc_if_print, DLT_PPP_SERIAL }, #endif -#ifdef DLT_LINUX_SLL - { sll_if_print, DLT_LINUX_SLL }, -#endif #ifdef DLT_IEEE802_11 { ieee802_11_if_print, DLT_IEEE802_11}, #endif #ifdef DLT_LTALK { ltalk_if_print, DLT_LTALK }, #endif -#ifdef DLT_FR - { fr_if_print, DLT_FR }, -#endif -#ifdef DLT_FRELAY - { fr_if_print, DLT_FRELAY }, -#endif -#ifdef DLT_SUNATM - { sunatm_if_print, DLT_SUNATM }, -#endif #ifdef DLT_PRISM_HEADER { prism_if_print, DLT_PRISM_HEADER }, #endif #ifdef DLT_IEEE802_11_RADIO { ieee802_11_radio_if_print, DLT_IEEE802_11_RADIO }, #endif -#ifdef DLT_ENC - { enc_if_print, DLT_ENC }, -#endif #ifdef DLT_IEEE802_11_RADIO_AVS { ieee802_11_radio_avs_if_print, DLT_IEEE802_11_RADIO_AVS }, #endif @@ -256,9 +236,6 @@ static const struct printer printers[] = { #endif #ifdef DLT_JUNIPER_CHDLC { juniper_chdlc_print, DLT_JUNIPER_CHDLC }, -#endif -#ifdef DLT_MFR - { mfr_if_print, DLT_MFR }, #endif { NULL, 0 }, }; @@ -344,6 +321,29 @@ static const struct ndo_printer ndo_printers[] = { #endif { token_if_print, DLT_IEEE802 }, { fddi_if_print, DLT_FDDI }, +#ifdef DLT_LINUX_SLL + { sll_if_print, DLT_LINUX_SLL }, +#endif +#ifdef DLT_FR + { fr_if_print, DLT_FR }, +#endif +#ifdef DLT_FRELAY + { fr_if_print, DLT_FRELAY }, +#endif +#ifdef DLT_MFR + { mfr_if_print, DLT_MFR }, +#endif + { atm_if_print, DLT_ATM_RFC1483 }, +#ifdef DLT_SUNATM + { sunatm_if_print, DLT_SUNATM }, +#endif +#ifdef DLT_ENC + { enc_if_print, DLT_ENC }, +#endif + { sl_if_print, DLT_SLIP }, +#ifdef DLT_SLIP_BSDOS + { sl_bsdos_if_print, DLT_SLIP_BSDOS }, +#endif { NULL, 0 }, };