From: Guy Harris Date: Tue, 26 Jul 2022 23:06:40 +0000 (-0700) Subject: juniper: don't treat known DLT_ types as "Unknown". X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/6fa52fef9bc38fdbcca7407cb039bdc7bc52a957 juniper: don't treat known DLT_ types as "Unknown". A bunch of DLT_JUNIPER_ values were not being handled in the "DLT_ specific parsing" switch statement; add (empty) cases for them. --- diff --git a/print-juniper.c b/print-juniper.c index 48b8a355..05ff2f4a 100644 --- a/print-juniper.c +++ b/print-juniper.c @@ -1559,10 +1559,18 @@ juniper_parse_header(netdissect_options *ndo, } break; #endif +#ifdef DLT_JUNIPER_ES + case DLT_JUNIPER_ES: + break; +#endif #ifdef DLT_JUNIPER_GGSN case DLT_JUNIPER_GGSN: break; #endif +#ifdef DLT_JUNIPER_SERVICES + case DLT_JUNIPER_SERVICES: + break; +#endif #ifdef DLT_JUNIPER_ATM1 case DLT_JUNIPER_ATM1: break; @@ -1583,6 +1591,18 @@ juniper_parse_header(netdissect_options *ndo, case DLT_JUNIPER_FRELAY: break; #endif +#ifdef DLT_JUNIPER_MONITOR + case DLT_JUNIPER_MONITOR: + break; +#endif +#ifdef DLT_JUNIPER_PPPOE + case DLT_JUNIPER_PPPOE: + break; +#endif +#ifdef DLT_JUNIPER_PPPOE_ATM + case DLT_JUNIPER_PPPOE_ATM: + break; +#endif default: ND_PRINT("Unknown Juniper DLT_ type %u: ", l2info->pictype); diff --git a/tests/hoobr_juniper3.out b/tests/hoobr_juniper3.out index c47a8afe..15a8e3fa 100644 --- a/tests/hoobr_juniper3.out +++ b/tests/hoobr_juniper3.out @@ -1 +1 @@ - 1 05:27:12.808464432 Unknown Juniper DLT_ type 132: [|juniper_es] + 1 05:27:12.808464432 [|juniper_es]