Makefile.in: don't remove configure and config.h.in in make distclean.

[tcpdump] / print-geonet.c

diff --git a/print-geonet.c b/print-geonet.c
index 8efc9b51a10cf33c8d1c680ddfb7a2c251b1a775..2f8046e6b965d9ca994ef28855b9a689a000c022 100644 (file)
--- a/print-geonet.c
+++ b/print-geonet.c
@@ -23,6 +23,7 @@
 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 

+#define ND_LONGJMP_FROM_TCHECK

 #include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"


@@ -59,46 +60,32 @@ static void
 print_btp_body(netdissect_options *ndo,
               const u_char *bp)
 {
 print_btp_body(netdissect_options *ndo,
               const u_char *bp)
 {

-       u_int version;

        u_int msg_type;
        u_int msg_type;

-       const char *msg_type_str;

 
 

-       /* Assuming ItsDpuHeader */
-       /* 2 bytes ND_TCHECKed in geonet_print() */
-       version = GET_U_1(bp);
-       msg_type = GET_U_1(bp + 1);
-       msg_type_str = tok2str(msg_type_values, "unknown (%u)", msg_type);
+       /* Assuming ItsPduHeader */
+       ND_PRINT("; ItsPduHeader v:%u", GET_U_1(bp));

 
 

-       ND_PRINT("; ItsPduHeader v:%u t:%u-%s", version, msg_type, msg_type_str);
+       msg_type = GET_U_1(bp + 1);
+       ND_PRINT(" t:%u-%s", msg_type,
+                tok2str(msg_type_values, "unknown (%u)", msg_type));

 }
 
 }
 

+/* EN 302 636-5-1 V2.2.1 Section 7.2: BTP-A header */

 static void
 print_btp(netdissect_options *ndo,
          const u_char *bp)
 {
 static void
 print_btp(netdissect_options *ndo,
          const u_char *bp)
 {

-       /* 4 bytes ND_TCHECKed in geonet_print() */
-       uint16_t dest = GET_BE_U_2(bp + 0);
-       uint16_t src = GET_BE_U_2(bp + 2);
-       ND_PRINT("; BTP Dst:%u Src:%u", dest, src);
+       ND_PRINT("; BTP Dst:%u", GET_BE_U_2(bp + 0));
+       ND_PRINT(" Src:%u", GET_BE_U_2(bp + 2));

 }
 
 }
 

-static int
+static void

 print_long_pos_vector(netdissect_options *ndo,
                      const u_char *bp)
 {
 print_long_pos_vector(netdissect_options *ndo,
                      const u_char *bp)
 {

-       uint32_t lat, lon;
-
-       ND_TCHECK_LEN(bp, GEONET_ADDR_LEN);

        ND_PRINT("GN_ADDR:%s ", GET_LINKADDR_STRING(bp, LINKADDR_OTHER, GEONET_ADDR_LEN));
        ND_PRINT("GN_ADDR:%s ", GET_LINKADDR_STRING(bp, LINKADDR_OTHER, GEONET_ADDR_LEN));

-
-       ND_TCHECK_8(bp + 12);
-       lat = GET_BE_U_4(bp + 12);
-       ND_PRINT("lat:%u ", lat);
-       lon = GET_BE_U_4(bp + 16);
-       ND_PRINT("lon:%u", lon);
-       return (0);
-trunc:
-       return -1;
+       ND_PRINT("lat:%u ", GET_BE_U_4(bp + 12));
+       ND_PRINT("lon:%u", GET_BE_U_4(bp + 16));

 }
 
 
 }
 
 


@@ -127,10 +114,11 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,
        ND_PRINT("; ");
 
        /* Process Common Header */
        ND_PRINT("; ");
 
        /* Process Common Header */

-       if (length < 36)
+       if (length < 36) {
+               ND_PRINT(" (common header length %u < 36)", length);

                goto invalid;
                goto invalid;

+       }

 
 

-       ND_TCHECK_8(bp);

        version = GET_U_1(bp) >> 4;
        next_hdr = GET_U_1(bp) & 0x0f;
        hdr_type = GET_U_1(bp + 1) >> 4;
        version = GET_U_1(bp) >> 4;
        next_hdr = GET_U_1(bp) & 0x0f;
        hdr_type = GET_U_1(bp + 1) >> 4;


@@ -178,10 +166,10 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,
        ND_PRINT("HT:%u-%u-%s ", hdr_type, hdr_subtype, hdr_type_txt);
        ND_PRINT("HopLim:%u ", hop_limit);
        ND_PRINT("Payload:%u ", payload_length);
        ND_PRINT("HT:%u-%u-%s ", hdr_type, hdr_subtype, hdr_type_txt);
        ND_PRINT("HopLim:%u ", hop_limit);
        ND_PRINT("Payload:%u ", payload_length);

-       if (print_long_pos_vector(ndo, bp + 8) == -1)
-               goto trunc;
+       print_long_pos_vector(ndo, bp + 8);

 
        /* Skip Common Header */
 
        /* Skip Common Header */

+       ND_TCHECK_LEN(bp, 36);

        length -= 36;
        bp += 36;
 
        length -= 36;
        bp += 36;
 


@@ -233,8 +221,10 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,
 
        /* Skip Extended headers */
        if (hdr_size >= 0) {
 
        /* Skip Extended headers */
        if (hdr_size >= 0) {

-               if (length < (u_int)hdr_size)
+               if (length < (u_int)hdr_size) {
+                       ND_PRINT(" (header size %d > %u)", hdr_size, length);

                        goto invalid;
                        goto invalid;

+               }

                ND_TCHECK_LEN(bp, hdr_size);
                length -= hdr_size;
                bp += hdr_size;
                ND_TCHECK_LEN(bp, hdr_size);
                length -= hdr_size;
                bp += hdr_size;


@@ -243,9 +233,10 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,
                                break;
                        case 1:
                        case 2: /* BTP A/B */
                                break;
                        case 1:
                        case 2: /* BTP A/B */

-                               if (length < 4)
+                               if (length < 4) {
+                                       ND_PRINT(" (BTP length %u < 4)", length);

                                        goto invalid;
                                        goto invalid;

-                               ND_TCHECK_4(bp);
+                               }

                                print_btp(ndo, bp);
                                length -= 4;
                                bp += 4;
                                print_btp(ndo, bp);
                                length -= 4;
                                bp += 4;


@@ -257,7 +248,6 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,
                                         * or was that just not
                                         * reporting genuine errors?
                                         */
                                         * or was that just not
                                         * reporting genuine errors?
                                         */

-                                       ND_TCHECK_2(bp);

                                        print_btp_body(ndo, bp);
                                }
                                break;
                                        print_btp_body(ndo, bp);
                                }
                                break;


@@ -272,10 +262,6 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,
        return;
 
 invalid:
        return;
 
 invalid:

-       ND_PRINT(" Malformed (small) ");
+       nd_print_invalid(ndo);

        /* XXX - print the remaining data as hex? */
        /* XXX - print the remaining data as hex? */

-       return;
-
-trunc:
-       nd_print_trunc(ndo);

 }
 }