The Tcpdump Group git mirrors - tcpdump/blobdiff

index 321ce22606fe549f772b9f4ece6e2e3f98bfa4df..2f8046e6b965d9ca994ef28855b9a689a000c022 100644 (file)

--- a/print-geonet.c

+++ b/print-geonet.c

@@ -18,11 +18,12 @@

/* \summary: ISO CALM FAST and ETSI GeoNetworking printer */

#ifdef HAVE_CONFIG_H

/* \summary: ISO CALM FAST and ETSI GeoNetworking printer */

#ifdef HAVE_CONFIG_H

-#include "config.h"

+#include <config.h>

#endif

-#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"

@@ -57,46 +58,34 @@ static const struct tok msg_type_values[] = {

static void

print_btp_body(netdissect_options *ndo,

static void

print_btp_body(netdissect_options *ndo,

- const u_char *bp)

+ const u_char *bp)

{

- int version;

- int msg_type;

- const char *msg_type_str;

+ u_int msg_type;

- /* Assuming ItsDpuHeader */

- version = EXTRACT_U_1(bp);

- msg_type = EXTRACT_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:%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

print_btp(netdissect_options *ndo,

static void

print_btp(netdissect_options *ndo,

- const u_char *bp)

+ const u_char *bp)

{

- uint16_t dest = EXTRACT_BE_U_2(bp + 0);

- uint16_t src = EXTRACT_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)

+ const u_char *bp)

{

- uint32_t lat, lon;

- if (!ND_TTEST_LEN(bp, GEONET_ADDR_LEN))

- return (-1);

- ND_PRINT("GN_ADDR:%s ", linkaddr_string (ndo, bp, 0, GEONET_ADDR_LEN));

- if (!ND_TTEST_8(bp + 12))

- return (-1);

- lat = EXTRACT_BE_U_4(bp + 12);

- ND_PRINT("lat:%d ", lat);

- lon = EXTRACT_BE_U_4(bp + 16);

- ND_PRINT("lon:%d", lon);

- return (0);

+ 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));

}

@@ -108,32 +97,34 @@ void

geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,

const struct lladdr_info *src)

{

geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,

const struct lladdr_info *src)

{

- int version;

- int next_hdr;

- int hdr_type;

- int hdr_subtype;

+ u_int version;

+ u_int next_hdr;

+ u_int hdr_type;

+ u_int hdr_subtype;

uint16_t payload_length;

- int hop_limit;

+ u_int hop_limit;

const char *next_hdr_txt = "Unknown";

const char *hdr_type_txt = "Unknown";

int hdr_size = -1;

const char *next_hdr_txt = "Unknown";

const char *hdr_type_txt = "Unknown";

int hdr_size = -1;

+ ndo->ndo_protocol = "geonet";

ND_PRINT("GeoNet ");

if (src != NULL)

ND_PRINT("src:%s", (src->addr_string)(ndo, src->addr));

ND_PRINT("; ");

/* Process Common Header */

ND_PRINT("GeoNet ");

if (src != NULL)

ND_PRINT("src:%s", (src->addr_string)(ndo, src->addr));

ND_PRINT("; ");

/* Process Common Header */

- if (length < 36)

+ if (length < 36) {

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

goto invalid;

+ }

- ND_TCHECK_8(bp);

- version = EXTRACT_U_1(bp) >> 4;

- next_hdr = EXTRACT_U_1(bp) & 0x0f;

- hdr_type = EXTRACT_U_1(bp + 1) >> 4;

- hdr_subtype = EXTRACT_U_1(bp + 1) & 0x0f;

- payload_length = EXTRACT_BE_U_2(bp + 4);

- hop_limit = EXTRACT_U_1(bp + 7);

+ 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;

switch (next_hdr) {

case 0: next_hdr_txt = "Any"; break;

@@ -170,15 +161,15 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,

break;

}

break;

}

- ND_PRINT("v:%d ", version);

- ND_PRINT("NH:%d-%s ", next_hdr, next_hdr_txt);

- ND_PRINT("HT:%d-%d-%s ", hdr_type, hdr_subtype, hdr_type_txt);

- ND_PRINT("HopLim:%d ", hop_limit);

- ND_PRINT("Payload:%d ", payload_length);

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

- goto trunc;

+ 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;

length -= 36;

bp += 36;

@@ -230,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;

+ }

ND_TCHECK_LEN(bp, hdr_size);

length -= hdr_size;

bp += hdr_size;

ND_TCHECK_LEN(bp, hdr_size);

length -= hdr_size;

bp += hdr_size;

@@ -240,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;

- ND_TCHECK_4(bp);

+ }

print_btp(ndo, bp);

length -= 4;

bp += 4;

print_btp(ndo, bp);

length -= 4;

bp += 4;

@@ -254,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;

@@ -269,18 +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? */

- return;

-trunc:

- ND_PRINT("[|geonet]");

}

-/*

- * Local Variables:

- * c-style: whitesmith

- * c-basic-offset: 8

- * End:

- */