aboutsummaryrefslogtreecommitdiff
path: root/print-geonet.c
diff options
context:
space:
mode:
Diffstat (limited to 'print-geonet.c')
-rw-r--r--print-geonet.c123
1 files changed, 52 insertions, 71 deletions
diff --git a/print-geonet.c b/print-geonet.c
index 9da89bfe81dc..2f8046e6b965 100644
--- a/print-geonet.c
+++ b/print-geonet.c
@@ -18,11 +18,12 @@
/* \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"
@@ -57,46 +58,34 @@ static const struct tok msg_type_values[] = {
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 = 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));
- ND_PRINT((ndo, "; 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,
- const u_char *bp)
+ const u_char *bp)
{
- uint16_t dest = EXTRACT_16BITS(bp+0);
- uint16_t src = EXTRACT_16BITS(bp+2);
- ND_PRINT((ndo, "; 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_TTEST2(*bp, GEONET_ADDR_LEN))
- return (-1);
- ND_PRINT((ndo, "GN_ADDR:%s ", linkaddr_string (ndo, bp, 0, GEONET_ADDR_LEN)));
-
- if (!ND_TTEST2(*(bp+12), 8))
- return (-1);
- lat = EXTRACT_32BITS(bp+12);
- ND_PRINT((ndo, "lat:%d ", lat));
- lon = EXTRACT_32BITS(bp+16);
- ND_PRINT((ndo, "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)
{
- 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;
- ND_PRINT((ndo, "GeoNet "));
+ ndo->ndo_protocol = "geonet";
+ ND_PRINT("GeoNet ");
if (src != NULL)
- ND_PRINT((ndo, "src:%s", (src->addr_string)(ndo, src->addr)));
- ND_PRINT((ndo, "; "));
+ 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_TCHECK2(*bp, 8);
- version = bp[0] >> 4;
- next_hdr = bp[0] & 0x0f;
- hdr_type = bp[1] >> 4;
- hdr_subtype = bp[1] & 0x0f;
- payload_length = EXTRACT_16BITS(bp+4);
- hop_limit = 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;
@@ -170,15 +161,15 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,
break;
}
- ND_PRINT((ndo, "v:%d ", version));
- ND_PRINT((ndo, "NH:%d-%s ", next_hdr, next_hdr_txt));
- ND_PRINT((ndo, "HT:%d-%d-%s ", hdr_type, hdr_subtype, hdr_type_txt));
- ND_PRINT((ndo, "HopLim:%d ", hop_limit));
- ND_PRINT((ndo, "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;
@@ -230,9 +221,11 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,
/* 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_TCHECK2(*bp, hdr_size);
+ }
+ ND_TCHECK_LEN(bp, hdr_size);
length -= hdr_size;
bp += hdr_size;
switch (next_hdr) {
@@ -240,9 +233,10 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,
break;
case 1:
case 2: /* BTP A/B */
- if (length < 4)
+ if (length < 4) {
+ ND_PRINT(" (BTP length %u < 4)", length);
goto invalid;
- ND_TCHECK2(*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?
*/
- ND_TCHECK2(*bp, 2);
print_btp_body(ndo, bp);
}
break;
@@ -269,18 +262,6 @@ geonet_print(netdissect_options *ndo, const u_char *bp, u_int length,
return;
invalid:
- ND_PRINT((ndo, " Malformed (small) "));
+ nd_print_invalid(ndo);
/* XXX - print the remaining data as hex? */
- return;
-
-trunc:
- ND_PRINT((ndo, "[|geonet]"));
}
-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-10 06:04:24 +0000