X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/38700c7f24646dfbc6ac0ed529d3ed727c545cd0..5287bffd3f4fa1fda9d7734b45f8cf02391d3855:/print-geonet.c diff --git a/print-geonet.c b/print-geonet.c index 6daf8b1d..f30e434b 100644 --- a/print-geonet.c +++ b/print-geonet.c @@ -15,13 +15,15 @@ * Original code by Ola Martin Lykkja (ola.lykkja@q-free.com) */ +/* \summary: ISO CALM FAST and ETSI GeoNetworking printer */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include +#include -#include "interface.h" +#include "netdissect.h" #include "extract.h" #include "addrtoname.h" @@ -73,8 +75,8 @@ static void print_btp(netdissect_options *ndo, const u_char *bp) { - uint16_t dest = EXTRACT_16BITS(bp+0); - uint16_t src = EXTRACT_16BITS(bp+2); + uint16_t dest = EXTRACT_BE_16BITS(bp + 0); + uint16_t src = EXTRACT_BE_16BITS(bp + 2); ND_PRINT((ndo, "; BTP Dst:%u Src:%u", dest, src)); } @@ -84,13 +86,15 @@ print_long_pos_vector(netdissect_options *ndo, { 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); + lat = EXTRACT_BE_32BITS(bp + 12); ND_PRINT((ndo, "lat:%d ", lat)); - lon = EXTRACT_32BITS(bp+16); + lon = EXTRACT_BE_32BITS(bp + 16); ND_PRINT((ndo, "lon:%d", lon)); return (0); } @@ -101,7 +105,8 @@ print_long_pos_vector(netdissect_options *ndo, * 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) { int version; int next_hdr; @@ -113,18 +118,21 @@ geonet_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int const char *hdr_type_txt = "Unknown"; int hdr_size = -1; - ND_PRINT((ndo, "GeoNet src:%s; ", etheraddr_string(ndo, eth+6))); + ND_PRINT((ndo, "GeoNet ")); + if (src != NULL) + ND_PRINT((ndo, "src:%s", (src->addr_string)(ndo, src->addr))); + ND_PRINT((ndo, "; ")); /* Process Common Header */ if (length < 36) - goto malformed; - - ND_TCHECK2(*bp, 7); + 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); + payload_length = EXTRACT_BE_16BITS(bp + 4); hop_limit = bp[7]; switch (next_hdr) { @@ -223,7 +231,7 @@ geonet_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int /* Skip Extended headers */ if (hdr_size >= 0) { if (length < (u_int)hdr_size) - goto malformed; + goto invalid; ND_TCHECK2(*bp, hdr_size); length -= hdr_size; bp += hdr_size; @@ -233,7 +241,7 @@ geonet_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int case 1: case 2: /* BTP A/B */ if (length < 4) - goto malformed; + goto invalid; ND_TCHECK2(*bp, 4); print_btp(ndo, bp); length -= 4; @@ -260,7 +268,7 @@ geonet_print(netdissect_options *ndo, const u_char *eth, const u_char *bp, u_int ND_DEFAULTPRINT(bp, length); return; -malformed: +invalid: ND_PRINT((ndo, " Malformed (small) ")); /* XXX - print the remaining data as hex? */ return;