/* \summary: Babel Routing Protocol printer */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
#include <stdio.h>
#include <string.h>
#include "addrtoname.h"
#include "extract.h"
-static const char tstr[] = "[|babel]";
static void babel_print_v2(netdissect_options *, const u_char *cp, u_int length);
babel_print(netdissect_options *ndo,
const u_char *cp, u_int length)
{
+ ndo->ndo_protocol = "babel";
ND_PRINT("babel");
ND_TCHECK_4(cp);
ND_PRINT(" invalid header");
return;
} else {
- ND_PRINT(" %d", EXTRACT_U_1(cp + 1));
+ ND_PRINT(" %u", EXTRACT_U_1(cp + 1));
}
switch(EXTRACT_U_1(cp + 1)) {
return;
trunc:
- ND_PRINT(" %s", tstr);
+ nd_print_trunc(ndo);
return;
}
#define MESSAGE_ROUTER_ID 6
#define MESSAGE_NH 7
#define MESSAGE_UPDATE 8
-#define MESSAGE_REQUEST 9
-#define MESSAGE_MH_REQUEST 10
+#define MESSAGE_ROUTE_REQUEST 9
+#define MESSAGE_SEQNO_REQUEST 10
#define MESSAGE_TSPC 11
#define MESSAGE_HMAC 12
-#define MESSAGE_UPDATE_SRC_SPECIFIC 13
-#define MESSAGE_REQUEST_SRC_SPECIFIC 14
-#define MESSAGE_MH_REQUEST_SRC_SPECIFIC 15
+#define MESSAGE_UPDATE_SRC_SPECIFIC 13 /* last appearance in draft-boutier-babel-source-specific-01 */
+#define MESSAGE_REQUEST_SRC_SPECIFIC 14 /* idem */
+#define MESSAGE_MH_REQUEST_SRC_SPECIFIC 15 /* idem */
/* sub-TLVs */
#define MESSAGE_SUB_PAD1 0
format_id(const u_char *id)
{
static char buf[25];
- snprintf(buf, 25, "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",
+ nd_snprintf(buf, 25, "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",
EXTRACT_U_1(id), EXTRACT_U_1(id + 1), EXTRACT_U_1(id + 2),
EXTRACT_U_1(id + 3), EXTRACT_U_1(id + 4), EXTRACT_U_1(id + 5),
EXTRACT_U_1(id + 6), EXTRACT_U_1(id + 7));
{
static char buf[50];
if(plen >= 96 && memcmp(prefix, v4prefix, 12) == 0)
- snprintf(buf, 50, "%s/%u", ipaddr_string(ndo, prefix + 12), plen - 96);
+ nd_snprintf(buf, 50, "%s/%u", ipaddr_string(ndo, prefix + 12), plen - 96);
else
- snprintf(buf, 50, "%s/%u", ip6addr_string(ndo, prefix), plen);
+ nd_snprintf(buf, 50, "%s/%u", ip6addr_string(ndo, prefix), plen);
buf[49] = '\0';
return buf;
}
if (i == 0)
return "0.0s (bogus)";
- snprintf(buf, sizeof(buf), "%u.%02us", i / 100, i % 100);
+ nd_snprintf(buf, sizeof(buf), "%u.%02us", i / 100, i % 100);
return buf;
}
format_timestamp(const uint32_t i)
{
static char buf[sizeof("0000.000000s")];
- snprintf(buf, sizeof(buf), "%u.%06us", i / 1000000, i % 1000000);
+ nd_snprintf(buf, sizeof(buf), "%u.%06us", i / 1000000, i % 1000000);
return buf;
}
* o Type 1 stands for PadN sub-TLV with the same encoding as the PadN TLV.
* o Type 2 stands for Diversity sub-TLV, which propagates diversity routing
* data. Its body is a variable-length sequence of 8-bit unsigned integers,
- * each representing per-hop number of interferring radio channel for the
+ * each representing per-hop number of interfering radio channel for the
* prefix. Channel 0 is invalid and must not be used in the sub-TLV, channel
* 255 interferes with any other channel.
* o Type 3 stands for Timestamp sub-TLV, used to compute RTT between
return;
invalid:
- ND_PRINT("%s", istr);
+ nd_print_invalid(ndo);
}
#define ICHECK(i, l) \
if (!ndo->ndo_vflag)
ND_PRINT(" padN");
else
- ND_PRINT("\n\tPad %d", len + 2);
+ ND_PRINT("\n\tPad %u", len + 2);
}
break;
break;
case MESSAGE_IHU: {
- unsigned short txcost, interval;
+ unsigned short rxcost, interval;
if (!ndo->ndo_vflag)
ND_PRINT(" ihu");
else {
u_char address[16];
+ u_char ae;
int rc;
ND_PRINT("\n\tIHU ");
if(len < 6) goto invalid;
- txcost = EXTRACT_BE_U_2(message + 4);
+ rxcost = EXTRACT_BE_U_2(message + 4);
interval = EXTRACT_BE_U_2(message + 6);
- rc = network_address(EXTRACT_U_1(message + 2), message + 8,
+ ae = EXTRACT_U_1(message + 2);
+ rc = network_address(ae, message + 8,
len - 6, address);
- if(rc < 0) { ND_PRINT("%s", tstr); break; }
- ND_PRINT("%s txcost %u interval %s",
- format_address(ndo, address), txcost, format_interval(interval));
+ if(rc < 0) { nd_print_trunc(ndo); break; }
+ ND_PRINT("%s rxcost %u interval %s",
+ ae == 0 ? "any" : format_address(ndo, address),
+ rxcost, format_interval(interval));
/* Extra data. */
if((u_int)rc < len - 6)
subtlvs_print(ndo, message + 8 + rc, message + 2 + len,
ND_PRINT(" nh");
else {
int rc;
+ u_char ae;
u_char nh[16];
ND_PRINT("\n\tNext Hop");
if(len < 2) goto invalid;
- rc = network_address(EXTRACT_U_1(message + 2), message + 4,
+ ae = EXTRACT_U_1(message + 2);
+ rc = network_address(ae, message + 4,
len - 2, nh);
if(rc < 0) goto invalid;
- ND_PRINT(" %s", format_address(ndo, nh));
+ ND_PRINT(" %s", ae == 0 ? "invalid AE 0" : format_address(ndo, nh));
}
}
break;
(EXTRACT_U_1(message + 3) & 0x3f) ? "/unknown" : "");
} else {
u_short interval, seqno, metric;
- u_char plen;
+ u_char ae, plen;
int rc;
u_char prefix[16];
ND_PRINT("\n\tUpdate");
if(len < 10) goto invalid;
+ ae = EXTRACT_U_1(message + 2);
plen = EXTRACT_U_1(message + 4) + (EXTRACT_U_1(message + 2) == 1 ? 96 : 0);
- rc = network_prefix(EXTRACT_U_1(message + 2),
+ rc = network_prefix(ae,
EXTRACT_U_1(message + 4),
EXTRACT_U_1(message + 5),
message + 12,
(EXTRACT_U_1(message + 3) & 0x80) ? "/prefix": "",
(EXTRACT_U_1(message + 3) & 0x40) ? "/id" : "",
(EXTRACT_U_1(message + 3) & 0x3f) ? "/unknown" : "",
- format_prefix(ndo, prefix, plen),
+ ae == 0 ? "any" : format_prefix(ndo, prefix, plen),
metric, seqno, format_interval_update(interval));
if(EXTRACT_U_1(message + 3) & 0x80) {
if(EXTRACT_U_1(message + 2) == 1)
}
break;
- case MESSAGE_REQUEST: {
+ case MESSAGE_ROUTE_REQUEST: {
if (!ndo->ndo_vflag)
- ND_PRINT(" request");
+ ND_PRINT(" route-request");
else {
int rc;
- u_char prefix[16], plen;
- ND_PRINT("\n\tRequest ");
+ u_char prefix[16], ae, plen;
+ ND_PRINT("\n\tRoute Request ");
if(len < 2) goto invalid;
+ ae = EXTRACT_U_1(message + 2);
plen = EXTRACT_U_1(message + 3) + (EXTRACT_U_1(message + 2) == 1 ? 96 : 0);
- rc = network_prefix(EXTRACT_U_1(message + 2),
+ rc = network_prefix(ae,
EXTRACT_U_1(message + 3), 0,
message + 4, NULL, len - 2, prefix);
if(rc < 0) goto invalid;
ND_PRINT("for %s",
- EXTRACT_U_1(message + 2) == 0 ? "any" : format_prefix(ndo, prefix, plen));
+ ae == 0 ? "any" : format_prefix(ndo, prefix, plen));
}
}
break;
- case MESSAGE_MH_REQUEST : {
+ case MESSAGE_SEQNO_REQUEST : {
if (!ndo->ndo_vflag)
- ND_PRINT(" mh-request");
+ ND_PRINT(" seqno-request");
else {
int rc;
u_short seqno;
- u_char prefix[16], plen;
- ND_PRINT("\n\tMH-Request ");
+ u_char prefix[16], ae, plen;
+ ND_PRINT("\n\tSeqno Request ");
if(len < 14) goto invalid;
+ ae = EXTRACT_U_1(message + 2);
seqno = EXTRACT_BE_U_2(message + 4);
- rc = network_prefix(EXTRACT_U_1(message + 2),
+ rc = network_prefix(ae,
EXTRACT_U_1(message + 3), 0,
message + 16, NULL, len - 14, prefix);
if(rc < 0) goto invalid;
plen = EXTRACT_U_1(message + 3) + (EXTRACT_U_1(message + 2) == 1 ? 96 : 0);
ND_PRINT("(%u hops) for %s seqno %u id %s",
- EXTRACT_U_1(message + 6), format_prefix(ndo, prefix, plen),
+ EXTRACT_U_1(message + 6),
+ ae == 0 ? "invalid AE 0" : format_prefix(ndo, prefix, plen),
seqno, format_id(message + 8));
}
}
if (!ndo->ndo_vflag)
ND_PRINT(" unknown");
else
- ND_PRINT("\n\tUnknown message type %d", type);
+ ND_PRINT("\n\tUnknown message type %u", type);
}
i += len + 2;
}
return;
trunc:
- ND_PRINT(" %s", tstr);
+ nd_print_trunc(ndo);
return;
invalid:
- ND_PRINT("%s", istr);
+ nd_print_invalid(ndo);
return;
}
projects / tcpdump / blobdiff