Compile with '-Wsign-compare' in devel mode if supported

[tcpdump] / print-juniper.c

diff --git a/print-juniper.c b/print-juniper.c
index f810c723fe87de7cb99a1acd2706deda815e97b9..db7f2e15cc75be7414a9897472d29918183cc87b 100644 (file)
--- a/print-juniper.c
+++ b/print-juniper.c
@@ -39,6 +39,17 @@ __RCSID("NetBSD: print-juniper.c,v 1.3 2007/07/25 06:31:32 dogcow Exp ");
 #include "ethertype.h"
 #include "atm.h"
 
+/*
+ * If none of the Juniper DLT_s are defined, there's nothing to do.
+ */
+#if defined(DLT_JUNIPER_GGSN) || defined(DLT_JUNIPER_ES) || \
+    defined(DLT_JUNIPER_MONITOR) || defined(DLT_JUNIPER_SERVICES) || \
+    defined(DLT_JUNIPER_PPPOE) || defined(DLT_JUNIPER_ETHER) || \
+    defined(DLT_JUNIPER_PPP) || defined(DLT_JUNIPER_FRELAY) || \
+    defined(DLT_JUNIPER_CHDLC) || defined(DLT_JUNIPER_PPPOE_ATM) || \
+    defined(DLT_JUNIPER_MLPPP) || defined(DLT_JUNIPER_MFR) || \
+    defined(DLT_JUNIPER_MLFR) || defined(DLT_JUNIPER_ATM1) || \
+    defined(DLT_JUNIPER_ATM2)
 #define JUNIPER_BPF_OUT           0       /* Outgoing packet */
 #define JUNIPER_BPF_IN            1       /* Incoming packet */
 #define JUNIPER_BPF_PKT_IN        0x1     /* Incoming packet */
@@ -453,16 +464,7 @@ static int ip_heuristic_guess(netdissect_options *, const u_char *, u_int);
 #ifdef DLT_JUNIPER_ATM2
 static int juniper_ppp_heuristic_guess(netdissect_options *, const u_char *, u_int);
 #endif
-#if defined(DLT_JUNIPER_GGSN) || defined(DLT_JUNIPER_ES) || \
-    defined(DLT_JUNIPER_MONITOR) || defined(DLT_JUNIPER_SERVICES) || \
-    defined(DLT_JUNIPER_PPPOE) || defined(DLT_JUNIPER_ETHER) || \
-    defined(DLT_JUNIPER_PPP) || defined(DLT_JUNIPER_FRELAY) || \
-    defined(DLT_JUNIPER_CHDLC) || defined(DLT_JUNIPER_PPPOE_ATM) || \
-    defined(DLT_JUNIPER_MLPPP) || defined(DLT_JUNIPER_MFR) || \
-    defined(DLT_JUNIPER_MLFR) || defined(DLT_JUNIPER_ATM1) || \
-    defined(DLT_JUNIPER_ATM2)
 static int juniper_parse_header(netdissect_options *, const u_char *, const struct pcap_pkthdr *, struct juniper_l2info_t *);
-#endif
 
 #ifdef DLT_JUNIPER_GGSN
 u_int
@@ -481,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;
@@ -513,8 +515,8 @@ juniper_ggsn_if_print(netdissect_options *ndo,
         return l2info.header_len;
 
 trunc:
-       nd_print_trunc(ndo);
-       return l2info.header_len;
+        nd_print_trunc(ndo);
+        return l2info.header_len;
 }
 #endif
 
@@ -535,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;
@@ -591,8 +593,8 @@ juniper_es_if_print(netdissect_options *ndo,
         return l2info.header_len;
 
 trunc:
-       nd_print_trunc(ndo);
-       return l2info.header_len;
+        nd_print_trunc(ndo);
+        return l2info.header_len;
 }
 #endif
 
@@ -610,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;
@@ -631,8 +633,8 @@ juniper_monitor_if_print(netdissect_options *ndo,
         return l2info.header_len;
 
 trunc:
-       nd_print_trunc(ndo);
-       return l2info.header_len;
+        nd_print_trunc(ndo);
+        return l2info.header_len;
 }
 #endif
 
@@ -651,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;
@@ -673,8 +675,8 @@ juniper_services_if_print(netdissect_options *ndo,
         return l2info.header_len;
 
 trunc:
-       nd_print_trunc(ndo);
-       return l2info.header_len;
+        nd_print_trunc(ndo);
+        return l2info.header_len;
 }
 #endif
 
@@ -685,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;
@@ -704,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;
@@ -723,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;
@@ -742,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;
@@ -761,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;
@@ -779,9 +781,9 @@ juniper_pppoe_atm_if_print(netdissect_options *ndo,
                            const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
-       uint16_t extracted_ethertype;
+        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;
@@ -803,8 +805,8 @@ juniper_pppoe_atm_if_print(netdissect_options *ndo,
         return l2info.header_len;
 
 trunc:
-       nd_print_trunc(ndo);
-       return l2info.header_len;
+        nd_print_trunc(ndo);
+        return l2info.header_len;
 }
 #endif
 
@@ -815,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;
@@ -876,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)
@@ -939,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;
@@ -985,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;
@@ -1015,11 +1017,11 @@ juniper_atm1_if_print(netdissect_options *ndo,
         if (ip_heuristic_guess(ndo, p, l2info.length) != 0) /* last try - vcmux encaps ? */
             return l2info.header_len;
 
-       return l2info.header_len;
+        return l2info.header_len;
 
 trunc:
-       nd_print_trunc(ndo);
-       return l2info.header_len;
+        nd_print_trunc(ndo);
+        return l2info.header_len;
 }
 #endif
 
@@ -1040,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;
@@ -1079,15 +1081,13 @@ juniper_atm2_if_print(netdissect_options *ndo,
         if (ip_heuristic_guess(ndo, p, l2info.length) != 0) /* last try - vcmux encaps ? */
             return l2info.header_len;
 
-       return l2info.header_len;
+        return l2info.header_len;
 
 trunc:
-       nd_print_trunc(ndo);
-       return l2info.header_len;
+        nd_print_trunc(ndo);
+        return l2info.header_len;
 }
-#endif
 
-#ifdef DLT_JUNIPER_ATM2
 /* try to guess, based on all PPP protos that are supported in
  * a juniper router if the payload data is encapsulated using PPP */
 static int
@@ -1135,8 +1135,8 @@ ip_heuristic_guess(netdissect_options *ndo,
     case 0x4d:
     case 0x4e:
     case 0x4f:
-           ip_print(ndo, p, length);
-           break;
+        ip_print(ndo, p, length);
+        break;
     case 0x60:
     case 0x61:
     case 0x62:
@@ -1209,14 +1209,6 @@ juniper_read_tlv_value(const u_char *p, u_int tlv_type, u_int tlv_len)
    return tlv_value;
 }
 
-#if defined(DLT_JUNIPER_GGSN) || defined(DLT_JUNIPER_ES) || \
-    defined(DLT_JUNIPER_MONITOR) || defined(DLT_JUNIPER_SERVICES) || \
-    defined(DLT_JUNIPER_PPPOE) || defined(DLT_JUNIPER_ETHER) || \
-    defined(DLT_JUNIPER_PPP) || defined(DLT_JUNIPER_FRELAY) || \
-    defined(DLT_JUNIPER_CHDLC) || defined(DLT_JUNIPER_PPPOE_ATM) || \
-    defined(DLT_JUNIPER_MLPPP) || defined(DLT_JUNIPER_MFR) || \
-    defined(DLT_JUNIPER_MLFR) || defined(DLT_JUNIPER_ATM1) || \
-    defined(DLT_JUNIPER_ATM2)
 static int
 juniper_parse_header(netdissect_options *ndo,
                      const u_char *p, const struct pcap_pkthdr *h, struct juniper_l2info_t *l2info)
@@ -1544,4 +1536,11 @@ trunc:
     nd_print_trunc(ndo);
     return 0;
 }
-#endif
+#endif /* defined(DLT_JUNIPER_GGSN) || defined(DLT_JUNIPER_ES) || \
+          defined(DLT_JUNIPER_MONITOR) || defined(DLT_JUNIPER_SERVICES) || \
+          defined(DLT_JUNIPER_PPPOE) || defined(DLT_JUNIPER_ETHER) || \
+          defined(DLT_JUNIPER_PPP) || defined(DLT_JUNIPER_FRELAY) || \
+          defined(DLT_JUNIPER_CHDLC) || defined(DLT_JUNIPER_PPPOE_ATM) || \
+          defined(DLT_JUNIPER_MLPPP) || defined(DLT_JUNIPER_MFR) || \
+          defined(DLT_JUNIPER_MLFR) || defined(DLT_JUNIPER_ATM1) || \
+          defined(DLT_JUNIPER_ATM2) */