Make 1-element arrays for fields that may repeat.

[tcpdump] / print-juniper.c

diff --git a/print-juniper.c b/print-juniper.c
index 0202e41604284a211620d018b670d0bbf7429655..2d88b604cd3052f6e4dedcc842deef0047e38bc8 100644 (file)
--- a/print-juniper.c
+++ b/print-juniper.c
@@ -445,14 +445,14 @@ static const struct tok juniper_protocol_values[] = {
     { 0, NULL}
 };
 
-static int ip_heuristic_guess(netdissect_options *, register const u_char *, u_int);
-static int juniper_ppp_heuristic_guess(netdissect_options *, register const u_char *, u_int);
+static int ip_heuristic_guess(netdissect_options *, const u_char *, u_int);
+static int juniper_ppp_heuristic_guess(netdissect_options *, const u_char *, u_int);
 static int juniper_parse_header(netdissect_options *, const u_char *, const struct pcap_pkthdr *, struct juniper_l2info_t *);
 
 #ifdef DLT_JUNIPER_GGSN
 u_int
 juniper_ggsn_if_print(netdissect_options *ndo,
-                      const struct pcap_pkthdr *h, register const u_char *p)
+                      const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
         struct juniper_ggsn_header {
@@ -503,7 +503,7 @@ trunc:
 #ifdef DLT_JUNIPER_ES
 u_int
 juniper_es_if_print(netdissect_options *ndo,
-                    const struct pcap_pkthdr *h, register const u_char *p)
+                    const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
         struct juniper_ipsec_header {
@@ -580,7 +580,7 @@ trunc:
 #ifdef DLT_JUNIPER_MONITOR
 u_int
 juniper_monitor_if_print(netdissect_options *ndo,
-                         const struct pcap_pkthdr *h, register const u_char *p)
+                         const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
         struct juniper_monitor_header {
@@ -619,7 +619,7 @@ trunc:
 #ifdef DLT_JUNIPER_SERVICES
 u_int
 juniper_services_if_print(netdissect_options *ndo,
-                          const struct pcap_pkthdr *h, register const u_char *p)
+                          const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
         struct juniper_services_header {
@@ -659,7 +659,7 @@ trunc:
 #ifdef DLT_JUNIPER_PPPOE
 u_int
 juniper_pppoe_if_print(netdissect_options *ndo,
-                       const struct pcap_pkthdr *h, register const u_char *p)
+                       const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
@@ -677,7 +677,7 @@ juniper_pppoe_if_print(netdissect_options *ndo,
 #ifdef DLT_JUNIPER_ETHER
 u_int
 juniper_ether_if_print(netdissect_options *ndo,
-                       const struct pcap_pkthdr *h, register const u_char *p)
+                       const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
@@ -695,7 +695,7 @@ juniper_ether_if_print(netdissect_options *ndo,
 #ifdef DLT_JUNIPER_PPP
 u_int
 juniper_ppp_if_print(netdissect_options *ndo,
-                     const struct pcap_pkthdr *h, register const u_char *p)
+                     const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
@@ -713,7 +713,7 @@ juniper_ppp_if_print(netdissect_options *ndo,
 #ifdef DLT_JUNIPER_FRELAY
 u_int
 juniper_frelay_if_print(netdissect_options *ndo,
-                        const struct pcap_pkthdr *h, register const u_char *p)
+                        const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
@@ -731,7 +731,7 @@ juniper_frelay_if_print(netdissect_options *ndo,
 #ifdef DLT_JUNIPER_CHDLC
 u_int
 juniper_chdlc_if_print(netdissect_options *ndo,
-                       const struct pcap_pkthdr *h, register const u_char *p)
+                       const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
@@ -749,7 +749,7 @@ juniper_chdlc_if_print(netdissect_options *ndo,
 #ifdef DLT_JUNIPER_PPPOE_ATM
 u_int
 juniper_pppoe_atm_if_print(netdissect_options *ndo,
-                           const struct pcap_pkthdr *h, register const u_char *p)
+                           const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
        uint16_t extracted_ethertype;
@@ -760,7 +760,7 @@ juniper_pppoe_atm_if_print(netdissect_options *ndo,
 
         p+=l2info.header_len;
 
-        ND_TCHECK2(p[0], 2);
+        ND_TCHECK_2(p);
         extracted_ethertype = EXTRACT_BE_U_2(p);
         /* this DLT contains nothing but raw PPPoE frames,
          * prepended with a type field*/
@@ -783,7 +783,7 @@ trunc:
 #ifdef DLT_JUNIPER_MLPPP
 u_int
 juniper_mlppp_if_print(netdissect_options *ndo,
-                       const struct pcap_pkthdr *h, register const u_char *p)
+                       const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
@@ -843,7 +843,7 @@ juniper_mlppp_if_print(netdissect_options *ndo,
 #ifdef DLT_JUNIPER_MFR
 u_int
 juniper_mfr_if_print(netdissect_options *ndo,
-                     const struct pcap_pkthdr *h, register const u_char *p)
+                     const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
@@ -905,7 +905,7 @@ juniper_mfr_if_print(netdissect_options *ndo,
 #ifdef DLT_JUNIPER_MLFR
 u_int
 juniper_mlfr_if_print(netdissect_options *ndo,
-                      const struct pcap_pkthdr *h, register const u_char *p)
+                      const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
@@ -948,7 +948,7 @@ juniper_mlfr_if_print(netdissect_options *ndo,
 #ifdef DLT_JUNIPER_ATM1
 u_int
 juniper_atm1_if_print(netdissect_options *ndo,
-                      const struct pcap_pkthdr *h, register const u_char *p)
+                      const struct pcap_pkthdr *h, const u_char *p)
 {
         int llc_hdrlen;
 
@@ -965,7 +965,7 @@ juniper_atm1_if_print(netdissect_options *ndo,
             return l2info.header_len;
         }
 
-        ND_TCHECK2(p[0], 3);
+        ND_TCHECK_3(p);
         if (EXTRACT_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */
             EXTRACT_BE_U_3(p) == 0xaaaa03) { /* SNAP encaps ? */
 
@@ -974,7 +974,7 @@ juniper_atm1_if_print(netdissect_options *ndo,
                 return l2info.header_len;
         }
 
-        if (p[0] == 0x03) { /* Cisco style NLPID encaps ? */
+        if (EXTRACT_U_1(p) == 0x03) { /* Cisco style NLPID encaps ? */
             isoclns_print(ndo, p + 1, l2info.length - 1);
             /* FIXME check if frame was recognized */
             return l2info.header_len;
@@ -1002,7 +1002,7 @@ trunc:
 #ifdef DLT_JUNIPER_ATM2
 u_int
 juniper_atm2_if_print(netdissect_options *ndo,
-                      const struct pcap_pkthdr *h, register const u_char *p)
+                      const struct pcap_pkthdr *h, const u_char *p)
 {
         int llc_hdrlen;
 
@@ -1019,7 +1019,7 @@ juniper_atm2_if_print(netdissect_options *ndo,
             return l2info.header_len;
         }
 
-        ND_TCHECK2(p[0], 3);
+        ND_TCHECK_3(p);
         if (EXTRACT_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */
             EXTRACT_BE_U_3(p) == 0xaaaa03) { /* SNAP encaps ? */
 
@@ -1034,7 +1034,7 @@ juniper_atm2_if_print(netdissect_options *ndo,
             return l2info.header_len;
         }
 
-        if (p[0] == 0x03) { /* Cisco style NLPID encaps ? */
+        if (EXTRACT_U_1(p) == 0x03) { /* Cisco style NLPID encaps ? */
             isoclns_print(ndo, p + 1, l2info.length - 1);
             /* FIXME check if frame was recognized */
             return l2info.header_len;
@@ -1059,7 +1059,7 @@ trunc:
  * a juniper router if the payload data is encapsulated using PPP */
 static int
 juniper_ppp_heuristic_guess(netdissect_options *ndo,
-                            register const u_char *p, u_int length)
+                            const u_char *p, u_int length)
 {
     switch(EXTRACT_BE_U_2(p)) {
     case PPP_IP :
@@ -1087,9 +1087,9 @@ juniper_ppp_heuristic_guess(netdissect_options *ndo,
 
 static int
 ip_heuristic_guess(netdissect_options *ndo,
-                   register const u_char *p, u_int length)
+                   const u_char *p, u_int length)
 {
-    switch(p[0]) {
+    switch(EXTRACT_U_1(p)) {
     case 0x45:
     case 0x46:
     case 0x47:
@@ -1137,7 +1137,7 @@ juniper_read_tlv_value(const u_char *p, u_int tlv_type, u_int tlv_len)
    if (tlv_type < 128) {
        switch (tlv_len) {
        case 1:
-           tlv_value = *p;
+           tlv_value = EXTRACT_U_1(p);
            break;
        case 2:
            tlv_value = EXTRACT_LE_U_2(p);
@@ -1156,7 +1156,7 @@ juniper_read_tlv_value(const u_char *p, u_int tlv_type, u_int tlv_len)
        /* TLVs >= 128 are big endian encoded */
        switch (tlv_len) {
        case 1:
-           tlv_value = *p;
+           tlv_value = EXTRACT_U_1(p);
            break;
        case 2:
            tlv_value = EXTRACT_BE_U_2(p);
@@ -1194,9 +1194,9 @@ juniper_parse_header(netdissect_options *ndo,
 
     l2info->length = h->len;
     l2info->caplen = h->caplen;
-    ND_TCHECK2(p[0], 4);
-    l2info->flags = p[3];
-    l2info->direction = p[3]&JUNIPER_BPF_PKT_IN;
+    ND_TCHECK_4(p);
+    l2info->flags = EXTRACT_U_1(p + 3);
+    l2info->direction = EXTRACT_U_1(p + 3) & JUNIPER_BPF_PKT_IN;
 
     if (EXTRACT_BE_U_3(p) != JUNIPER_MGC_NUMBER) { /* magic number found ? */
         ND_PRINT((ndo, "no magic-number found!"));
@@ -1219,7 +1219,7 @@ juniper_parse_header(netdissect_options *ndo,
         tptr = p+jnx_header_len;
 
         /* ok to read extension length ? */
-        ND_TCHECK2(tptr[0], 2);
+        ND_TCHECK_2(tptr);
         jnx_ext_len = EXTRACT_BE_U_2(tptr);
         jnx_header_len += 2;
         tptr +=2;
@@ -1232,7 +1232,7 @@ juniper_parse_header(netdissect_options *ndo,
         if (ndo->ndo_vflag > 1)
             ND_PRINT((ndo, ", PCAP Extension(s) total length %u", jnx_ext_len));
 
-        ND_TCHECK2(tptr[0], jnx_ext_len);
+        ND_TCHECK_LEN(tptr, jnx_ext_len);
         while (jnx_ext_len > JUNIPER_EXT_TLV_OVERHEAD) {
             tlv_type = EXTRACT_U_1(tptr);
             tptr++;
@@ -1302,7 +1302,7 @@ juniper_parse_header(netdissect_options *ndo,
          * perform the v4/v6 heuristics
          * to figure out what it is
          */
-        ND_TCHECK2(p[jnx_header_len + 4], 1);
+        ND_TCHECK_1(p + (jnx_header_len + 4));
         if (ip_heuristic_guess(ndo, p + jnx_header_len + 4,
                                l2info->length - (jnx_header_len + 4)) == 0)
             ND_PRINT((ndo, "no IP-hdr found!"));
@@ -1317,13 +1317,13 @@ juniper_parse_header(netdissect_options *ndo,
     l2info->caplen -= l2info->header_len;
 
     /* search through the cookie table and copy values matching for our PIC type */
-    ND_TCHECK(p[0]);
+    ND_TCHECK_1(p);
     while (lp->s != NULL) {
         if (lp->pictype == l2info->pictype) {
 
             l2info->cookie_len += lp->cookie_len;
 
-            switch (p[0]) {
+            switch (EXTRACT_U_1(p)) {
             case LS_COOKIE_ID:
                 l2info->cookie_type = LS_COOKIE_ID;
                 l2info->cookie_len += 2;
@@ -1342,7 +1342,7 @@ juniper_parse_header(netdissect_options *ndo,
 #ifdef DLT_JUNIPER_MFR
             /* MFR child links don't carry cookies */
             if (l2info->pictype == DLT_JUNIPER_MFR &&
-                (p[0] & MFR_BE_MASK) == MFR_BE_MASK) {
+                (EXTRACT_U_1(p) & MFR_BE_MASK) == MFR_BE_MASK) {
                 l2info->cookie_len = 0;
             }
 #endif
@@ -1357,12 +1357,12 @@ juniper_parse_header(netdissect_options *ndo,
                        l2info->cookie_len));
 
             if (l2info->cookie_len > 0) {
-                ND_TCHECK2(p[0], l2info->cookie_len);
+                ND_TCHECK_LEN(p, l2info->cookie_len);
                 if (ndo->ndo_eflag)
                     ND_PRINT((ndo, ", cookie 0x"));
                 for (idx = 0; idx < l2info->cookie_len; idx++) {
-                    l2info->cookie[idx] = p[idx]; /* copy cookie data */
-                    if (ndo->ndo_eflag) ND_PRINT((ndo, "%02x", p[idx]));
+                    l2info->cookie[idx] = EXTRACT_U_1(p + idx); /* copy cookie data */
+                    if (ndo->ndo_eflag) ND_PRINT((ndo, "%02x", EXTRACT_U_1(p + idx)));
                 }
             }
 
@@ -1399,7 +1399,7 @@ juniper_parse_header(netdissect_options *ndo,
     case DLT_JUNIPER_MLFR:
         switch (l2info->cookie_type) {
         case LS_COOKIE_ID:
-            ND_TCHECK2(p[0], 2);
+            ND_TCHECK_2(p);
             l2info->bundle = l2info->cookie[1];
             l2info->proto = EXTRACT_BE_U_2(p);
             l2info->header_len += 2;
@@ -1423,7 +1423,7 @@ juniper_parse_header(netdissect_options *ndo,
     case DLT_JUNIPER_MFR:
         switch (l2info->cookie_type) {
         case LS_COOKIE_ID:
-            ND_TCHECK2(p[0], 2);
+            ND_TCHECK_2(p);
             l2info->bundle = l2info->cookie[1];
             l2info->proto = EXTRACT_BE_U_2(p);
             l2info->header_len += 2;
@@ -1442,7 +1442,7 @@ juniper_parse_header(netdissect_options *ndo,
 #endif
 #ifdef DLT_JUNIPER_ATM2
     case DLT_JUNIPER_ATM2:
-        ND_TCHECK2(p[0], 4);
+        ND_TCHECK_4(p);
         /* ATM cell relay control word present ? */
         if (l2info->cookie[7] & ATM2_PKT_TYPE_MASK) {
             control_word = EXTRACT_BE_U_4(p);