/*
- * This module implements decoding of AHCP (Ad Hoc Configuration Protocol) based
- * on draft-chroboczek-ahcp-00 and source code of ahcpd-0.53.
- *
- *
* Copyright (c) 2013 The TCPDUMP project
* All rights reserved.
*
* POSSIBILITY OF SUCH DAMAGE.
*/
+/* \summary: Ad Hoc Configuration Protocol (AHCP) printer */
+
+/* Based on draft-chroboczek-ahcp-00 and source code of ahcpd-0.53 */
+
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"
#include "netdissect.h"
#include "extract.h"
#include "addrtoname.h"
-static const char tstr[] = " [|ahcp]";
-static const char cstr[] = "(corrupt)";
#define AHCP_MAGIC_NUMBER 43
#define AHCP_VERSION_1 1
char buf[BUFSIZE];
if (cp + 4 != ep)
- goto corrupt;
- ND_TCHECK2(*cp, 4);
- t = EXTRACT_32BITS(cp);
+ goto invalid;
+ ND_TCHECK_4(cp);
+ t = EXTRACT_BE_U_4(cp);
if (NULL == (tm = gmtime(&t)))
- ND_PRINT((ndo, ": gmtime() error"));
+ ND_PRINT(": gmtime() error");
else if (0 == strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", tm))
- ND_PRINT((ndo, ": strftime() error"));
+ ND_PRINT(": strftime() error");
else
- ND_PRINT((ndo, ": %s UTC", buf));
+ ND_PRINT(": %s UTC", buf);
return 0;
-corrupt:
- ND_PRINT((ndo, ": %s", cstr));
- ND_TCHECK2(*cp, ep - cp);
+invalid:
+ ND_PRINT("%s", istr);
+ ND_TCHECK_LEN(cp, ep - cp);
return 0;
trunc:
- ND_PRINT((ndo, "%s", tstr));
+ nd_print_trunc(ndo);
return -1;
}
ahcp_seconds_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
{
if (cp + 4 != ep)
- goto corrupt;
- ND_TCHECK2(*cp, 4);
- ND_PRINT((ndo, ": %us", EXTRACT_32BITS(cp)));
+ goto invalid;
+ ND_TCHECK_4(cp);
+ ND_PRINT(": %us", EXTRACT_BE_U_4(cp));
return 0;
-corrupt:
- ND_PRINT((ndo, ": %s", cstr));
- ND_TCHECK2(*cp, ep - cp);
+invalid:
+ ND_PRINT("%s", istr);
+ ND_TCHECK_LEN(cp, ep - cp);
return 0;
trunc:
- ND_PRINT((ndo, "%s", tstr));
+ nd_print_trunc(ndo);
return -1;
}
while (cp < ep) {
if (cp + 16 > ep)
- goto corrupt;
- ND_TCHECK2(*cp, 16);
-#ifdef INET6
- ND_PRINT((ndo, "%s%s", sep, ip6addr_string(ndo, cp)));
-#else
- ND_PRINT((ndo, "%s(compiled w/o IPv6)", sep));
-#endif /* INET6 */
+ goto invalid;
+ ND_TCHECK_16(cp);
+ ND_PRINT("%s%s", sep, ip6addr_string(ndo, cp));
cp += 16;
sep = ", ";
}
return 0;
-corrupt:
- ND_PRINT((ndo, ": %s", cstr));
- ND_TCHECK2(*cp, ep - cp);
+invalid:
+ ND_PRINT("%s", istr);
+ ND_TCHECK_LEN(cp, ep - cp);
return 0;
trunc:
- ND_PRINT((ndo, "%s", tstr));
+ nd_print_trunc(ndo);
return -1;
}
while (cp < ep) {
if (cp + 4 > ep)
- goto corrupt;
- ND_TCHECK2(*cp, 4);
- ND_PRINT((ndo, "%s%s", sep, ipaddr_string(ndo, cp)));
+ goto invalid;
+ ND_TCHECK_4(cp);
+ ND_PRINT("%s%s", sep, ipaddr_string(ndo, cp));
cp += 4;
sep = ", ";
}
return 0;
-corrupt:
- ND_PRINT((ndo, ": %s", cstr));
- ND_TCHECK2(*cp, ep - cp);
+invalid:
+ ND_PRINT("%s", istr);
+ ND_TCHECK_LEN(cp, ep - cp);
return 0;
trunc:
- ND_PRINT((ndo, "%s", tstr));
+ nd_print_trunc(ndo);
return -1;
}
while (cp < ep) {
if (cp + 17 > ep)
- goto corrupt;
- ND_TCHECK2(*cp, 17);
-#ifdef INET6
- ND_PRINT((ndo, "%s%s/%u", sep, ip6addr_string(ndo, cp), *(cp + 16)));
-#else
- ND_PRINT((ndo, "%s(compiled w/o IPv6)/%u", sep, *(cp + 16)));
-#endif /* INET6 */
+ goto invalid;
+ ND_TCHECK_LEN(cp, 17);
+ ND_PRINT("%s%s/%u", sep, ip6addr_string(ndo, cp), EXTRACT_U_1(cp + 16));
cp += 17;
sep = ", ";
}
return 0;
-corrupt:
- ND_PRINT((ndo, ": %s", cstr));
- ND_TCHECK2(*cp, ep - cp);
+invalid:
+ ND_PRINT("%s", istr);
+ ND_TCHECK_LEN(cp, ep - cp);
return 0;
trunc:
- ND_PRINT((ndo, "%s", tstr));
+ nd_print_trunc(ndo);
return -1;
}
while (cp < ep) {
if (cp + 5 > ep)
- goto corrupt;
- ND_TCHECK2(*cp, 5);
- ND_PRINT((ndo, "%s%s/%u", sep, ipaddr_string(ndo, cp), *(cp + 4)));
+ goto invalid;
+ ND_TCHECK_5(cp);
+ ND_PRINT("%s%s/%u", sep, ipaddr_string(ndo, cp), EXTRACT_U_1(cp + 4));
cp += 5;
sep = ", ";
}
return 0;
-corrupt:
- ND_PRINT((ndo, ": %s", cstr));
- ND_TCHECK2(*cp, ep - cp);
+invalid:
+ ND_PRINT("%s", istr);
+ ND_TCHECK_LEN(cp, ep - cp);
return 0;
trunc:
- ND_PRINT((ndo, "%s", tstr));
+ nd_print_trunc(ndo);
return -1;
}
while (cp < ep) {
/* Option no */
- ND_TCHECK2(*cp, 1);
- option_no = *cp;
+ ND_TCHECK_1(cp);
+ option_no = EXTRACT_U_1(cp);
cp += 1;
- ND_PRINT((ndo, "\n\t %s", tok2str(ahcp1_opt_str, "Unknown-%u", option_no)));
+ ND_PRINT("\n\t %s", tok2str(ahcp1_opt_str, "Unknown-%u", option_no));
if (option_no == AHCP1_OPT_PAD || option_no == AHCP1_OPT_MANDATORY)
continue;
/* Length */
if (cp + 1 > ep)
- goto corrupt;
- ND_TCHECK2(*cp, 1);
- option_len = *cp;
+ goto invalid;
+ ND_TCHECK_1(cp);
+ option_len = EXTRACT_U_1(cp);
cp += 1;
if (cp + option_len > ep)
- goto corrupt;
+ goto invalid;
/* Value */
if (option_no <= AHCP1_OPT_MAX && data_decoders[option_no] != NULL) {
if (data_decoders[option_no](ndo, cp, cp + option_len) < 0)
break; /* truncated and already marked up */
} else {
- ND_PRINT((ndo, " (Length %u)", option_len));
- ND_TCHECK2(*cp, option_len);
+ ND_PRINT(" (Length %u)", option_len);
+ ND_TCHECK_LEN(cp, option_len);
}
cp += option_len;
}
return;
-corrupt:
- ND_PRINT((ndo, " %s", cstr));
- ND_TCHECK2(*cp, ep - cp);
+invalid:
+ ND_PRINT("%s", istr);
+ ND_TCHECK_LEN(cp, ep - cp);
return;
trunc:
- ND_PRINT((ndo, "%s", tstr));
+ nd_print_trunc(ndo);
}
static void
uint16_t body_len;
if (cp + AHCP1_BODY_MIN_LEN > ep)
- goto corrupt;
+ goto invalid;
/* Type */
- ND_TCHECK2(*cp, 1);
- type = *cp;
+ ND_TCHECK_1(cp);
+ type = EXTRACT_U_1(cp);
cp += 1;
/* MBZ */
- ND_TCHECK2(*cp, 1);
- mbz = *cp;
+ ND_TCHECK_1(cp);
+ mbz = EXTRACT_U_1(cp);
cp += 1;
/* Length */
- ND_TCHECK2(*cp, 2);
- body_len = EXTRACT_16BITS(cp);
+ ND_TCHECK_2(cp);
+ body_len = EXTRACT_BE_U_2(cp);
cp += 2;
if (ndo->ndo_vflag) {
- ND_PRINT((ndo, "\n\t%s", tok2str(ahcp1_msg_str, "Unknown-%u", type)));
+ ND_PRINT("\n\t%s", tok2str(ahcp1_msg_str, "Unknown-%u", type));
if (mbz != 0)
- ND_PRINT((ndo, ", MBZ %u", mbz));
- ND_PRINT((ndo, ", Length %u", body_len));
+ ND_PRINT(", MBZ %u", mbz);
+ ND_PRINT(", Length %u", body_len);
}
if (cp + body_len > ep)
- goto corrupt;
+ goto invalid;
/* Options */
if (ndo->ndo_vflag >= 2)
ahcp1_options_print(ndo, cp, cp + body_len); /* not ep (ignore extra data) */
else
- ND_TCHECK2(*cp, body_len);
+ ND_TCHECK_LEN(cp, body_len);
return;
-corrupt:
- ND_PRINT((ndo, " %s", cstr));
- ND_TCHECK2(*cp, ep - cp);
+invalid:
+ ND_PRINT("%s", istr);
+ ND_TCHECK_LEN(cp, ep - cp);
return;
trunc:
- ND_PRINT((ndo, "%s", tstr));
+ nd_print_trunc(ndo);
}
void
ahcp_print(netdissect_options *ndo, const u_char *cp, const u_int len)
{
- const u_char *ep = cp + len;
+ const u_char *ep = ndo->ndo_snapend;
uint8_t version;
- ND_PRINT((ndo, "AHCP"));
+ ndo->ndo_protocol = "ahcp";
+ ND_PRINT("AHCP");
if (len < 2)
- goto corrupt;
+ goto invalid;
/* Magic */
- ND_TCHECK2(*cp, 1);
- if (*cp != AHCP_MAGIC_NUMBER)
- goto corrupt;
+ ND_TCHECK_1(cp);
+ if (EXTRACT_U_1(cp) != AHCP_MAGIC_NUMBER)
+ goto invalid;
cp += 1;
/* Version */
- ND_TCHECK2(*cp, 1);
- version = *cp;
+ ND_TCHECK_1(cp);
+ version = EXTRACT_U_1(cp);
cp += 1;
switch (version) {
case AHCP_VERSION_1: {
- ND_PRINT((ndo, " Version 1"));
+ ND_PRINT(" Version 1");
if (len < AHCP1_HEADER_FIX_LEN)
- goto corrupt;
+ goto invalid;
if (!ndo->ndo_vflag) {
- ND_TCHECK2(*cp, AHCP1_HEADER_FIX_LEN - 2);
+ ND_TCHECK_LEN(cp, AHCP1_HEADER_FIX_LEN - 2);
cp += AHCP1_HEADER_FIX_LEN - 2;
} else {
/* Hopcount */
- ND_TCHECK2(*cp, 1);
- ND_PRINT((ndo, "\n\tHopcount %u", *cp));
+ ND_TCHECK_1(cp);
+ ND_PRINT("\n\tHopcount %u", EXTRACT_U_1(cp));
cp += 1;
/* Original Hopcount */
- ND_TCHECK2(*cp, 1);
- ND_PRINT((ndo, ", Original Hopcount %u", *cp));
+ ND_TCHECK_1(cp);
+ ND_PRINT(", Original Hopcount %u", EXTRACT_U_1(cp));
cp += 1;
/* Nonce */
- ND_TCHECK2(*cp, 4);
- ND_PRINT((ndo, ", Nonce 0x%08x", EXTRACT_32BITS(cp)));
+ ND_TCHECK_4(cp);
+ ND_PRINT(", Nonce 0x%08x", EXTRACT_BE_U_4(cp));
cp += 4;
/* Source Id */
- ND_TCHECK2(*cp, 8);
- ND_PRINT((ndo, ", Source Id %s", linkaddr_string(ndo, cp, 0, 8)));
+ ND_TCHECK_8(cp);
+ ND_PRINT(", Source Id %s", linkaddr_string(ndo, cp, 0, 8));
cp += 8;
/* Destination Id */
- ND_TCHECK2(*cp, 8);
- ND_PRINT((ndo, ", Destination Id %s", linkaddr_string(ndo, cp, 0, 8)));
+ ND_TCHECK_8(cp);
+ ND_PRINT(", Destination Id %s", linkaddr_string(ndo, cp, 0, 8));
cp += 8;
}
/* Body */
break;
}
default:
- ND_PRINT((ndo, " Version %u (unknown)", version));
+ ND_PRINT(" Version %u (unknown)", version);
break;
}
return;
-corrupt:
- ND_PRINT((ndo, " %s", cstr));
- ND_TCHECK2(*cp, ep - cp);
+invalid:
+ ND_PRINT("%s", istr);
+ ND_TCHECK_LEN(cp, ep - cp);
return;
trunc:
- ND_PRINT((ndo, "%s", tstr));
+ nd_print_trunc(ndo);
}
projects / tcpdump / blobdiff