CHANGES: Add/move change(s) backported to 4.99

[tcpdump] / print-geonet.c

diff --git a/print-geonet.c b/print-geonet.c
index dd1d6bd7880c476bda1ed84b506b400837de56c9..3f8ee07572d1b36da64199d1deb56840a49519f4 100644 (file)
--- a/print-geonet.c
+++ b/print-geonet.c
@@ -15,17 +15,14 @@
  * Original code by Ola Martin Lykkja ([email protected])
  */
 
  * Original code by Ola Martin Lykkja ([email protected])
  */
 

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* \summary: ISO CALM FAST and ETSI GeoNetworking printer */

 
 

-#include <tcpdump-stdinc.h>
+#include <config.h>

 
 

-#include <pcap.h>
-#include <stdio.h>
-#include <string.h>
+#include "netdissect-stdinc.h"

 
 

-#include "interface.h"
+#define ND_LONGJMP_FROM_TCHECK
+#include "netdissect.h"

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


@@ -41,6 +38,8 @@
    Sub-part 1: Media-Independent Functionality
 */
 
    Sub-part 1: Media-Independent Functionality
 */
 

+#define GEONET_ADDR_LEN 8
+

 static const struct tok msg_type_values[] = {
        {   0, "CAM" },
        {   1, "DENM" },
 static const struct tok msg_type_values[] = {
        {   0, "CAM" },
        {   1, "DENM" },


@@ -56,49 +55,35 @@ static const struct tok msg_type_values[] = {
 };
 
 static void
 };
 
 static void

-print_btp_body(const u_char *bp, u_int length)
+print_btp_body(netdissect_options *ndo,
+              const u_char *bp)

 {
 {

-       int version;
-       int msg_type;
-       const char *msg_type_str;
-
-       if (length <= 2) {
-               return;
-       }
+       u_int msg_type;

 
 

-       // Assuming ItsDpuHeader
-       version = bp[0];
-       msg_type = bp[1];
-       msg_type_str = tok2str(msg_type_values, "unknown (%u)", msg_type);
+       /* Assuming ItsPduHeader */
+       ND_PRINT("; ItsPduHeader v:%u", GET_U_1(bp));

 
 

-       printf("; ItsPduHeader v:%d t:%d-%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
 static void

-print_btp(const u_char *bp)
+print_btp(netdissect_options *ndo,
+         const u_char *bp)

 {
 {

-       u_int16_t dest = EXTRACT_16BITS(bp+0);
-       u_int16_t src = EXTRACT_16BITS(bp+2);
-       printf("; 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 void
 }
 
 static void

-print_long_pos_vector(const u_char *bp)
+print_long_pos_vector(netdissect_options *ndo,
+                     const u_char *bp)

 {
 {

-       int i;
-       u_int32_t lat, lon;
-
-       printf("GN_ADDR:");
-       for (i=0; i<8; i++) {
-               if (i) printf(":");
-               printf("%02x", bp[i]);
-       }
-       printf(" ");
-
-       lat = EXTRACT_32BITS(bp+12);
-       printf("lat:%d ", lat);
-       lon = EXTRACT_32BITS(bp+16);
-       printf("lon:%d", lon);
+       ND_PRINT("GN_ADDR:%s ", GET_LINKADDR_STRING(bp, LINKADDR_OTHER, GEONET_ADDR_LEN));
+       ND_PRINT("lat:%u ", GET_BE_U_4(bp + 12));
+       ND_PRINT("lon:%u", GET_BE_U_4(bp + 16));

 }
 
 
 }
 
 


@@ -107,145 +92,174 @@ print_long_pos_vector(const u_char *bp)
  * to the geonet header of the packet.
  */
 void
  * to the geonet header of the packet.
  */
 void

-geonet_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int length)
+geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,
+            const struct lladdr_info *src)

 {
 {

-       printf("GeoNet src:%s; ", etheraddr_string(eth+6));
-
-       if (length >= 36) {
-               // Process Common Header
-               int version = bp[0] >> 4;
-               int next_hdr = bp[0] & 0x0f;
-               int hdr_type = bp[1] >> 4;
-               int hdr_subtype = bp[1] & 0x0f;
-               u_int16_t payload_length = EXTRACT_16BITS(bp+4);
-               int hop_limit = bp[7];
-               const char *next_hdr_txt = "Unknown";
-               const char *hdr_type_txt = "Unknown";
-               int hdr_size = -1;
+       u_int version;
+       u_int next_hdr;
+       u_int hdr_type;
+       u_int hdr_subtype;
+       uint16_t payload_length;
+       u_int hop_limit;
+       const char *next_hdr_txt = "Unknown";
+       const char *hdr_type_txt = "Unknown";
+       int hdr_size = -1;

 
 

-               switch (next_hdr) {
-                       case 0: next_hdr_txt = "Any"; break;
-                       case 1: next_hdr_txt = "BTP-A"; break;
-                       case 2: next_hdr_txt = "BTP-B"; break;
-                       case 3: next_hdr_txt = "IPv6"; break;
-               }
+       ndo->ndo_protocol = "geonet";
+       ND_PRINT("GeoNet ");
+       if (src != NULL)
+               ND_PRINT("src:%s", (src->addr_string)(ndo, src->addr));
+       ND_PRINT("; ");

 
 

-               switch (hdr_type) {
-                       case 0: hdr_type_txt = "Any"; break;
-                       case 1: hdr_type_txt = "Beacon"; break;
-                       case 2: hdr_type_txt = "GeoUnicast"; break;
-                       case 3: switch (hdr_subtype) {
-                                       case 0: hdr_type_txt = "GeoAnycastCircle"; break;
-                                       case 1: hdr_type_txt = "GeoAnycastRect"; break;
-                                       case 2: hdr_type_txt = "GeoAnycastElipse"; break;
-                               }
-                               break;
-                       case 4: switch (hdr_subtype) {
-                                       case 0: hdr_type_txt = "GeoBroadcastCircle"; break;
-                                       case 1: hdr_type_txt = "GeoBroadcastRect"; break;
-                                       case 2: hdr_type_txt = "GeoBroadcastElipse"; break;
-                               }
-                               break;
-                       case 5: switch (hdr_subtype) {
-                                       case 0: hdr_type_txt = "TopoScopeBcast-SH"; break;
-                                       case 1: hdr_type_txt = "TopoScopeBcast-MH"; break;
-                               }
-                               break;
-                       case 6: switch (hdr_subtype) {
-                                       case 0: hdr_type_txt = "LocService-Request"; break;
-                                       case 1: hdr_type_txt = "LocService-Reply"; break;
-                               }
-                               break;
-               }
+       /* Process Common Header */
+       if (length < 36) {
+               ND_PRINT(" (common header length %u < 36)", length);
+               goto invalid;
+       }

 
 

-               printf("v:%d ", version);
-               printf("NH:%d-%s ", next_hdr, next_hdr_txt);
-               printf("HT:%d-%d-%s ", hdr_type, hdr_subtype, hdr_type_txt);
-               printf("HopLim:%d ", hop_limit);
-               printf("Payload:%d ", payload_length);
-               print_long_pos_vector(bp + 8);
+       version = GET_U_1(bp) >> 4;
+       next_hdr = GET_U_1(bp) & 0x0f;
+       hdr_type = GET_U_1(bp + 1) >> 4;
+       hdr_subtype = GET_U_1(bp + 1) & 0x0f;
+       payload_length = GET_BE_U_2(bp + 4);
+       hop_limit = GET_U_1(bp + 7);
+
+       switch (next_hdr) {
+               case 0: next_hdr_txt = "Any"; break;
+               case 1: next_hdr_txt = "BTP-A"; break;
+               case 2: next_hdr_txt = "BTP-B"; break;
+               case 3: next_hdr_txt = "IPv6"; break;
+       }

 
 

-               // Skip Common Header
-               length -= 36;
-               bp += 36;
+       switch (hdr_type) {
+               case 0: hdr_type_txt = "Any"; break;
+               case 1: hdr_type_txt = "Beacon"; break;
+               case 2: hdr_type_txt = "GeoUnicast"; break;
+               case 3: switch (hdr_subtype) {
+                               case 0: hdr_type_txt = "GeoAnycastCircle"; break;
+                               case 1: hdr_type_txt = "GeoAnycastRect"; break;
+                               case 2: hdr_type_txt = "GeoAnycastElipse"; break;
+                       }
+                       break;
+               case 4: switch (hdr_subtype) {
+                               case 0: hdr_type_txt = "GeoBroadcastCircle"; break;
+                               case 1: hdr_type_txt = "GeoBroadcastRect"; break;
+                               case 2: hdr_type_txt = "GeoBroadcastElipse"; break;
+                       }
+                       break;
+               case 5: switch (hdr_subtype) {
+                               case 0: hdr_type_txt = "TopoScopeBcast-SH"; break;
+                               case 1: hdr_type_txt = "TopoScopeBcast-MH"; break;
+                       }
+                       break;
+               case 6: switch (hdr_subtype) {
+                               case 0: hdr_type_txt = "LocService-Request"; break;
+                               case 1: hdr_type_txt = "LocService-Reply"; break;
+                       }
+                       break;
+       }
+
+       ND_PRINT("v:%u ", version);
+       ND_PRINT("NH:%u-%s ", next_hdr, next_hdr_txt);
+       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);
+       print_long_pos_vector(ndo, bp + 8);
+
+       /* Skip Common Header */
+       ND_TCHECK_LEN(bp, 36);
+       length -= 36;
+       bp += 36;
+
+       /* Process Extended Headers */
+       switch (hdr_type) {
+               case 0: /* Any */
+                       hdr_size = 0;
+                       break;
+               case 1: /* Beacon */
+                       hdr_size = 0;
+                       break;
+               case 2: /* GeoUnicast */
+                       break;
+               case 3: switch (hdr_subtype) {
+                               case 0: /* GeoAnycastCircle */
+                                       break;
+                               case 1: /* GeoAnycastRect */
+                                       break;
+                               case 2: /* GeoAnycastElipse */
+                                       break;
+                       }
+                       break;
+               case 4: switch (hdr_subtype) {
+                               case 0: /* GeoBroadcastCircle */
+                                       break;
+                               case 1: /* GeoBroadcastRect */
+                                       break;
+                               case 2: /* GeoBroadcastElipse */
+                                       break;
+                       }
+                       break;
+               case 5: switch (hdr_subtype) {
+                               case 0: /* TopoScopeBcast-SH */
+                                       hdr_size = 0;
+                                       break;
+                               case 1: /* TopoScopeBcast-MH */
+                                       hdr_size = 68 - 36;
+                                       break;
+                       }
+                       break;
+               case 6: switch (hdr_subtype) {
+                               case 0: /* LocService-Request */
+                                       break;
+                               case 1: /* LocService-Reply */
+                                       break;
+                       }
+                       break;
+       }

 
 

-               // Process Extended Headers
-               switch (hdr_type) {
+       /* Skip Extended headers */
+       if (hdr_size >= 0) {
+               if (length < (u_int)hdr_size) {
+                       ND_PRINT(" (header size %d > %u)", hdr_size, length);
+                       goto invalid;
+               }
+               ND_TCHECK_LEN(bp, hdr_size);
+               length -= hdr_size;
+               bp += hdr_size;
+               switch (next_hdr) {

                        case 0: /* Any */
                        case 0: /* Any */

-                               hdr_size = 0;
-                               break;
-                       case 1: /* Beacon */
-                               hdr_size = 0;
-                               break;
-                       case 2: /* GeoUnicast */

                                break;
                                break;

-                       case 3: switch (hdr_subtype) {
-                                       case 0: /* GeoAnycastCircle */
-                                               break;
-                                       case 1: /* GeoAnycastRect */
-                                               break;
-                                       case 2: /* GeoAnycastElipse */
-                                               break;
+                       case 1:
+                       case 2: /* BTP A/B */
+                               if (length < 4) {
+                                       ND_PRINT(" (BTP length %u < 4)", length);
+                                       goto invalid;

                                }
                                }

-                               break;
-                       case 4: switch (hdr_subtype) {
-                                       case 0: /* GeoBroadcastCircle */
-                                               break;
-                                       case 1: /* GeoBroadcastRect */
-                                               break;
-                                       case 2: /* GeoBroadcastElipse */
-                                               break;
-                               }
-                               break;
-                       case 5: switch (hdr_subtype) {
-                                       case 0: /* TopoScopeBcast-SH */
-                                               hdr_size = 0;
-                                               break;
-                                       case 1: /* TopoScopeBcast-MH */
-                                               hdr_size = 68 - 36;
-                                               break;
+                               print_btp(ndo, bp);
+                               length -= 4;
+                               bp += 4;
+                               if (length >= 2) {
+                                       /*
+                                        * XXX - did print_btp_body()
+                                        * return if length < 2
+                                        * because this is optional,
+                                        * or was that just not
+                                        * reporting genuine errors?
+                                        */
+                                       print_btp_body(ndo, bp);

                                }
                                break;
                                }
                                break;

-                       case 6: switch (hdr_subtype) {
-                                       case 0: /* LocService-Request */
-                                               break;
-                                       case 1: /* LocService-Reply */
-                                               break;
-                               }
+                       case 3: /* IPv6 */

                                break;
                }
                                break;
                }

-
-               // Skip Extended headers
-               if (hdr_size >= 0) {
-                       length -= hdr_size;
-                       bp += hdr_size;
-                       switch (next_hdr) {
-                               case 0: /* Any */
-                                       break;
-                               case 1:
-                               case 2: /* BTP A/B */
-                                       print_btp(bp);
-                                       length -= 4;
-                                       bp += 4;
-                                       print_btp_body(bp, length);
-                                       break;
-                               case 3: /* IPv6 */
-                                       break;
-                       }
-               }
-       } else {
-               printf("Malformed (small) ");

        }
 
        }
 

-       // Print user data part
+       /* Print user data part */

        if (ndo->ndo_vflag)
        if (ndo->ndo_vflag)

-               default_print(bp, length);
-}
-
+               ND_DEFAULTPRINT(bp, length);
+       return;

 
 

-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */
+invalid:
+       nd_print_invalid(ndo);
+       /* XXX - print the remaining data as hex? */
+}