Add a test from Kamil Frankowicz for the BFD dissector.

[tcpdump] / print-juniper.c

diff --git a/print-juniper.c b/print-juniper.c
index 5bfac9639e4c04b181bba37ff28c9357e56e6e70..b059d6bbdadd6cb91a32f65317770457e74c7b2e 100644 (file)
--- a/print-juniper.c
+++ b/print-juniper.c
@@ -23,10 +23,10 @@ __RCSID("NetBSD: print-juniper.c,v 1.3 2007/07/25 06:31:32 dogcow Exp ");
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include <string.h>
 
@@ -466,6 +466,7 @@ juniper_ggsn_if_print(netdissect_options *ndo,
         const struct juniper_ggsn_header *gh;
         uint8_t proto;
 
+       ndo->ndo_protocol = "juniper_ggsn_if";
         l2info.pictype = DLT_JUNIPER_GGSN;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -497,7 +498,7 @@ juniper_ggsn_if_print(netdissect_options *ndo,
         return l2info.header_len;
 
 trunc:
-       ND_PRINT("[|juniper_services]");
+       nd_print_trunc(ndo);
        return l2info.header_len;
 }
 #endif
@@ -519,6 +520,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";
         l2info.pictype = DLT_JUNIPER_ES;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -557,8 +559,8 @@ juniper_es_if_print(netdissect_options *ndo,
                        tok2str(juniper_ipsec_type_values,"Unknown",EXTRACT_U_1(ih->type)),
                        EXTRACT_U_1(ih->type),
                        EXTRACT_BE_U_4(ih->spi),
-                       ipaddr_string(ndo, &ih->src_ip),
-                       ipaddr_string(ndo, &ih->dst_ip),
+                       ipaddr_string(ndo, ih->src_ip),
+                       ipaddr_string(ndo, ih->dst_ip),
                        l2info.length);
             } else {
                 ND_PRINT("ES SA, index %u, ttl %u type %s (%u), length %u\n",
@@ -574,7 +576,7 @@ juniper_es_if_print(netdissect_options *ndo,
         return l2info.header_len;
 
 trunc:
-       ND_PRINT("[|juniper_services]");
+       nd_print_trunc(ndo);
        return l2info.header_len;
 }
 #endif
@@ -593,6 +595,7 @@ juniper_monitor_if_print(netdissect_options *ndo,
         };
         const struct juniper_monitor_header *mh;
 
+       ndo->ndo_protocol = "juniper_monitor_if";
         l2info.pictype = DLT_JUNIPER_MONITOR;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -613,7 +616,7 @@ juniper_monitor_if_print(netdissect_options *ndo,
         return l2info.header_len;
 
 trunc:
-       ND_PRINT("[|juniper_services]");
+       nd_print_trunc(ndo);
        return l2info.header_len;
 }
 #endif
@@ -633,6 +636,7 @@ juniper_services_if_print(netdissect_options *ndo,
         };
         const struct juniper_services_header *sh;
 
+       ndo->ndo_protocol = "juniper_services_if";
         l2info.pictype = DLT_JUNIPER_SERVICES;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -654,7 +658,7 @@ juniper_services_if_print(netdissect_options *ndo,
         return l2info.header_len;
 
 trunc:
-       ND_PRINT("[|juniper_services]");
+       nd_print_trunc(ndo);
        return l2info.header_len;
 }
 #endif
@@ -666,6 +670,7 @@ juniper_pppoe_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
+       ndo->ndo_protocol = "juniper_pppoe_if";
         l2info.pictype = DLT_JUNIPER_PPPOE;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -684,6 +689,7 @@ juniper_ether_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
+       ndo->ndo_protocol = "juniper_ether_if";
         l2info.pictype = DLT_JUNIPER_ETHER;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -702,6 +708,7 @@ juniper_ppp_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
+       ndo->ndo_protocol = "juniper_ppp_if";
         l2info.pictype = DLT_JUNIPER_PPP;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -720,6 +727,7 @@ juniper_frelay_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
+       ndo->ndo_protocol = "juniper_frelay_if";
         l2info.pictype = DLT_JUNIPER_FRELAY;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -738,6 +746,7 @@ juniper_chdlc_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
+       ndo->ndo_protocol = "juniper_chdlc_if";
         l2info.pictype = DLT_JUNIPER_CHDLC;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -757,6 +766,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";
         l2info.pictype = DLT_JUNIPER_PPPOE_ATM;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -778,7 +788,7 @@ juniper_pppoe_atm_if_print(netdissect_options *ndo,
         return l2info.header_len;
 
 trunc:
-       ND_PRINT("[|juniper_pppoe_atm]");
+       nd_print_trunc(ndo);
        return l2info.header_len;
 }
 #endif
@@ -790,6 +800,7 @@ juniper_mlppp_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
+       ndo->ndo_protocol = "juniper_mlppp_if";
         l2info.pictype = DLT_JUNIPER_MLPPP;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -850,6 +861,7 @@ juniper_mfr_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
+       ndo->ndo_protocol = "juniper_mfr_if";
         memset(&l2info, 0, sizeof(l2info));
         l2info.pictype = DLT_JUNIPER_MFR;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
@@ -912,6 +924,7 @@ juniper_mlfr_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
+       ndo->ndo_protocol = "juniper_mlfr_if";
         l2info.pictype = DLT_JUNIPER_MLFR;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -957,6 +970,7 @@ juniper_atm1_if_print(netdissect_options *ndo,
 
         struct juniper_l2info_t l2info;
 
+       ndo->ndo_protocol = "juniper_atm1_if";
         l2info.pictype = DLT_JUNIPER_ATM1;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -989,7 +1003,7 @@ juniper_atm1_if_print(netdissect_options *ndo,
        return l2info.header_len;
 
 trunc:
-       ND_PRINT("[|juniper_atm1]");
+       nd_print_trunc(ndo);
        return l2info.header_len;
 }
 #endif
@@ -1011,6 +1025,7 @@ juniper_atm2_if_print(netdissect_options *ndo,
 
         struct juniper_l2info_t l2info;
 
+       ndo->ndo_protocol = "juniper_atm2_if";
         l2info.pictype = DLT_JUNIPER_ATM2;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -1052,7 +1067,7 @@ juniper_atm2_if_print(netdissect_options *ndo,
        return l2info.header_len;
 
 trunc:
-       ND_PRINT("[|juniper_atm2]");
+       nd_print_trunc(ndo);
        return l2info.header_len;
 }
 #endif
@@ -1499,15 +1514,7 @@ juniper_parse_header(netdissect_options *ndo,
         ND_PRINT("hlen %u, proto 0x%04x, ", l2info->header_len, l2info->proto);
 
     return 1; /* everything went ok so far. continue parsing */
- trunc:
-    ND_PRINT("[|juniper_hdr], length %u", h->len);
+trunc:
+    nd_print_trunc(ndo);
     return 0;
 }
-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 4
- * End:
- */