Remove trailing "_if" from protocol names.

"_if", in function names, is just a convention used for the top-level
routine for a given DLT_ value; it's not part of the protocol name for
the link-layer type.

diff --git a/print-juniper.c b/print-juniper.c
index 843488b8118e72cc223a3b22e12d13874ebe4d5c..ce700631a023180fa1caf01bdbfe7692b8c24aab 100644 (file)
--- a/print-juniper.c
+++ b/print-juniper.c
@@ -483,7 +483,7 @@ juniper_ggsn_if_print(netdissect_options *ndo,
         const struct juniper_ggsn_header *gh;
         uint8_t proto;
 
-       ndo->ndo_protocol = "juniper_ggsn_if";
+       ndo->ndo_protocol = "juniper_ggsn";
         l2info.pictype = DLT_JUNIPER_GGSN;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -537,7 +537,7 @@ juniper_es_if_print(netdissect_options *ndo,
         u_int rewrite_len,es_type_bundle;
         const struct juniper_ipsec_header *ih;
 
-       ndo->ndo_protocol = "juniper_es_if";
+       ndo->ndo_protocol = "juniper_es";
         l2info.pictype = DLT_JUNIPER_ES;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -612,7 +612,7 @@ juniper_monitor_if_print(netdissect_options *ndo,
         };
         const struct juniper_monitor_header *mh;
 
-       ndo->ndo_protocol = "juniper_monitor_if";
+       ndo->ndo_protocol = "juniper_monitor";
         l2info.pictype = DLT_JUNIPER_MONITOR;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -653,7 +653,7 @@ juniper_services_if_print(netdissect_options *ndo,
         };
         const struct juniper_services_header *sh;
 
-       ndo->ndo_protocol = "juniper_services_if";
+       ndo->ndo_protocol = "juniper_services";
         l2info.pictype = DLT_JUNIPER_SERVICES;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -687,7 +687,7 @@ juniper_pppoe_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
-       ndo->ndo_protocol = "juniper_pppoe_if";
+       ndo->ndo_protocol = "juniper_pppoe";
         l2info.pictype = DLT_JUNIPER_PPPOE;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -706,7 +706,7 @@ juniper_ether_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
-       ndo->ndo_protocol = "juniper_ether_if";
+       ndo->ndo_protocol = "juniper_ether";
         l2info.pictype = DLT_JUNIPER_ETHER;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -725,7 +725,7 @@ juniper_ppp_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
-       ndo->ndo_protocol = "juniper_ppp_if";
+       ndo->ndo_protocol = "juniper_ppp";
         l2info.pictype = DLT_JUNIPER_PPP;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -744,7 +744,7 @@ juniper_frelay_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
-       ndo->ndo_protocol = "juniper_frelay_if";
+       ndo->ndo_protocol = "juniper_frelay";
         l2info.pictype = DLT_JUNIPER_FRELAY;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -763,7 +763,7 @@ juniper_chdlc_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
-       ndo->ndo_protocol = "juniper_chdlc_if";
+       ndo->ndo_protocol = "juniper_chdlc";
         l2info.pictype = DLT_JUNIPER_CHDLC;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -783,7 +783,7 @@ juniper_pppoe_atm_if_print(netdissect_options *ndo,
         struct juniper_l2info_t l2info;
        uint16_t extracted_ethertype;
 
-       ndo->ndo_protocol = "juniper_pppoe_atm_if";
+       ndo->ndo_protocol = "juniper_pppoe_atm";
         l2info.pictype = DLT_JUNIPER_PPPOE_ATM;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -817,7 +817,7 @@ juniper_mlppp_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
-       ndo->ndo_protocol = "juniper_mlppp_if";
+       ndo->ndo_protocol = "juniper_mlppp";
         l2info.pictype = DLT_JUNIPER_MLPPP;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -878,7 +878,7 @@ juniper_mfr_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
-       ndo->ndo_protocol = "juniper_mfr_if";
+       ndo->ndo_protocol = "juniper_mfr";
         memset(&l2info, 0, sizeof(l2info));
         l2info.pictype = DLT_JUNIPER_MFR;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
@@ -941,7 +941,7 @@ juniper_mlfr_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
-       ndo->ndo_protocol = "juniper_mlfr_if";
+       ndo->ndo_protocol = "juniper_mlfr";
         l2info.pictype = DLT_JUNIPER_MLFR;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -987,7 +987,7 @@ juniper_atm1_if_print(netdissect_options *ndo,
 
         struct juniper_l2info_t l2info;
 
-       ndo->ndo_protocol = "juniper_atm1_if";
+       ndo->ndo_protocol = "juniper_atm1";
         l2info.pictype = DLT_JUNIPER_ATM1;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -1042,7 +1042,7 @@ juniper_atm2_if_print(netdissect_options *ndo,
 
         struct juniper_l2info_t l2info;
 
-       ndo->ndo_protocol = "juniper_atm2_if";
+       ndo->ndo_protocol = "juniper_atm2";
         l2info.pictype = DLT_JUNIPER_ATM2;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;