/* specification: RFC 5810 */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include "netdissect-stdinc.h"
+#define ND_LONGJMP_FROM_TCHECK
#include "netdissect.h"
#include "extract.h"
#define TLV_HDRL 4
#define ILV_HDRL 8
-#define TOM_RSVD 0x0
-#define TOM_ASSNSETUP 0x1
-#define TOM_ASSNTEARD 0x2
-#define TOM_CONFIG 0x3
-#define TOM_QUERY 0x4
-#define TOM_EVENTNOT 0x5
-#define TOM_PKTREDIR 0x6
-#define TOM_HEARTBT 0x0F
-#define TOM_ASSNSETREP 0x11
-#define TOM_CONFIGREP 0x13
-#define TOM_QUERYREP 0x14
+#define TOM_RSVD 0x0
+#define TOM_ASSNSETUP 0x1
+#define TOM_ASSNTEARD 0x2
+#define TOM_CONFIG 0x3
+#define TOM_QUERY 0x4
+#define TOM_EVENTNOT 0x5
+#define TOM_PKTREDIR 0x6
+#define TOM_HEARTBT 0x0F
+#define TOM_ASSNSETREP 0x11
+#define TOM_CONFIGREP 0x13
+#define TOM_QUERYREP 0x14
/*
* tom_h Flags: resv1(8b):maxtlvs(4b):resv2(2b):mintlv(2b)
};
/* this is defined in RFC5810 section A.2 */
-/* http://www.iana.org/assignments/forces/forces.xhtml#oper-tlv-types */
+/* https://www.iana.org/assignments/forces/forces.xhtml#oper-tlv-types */
enum {
F_OP_RSV = 0,
F_OP_SET = 1,
};
#define B_FULLD 0x1
-#define B_SPARD 0x2
+#define B_SPARD 0x2
#define B_RESTV 0x4
#define B_KEYIN 0x8
#define B_APPND 0x10
nd_uint16_t length;
};
-#define F_ALN_LEN(len) ( ((len)+ForCES_ALNL-1) & ~(ForCES_ALNL-1) )
+#define F_ALN_LEN(len) roundup2(len, ForCES_ALNL)
#define GET_TOP_TLV(fhdr) ((const struct forces_tlv *)((fhdr) + sizeof (struct forcesh)))
#define TLV_SET_LEN(len) (F_ALN_LEN(TLV_HDRL) + (len))
#define TLV_DATA(tlvp) ((const void*)(((const char*)(tlvp)) + TLV_SET_LEN(0)))
{0, NULL}
};
+static const struct tok tdr_str[] = {
+ { 0, "Normal Teardown" },
+ { 1, "Loss of Heartbeats" },
+ { 2, "Out of bandwidth" },
+ { 3, "Out of Memory" },
+ { 4, "Application Crash" },
+ { 0, NULL }
+};
+
#define RESLEN 4
static int
uint16_t op_msk _U_, int indent)
{
const struct forces_tlv *tlv = (const struct forces_tlv *)pptr;
- const u_char *tdp = (const u_char *) TLV_DATA(tlv);
+ const u_char *tdp = TLV_DATA(tlv);
const struct res_val *r = (const struct res_val *)tdp;
u_int dlen;
uint8_t result;
dlen = len - TLV_HDRL;
if (dlen != RESLEN) {
ND_PRINT("illegal RESULT-TLV: %u bytes!\n", dlen);
- return -1;
+ goto invalid;
}
ND_TCHECK_SIZE(r);
result = GET_U_1(r->result);
if (result >= 0x18 && result <= 0xFE) {
ND_PRINT("illegal reserved result code: 0x%x!\n", result);
- return -1;
+ goto invalid;
}
if (ndo->ndo_vflag >= 3) {
}
return 0;
-trunc:
- nd_print_trunc(ndo);
+invalid:
return -1;
}
{
const struct forces_tlv *tlv = (const struct forces_tlv *)pptr;
u_int rlen;
- const u_char *tdp = (const u_char *) TLV_DATA(tlv);
+ const u_char *tdp = TLV_DATA(tlv);
uint16_t type;
/*
type = GET_BE_U_2(tlv->type);
if (type != F_TLV_FULD) {
ND_PRINT("Error: expecting FULLDATA!\n");
- return -1;
+ goto invalid;
}
if (ndo->ndo_vflag >= 3) {
char *ib = indent_pr(indent + 2, 1);
ND_PRINT("%s[", ib + 1);
- hex_print_with_offset(ndo, ib, tdp, rlen, 0);
- ND_PRINT("\n%s]\n", ib + 1);
+ hex_print(ndo, ib, tdp, rlen);
+ ND_PRINT("\n%s]", ib + 1);
}
return 0;
-trunc:
- nd_print_trunc(ndo);
+invalid:
return -1;
}
if (len < ILV_HDRL) {
ND_PRINT("Error: BAD SPARSEDATA-TLV!\n");
- return -1;
+ goto invalid;
}
rlen = len;
indent += 1;
while (rlen != 0) {
-#if 0
- ND_PRINT("Jamal - outstanding length <%u>\n", rlen);
-#endif
char *ib = indent_pr(indent, 1);
- const u_char *tdp = (const u_char *) ILV_DATA(ilv);
- ND_TCHECK_SIZE(ilv);
+ const u_char *tdp = ILV_DATA(ilv);
invilv = ilv_valid(ndo, ilv, rlen);
if (invilv) {
- ND_PRINT("%s[", ib + 1);
- hex_print_with_offset(ndo, ib, tdp, rlen, 0);
- ND_PRINT("\n%s]\n", ib + 1);
- return -1;
+ ND_PRINT("Error: %s, rlen %u\n",
+ tok2str(ForCES_TLV_err, NULL, invilv), rlen);
+ goto invalid;
}
if (ndo->ndo_vflag >= 3) {
u_int ilvl = GET_BE_U_4(ilv->length);
ND_PRINT("\n%s ILV: type %x length %u\n", ib + 1,
GET_BE_U_4(ilv->type), ilvl);
- hex_print_with_offset(ndo, "\t\t[", tdp, ilvl-ILV_HDRL, 0);
+ hex_print(ndo, "\t\t[", tdp, ilvl-ILV_HDRL);
}
ilv = GO_NXT_ILV(ilv, rlen);
}
return 0;
-
-trunc:
- nd_print_trunc(ndo);
+invalid:
return -1;
}
{
const struct forces_tlv *tlv = (const struct forces_tlv *)pptr;
u_int rlen;
- const u_char *tdp = (const u_char *) TLV_DATA(tlv);
+ const u_char *tdp = TLV_DATA(tlv);
uint16_t type;
/*
type = GET_BE_U_2(tlv->type);
if (type != F_TLV_SPAD) {
ND_PRINT("Error: expecting SPARSEDATA!\n");
- return -1;
+ goto invalid;
}
return sdatailv_print(ndo, tdp, rlen, op_msk, indent);
-trunc:
- nd_print_trunc(ndo);
+invalid:
return -1;
}
uint16_t op_msk, int indent)
{
const struct forces_tlv *tlv = (const struct forces_tlv *)pptr;
- const u_char *tdp = (const u_char *) TLV_DATA(tlv);
+ const u_char *tdp = TLV_DATA(tlv);
const u_char *dp = tdp + 4;
const struct forces_tlv *kdtlv = (const struct forces_tlv *)dp;
uint32_t id;
uint16_t type, tll;
u_int invtlv;
- ND_TCHECK_1(tdp);
id = GET_BE_U_4(tdp);
ND_PRINT("%sKeyinfo: Key 0x%x\n", ib, id);
- ND_TCHECK_SIZE(kdtlv);
type = GET_BE_U_2(kdtlv->type);
tll = GET_BE_U_2(kdtlv->length);
invtlv = tlv_valid(tll, len);
ND_PRINT("%s TLV type 0x%x len %u\n",
tok2str(ForCES_TLV_err, NULL, invtlv), type,
tll);
- return -1;
+ goto invalid;
}
/*
* At this point, tlv_valid() has ensured that the TLV
* go past the end of the containing TLV).
*/
tll = GET_BE_U_2(kdtlv->length);
- dp = (const u_char *) TLV_DATA(kdtlv);
+ dp = TLV_DATA(kdtlv);
return fdatatlv_print(ndo, dp, tll, op_msk, indent);
-
-trunc:
- nd_print_trunc(ndo);
+invalid:
return -1;
}
ND_PRINT("%sTABLE APPEND\n", ib);
}
for (i = 0; i < IDcnt; i++) {
- ND_TCHECK_4(pptr);
- if (len < 4)
- goto trunc;
+ ND_ICHECK_U(len, <, 4);
id = GET_BE_U_4(pptr);
if (ndo->ndo_vflag >= 3)
ND_PRINT("%sID#%02u: %u\n", ib, i + 1, id);
if (len < PTH_DESC_SIZE) {
ND_PRINT("pathlength %u with key/range too short %u\n",
len, PTH_DESC_SIZE);
- return -1;
+ goto invalid;
}
pptr += sizeof(struct forces_tlv);
if (len < PTH_DESC_SIZE) {
ND_PRINT("pathlength %u with key/range too short %u\n",
len, PTH_DESC_SIZE);
- return -1;
+ goto invalid;
}
/* skip keyid */
if (tll < TLV_HDRL) {
ND_PRINT("key content length %u < %u\n",
tll, TLV_HDRL);
- return -1;
+ goto invalid;
}
tll -= TLV_HDRL;
if (len < tll) {
ND_PRINT("key content too short\n");
- return -1;
+ goto invalid;
}
pptr += tll;
len -= tll;
u_int aln;
u_int invtlv;
- ND_TCHECK_SIZE(pdtlv);
type = GET_BE_U_2(pdtlv->type);
tlvl = GET_BE_U_2(pdtlv->length);
invtlv = tlv_valid(tlvl, len);
chk_op_type(ndo, type, op_msk, ops->op_msk);
- if (ops->print(ndo, (const u_char *)pdtlv,
- tll + pad + TLV_HDRL, op_msk,
- indent + 2) == -1)
- return -1;
+ ND_ICHECK_U(ops->print(ndo, (const u_char *)pdtlv,
+ tll + pad + TLV_HDRL, op_msk, indent + 2),
+ ==, -1);
len -= (TLV_HDRL + pad + tll);
} else {
ND_PRINT("Invalid path data content type 0x%x len %u\n",
type, tlvl);
pd_err:
if (tlvl) {
- hex_print_with_offset(ndo, "Bad Data val\n\t [",
- pptr, len, 0);
+ hex_print(ndo, "Bad Data val\n\t [",
+ pptr, len);
ND_PRINT("]\n");
- return -1;
+ goto invalid;
}
}
}
return len;
-trunc:
- nd_print_trunc(ndo);
+invalid:
return -1;
}
uint16_t idcnt = 0;
ND_TCHECK_SIZE(pdh);
- if (len < sizeof(struct pathdata_h))
- goto trunc;
+ ND_ICHECK_ZU(len, <, sizeof(struct pathdata_h));
if (ndo->ndo_vflag >= 3) {
ND_PRINT("\n%sPathdata: Flags 0x%x ID count %u\n",
ib, GET_BE_U_2(pdh->pflags),
if (len < minsize) {
ND_PRINT("\t\t\ttruncated IDs expected %uB got %uB\n", minsize,
len);
- hex_print_with_offset(ndo, "\t\t\tID Data[", pptr, len, 0);
+ hex_print(ndo, "\t\t\tID Data[", pptr, len);
ND_PRINT("]\n");
- return -1;
+ goto invalid;
}
if ((op_msk & B_TRNG) && (op_msk & B_KEYIN)) {
ND_PRINT("\t\t\tIllegal to have both Table ranges and keys\n");
- return -1;
+ goto invalid;
}
more_pd = pdatacnt_print(ndo, pptr, len, idcnt, op_msk, indent);
/* XXX: Argh, recurse some more */
return recpdoptlv_print(ndo, pptr, len, op_msk, indent+1);
} else
- return 0;
+ return more_pd;
-trunc:
- nd_print_trunc(ndo);
+invalid:
return -1;
}
u_int invtlv;
char *ib = indent_pr(indent, 0);
- ND_TCHECK_SIZE(pdtlv);
type = GET_BE_U_2(pdtlv->type);
tlvl = GET_BE_U_2(pdtlv->length);
invtlv = tlv_valid(tlvl, len);
ND_PRINT("genoptlvprint - %s TLV type 0x%x len %u\n",
tok2str(ForCES_TLV, NULL, type), type, tlvl);
- if (!invtlv) {
- /*
- * At this point, tlv_valid() has ensured that the TLV
- * length is large enough but not too large (it doesn't
- * go past the end of the containing TLV).
- */
- const u_char *dp = (const u_char *) TLV_DATA(pdtlv);
-
- if (!ttlv_valid(type)) {
- ND_PRINT("%s TLV type 0x%x len %u\n",
- tok2str(ForCES_TLV_err, NULL, invtlv), type,
- tlvl);
- return -1;
- }
- if (ndo->ndo_vflag >= 3)
- ND_PRINT("%s%s, length %u (data length %u Bytes)",
- ib, tok2str(ForCES_TLV, NULL, type),
- tlvl, tlvl - TLV_HDRL);
-
- return pdata_print(ndo, dp, tlvl - TLV_HDRL, op_msk, indent + 1);
- } else {
+ if (invtlv) {
ND_PRINT("\t\t\tInvalid ForCES TLV type=%x", type);
- return -1;
+ goto invalid;
+ }
+ /*
+ * At this point, tlv_valid() has ensured that the TLV
+ * length is large enough but not too large (it doesn't
+ * go past the end of the containing TLV).
+ */
+ const u_char *dp = TLV_DATA(pdtlv);
+
+ if (!ttlv_valid(type)) {
+ ND_PRINT("%s TLV type 0x%x len %u\n",
+ tok2str(ForCES_TLV_err, NULL, invtlv), type,
+ tlvl);
+ goto invalid;
}
+ if (ndo->ndo_vflag >= 3)
+ ND_PRINT("%s%s, length %u (data length %u Bytes)",
+ ib, tok2str(ForCES_TLV, NULL, type),
+ tlvl, tlvl - TLV_HDRL);
-trunc:
- nd_print_trunc(ndo);
+ return pdata_print(ndo, dp, tlvl - TLV_HDRL, op_msk, indent + 1);
+invalid:
return -1;
}
char *ib;
const u_char *dp;
- ND_TCHECK_SIZE(pdtlv);
tlvl = GET_BE_U_2(pdtlv->length);
invtlv = tlv_valid(tlvl, len);
if (invtlv) {
*/
ib = indent_pr(indent, 0);
type = GET_BE_U_2(pdtlv->type);
- dp = (const u_char *) TLV_DATA(pdtlv);
+ dp = TLV_DATA(pdtlv);
if (ndo->ndo_vflag >= 3)
ND_PRINT("%s%s, length %u (data encapsulated %u Bytes)",
tlvl,
tlvl - TLV_HDRL);
- if (pdata_print(ndo, dp, tlvl - TLV_HDRL, op_msk, indent + 1) == -1)
- return -1;
+ ND_ICHECK_U(pdata_print(ndo, dp, tlvl - TLV_HDRL, op_msk, indent + 1),
+ ==, -1);
pdtlv = GO_NXT_TLV(pdtlv, len);
}
ND_PRINT("\n\t\tMessy PATHDATA TLV header, type (0x%x)\n\t\texcess of %u Bytes ",
GET_BE_U_2(pdtlv->type),
len - GET_BE_U_2(pdtlv->length));
- return -1;
+ goto invalid;
}
return 0;
-
-trunc:
- nd_print_trunc(ndo);
+invalid:
return -1;
}
if (ndo->ndo_vflag >= 3) {
ND_PRINT("%sData[", ib + 1);
- hex_print_with_offset(ndo, ib, pptr, len, 0);
+ hex_print(ndo, ib, pptr, len);
ND_PRINT("%s]\n", ib);
}
return -1;
const struct forces_tlv *otlv, uint16_t op_msk _U_, int indent)
{
int rc = 0;
- const u_char *dp = (const u_char *) TLV_DATA(otlv);
+ const u_char *dp = TLV_DATA(otlv);
uint16_t type;
u_int tll;
char *ib = indent_pr(indent, 0);
const struct optlv_h *ops;
/*
- * lfbselect_print() has ensured that EXTRACT_BE_U_2(otlv->length)
+ * lfbselect_print() has ensured that GET_BE_U_2(otlv->length)
* >= TLV_HDRL.
*/
- ND_TCHECK_SIZE(otlv);
type = GET_BE_U_2(otlv->type);
tll = GET_BE_U_2(otlv->length) - TLV_HDRL;
ops = get_forces_optlv_h(type);
rc = ops->print(ndo, dp, tll, ops->op_msk, indent + 1);
}
return rc;
-
-trunc:
- nd_print_trunc(ndo);
- return -1;
}
#define ASTDLN 4
dlen = len - TLV_HDRL;
if (dlen != ASTDLN) {
ND_PRINT("illegal ASTresult-TLV: %u bytes!\n", dlen);
- return -1;
+ goto invalid;
}
- ND_TCHECK_4(pptr);
rescode = GET_BE_U_4(pptr);
if (rescode > ASTMCD) {
ND_PRINT("illegal ASTresult result code: %u!\n", rescode);
- return -1;
+ goto invalid;
}
if (ndo->ndo_vflag >= 3) {
- ND_PRINT("Teardown reason:\n%s", ib);
- switch (rescode) {
- case 0:
- ND_PRINT("Normal Teardown");
- break;
- case 1:
- ND_PRINT("Loss of Heartbeats");
- break;
- case 2:
- ND_PRINT("Out of bandwidth");
- break;
- case 3:
- ND_PRINT("Out of Memory");
- break;
- case 4:
- ND_PRINT("Application Crash");
- break;
- default:
- ND_PRINT("Unknown Teardown reason");
- break;
- }
+ ND_PRINT("Teardown reason:\n%s%s", ib,
+ tok2str(tdr_str, "unknown (%u)", rescode));
ND_PRINT("(%x)\n%s", rescode, ib);
}
return 0;
-
-trunc:
- nd_print_trunc(ndo);
+invalid:
return -1;
}
dlen = len - TLV_HDRL;
if (dlen != ASRDLN) { /* id, instance, oper tlv */
ND_PRINT("illegal ASRresult-TLV: %u bytes!\n", dlen);
- return -1;
+ goto invalid;
}
- ND_TCHECK_4(pptr);
rescode = GET_BE_U_4(pptr);
if (rescode > ASRMCD) {
ND_PRINT("illegal ASRresult result code: %u!\n", rescode);
- return -1;
+ goto invalid;
}
if (ndo->ndo_vflag >= 3) {
ND_PRINT("(%x)\n%s", rescode, ib);
}
return 0;
-
-trunc:
- nd_print_trunc(ndo);
+invalid:
return -1;
}
static int
print_metailv(netdissect_options *ndo,
- const u_char * pptr, uint16_t op_msk _U_, int indent)
+ const struct forces_ilv * ilv, uint16_t op_msk _U_,
+ const int indent)
{
u_int rlen;
char *ib = indent_pr(indent, 0);
/* XXX: check header length */
- const struct forces_ilv *ilv = (const struct forces_ilv *)pptr;
/*
* print_metatlv() has ensured that len (what remains in the
* ILV) >= ILV_HDRL.
*/
rlen = GET_BE_U_4(ilv->length) - ILV_HDRL;
- ND_TCHECK_SIZE(ilv);
ND_PRINT("%sMetaID 0x%x length %u\n", ib, GET_BE_U_4(ilv->type),
GET_BE_U_4(ilv->length));
if (ndo->ndo_vflag >= 3) {
- hex_print_with_offset(ndo, "\t\t[", ILV_DATA(ilv), rlen, 0);
+ hex_print(ndo, "\t\t[", ILV_DATA(ilv), rlen);
ND_PRINT(" ]\n");
}
return 0;
-
-trunc:
- nd_print_trunc(ndo);
- return -1;
}
static int
rlen = dlen;
ND_PRINT("\n%s METADATA length %u\n", ib, rlen);
while (rlen != 0) {
- ND_TCHECK_SIZE(ilv);
invilv = ilv_valid(ndo, ilv, rlen);
if (invilv) {
break;
* length is large enough but not too large (it doesn't
* go past the end of the containing TLV).
*/
- print_metailv(ndo, (const u_char *) ilv, 0, indent + 1);
+ print_metailv(ndo, ilv, 0, indent + 1);
ilv = GO_NXT_ILV(ilv, rlen);
}
return 0;
-
-trunc:
- nd_print_trunc(ndo);
- return -1;
}
if (ndo->ndo_vflag >= 3) {
ND_PRINT("\t\t[");
- hex_print_with_offset(ndo, "\n\t\t", pptr, rlen, 0);
+ hex_print(ndo, "\n\t\t", pptr, rlen);
ND_PRINT("\n\t\t]");
}
if (dlen <= RD_MIN) {
ND_PRINT("\n\t\ttruncated Redirect TLV: %u bytes missing! ",
RD_MIN - dlen);
- return -1;
+ goto invalid;
}
rlen = dlen;
while (rlen != 0) {
uint16_t type, tlvl;
- ND_TCHECK_SIZE(tlv);
type = GET_BE_U_2(tlv->type);
tlvl = GET_BE_U_2(tlv->length);
invtlv = tlv_valid(tlvl, rlen);
* go past the end of the containing TLV).
*/
if (type == F_TLV_METD) {
- print_metatlv(ndo, (const u_char *) TLV_DATA(tlv),
+ print_metatlv(ndo, TLV_DATA(tlv),
tlvl, 0,
indent);
} else if (type == F_TLV_REDD) {
- print_reddata(ndo, (const u_char *) TLV_DATA(tlv),
+ print_reddata(ndo, TLV_DATA(tlv),
tlvl, 0,
indent);
} else {
ND_PRINT("\n\t\tMessy Redirect TLV header, type (0x%x)\n\t\texcess of %u Bytes ",
GET_BE_U_2(tlv->type),
rlen - GET_BE_U_2(tlv->length));
- return -1;
+ goto invalid;
}
return 0;
-
-trunc:
- nd_print_trunc(ndo);
+invalid:
return -1;
}
*/
dlen = len - TLV_HDRL;
if (dlen <= OP_MIN) { /* id, instance, oper tlv header .. */
- ND_PRINT("\n\t\ttruncated lfb selector: %u bytes missing! ",
+ ND_PRINT("\n\t\tundersized lfb selector: %u bytes missing! ",
OP_MIN - dlen);
- return -1;
+ goto invalid;
}
/*
while (rlen != 0) {
uint16_t type, tlvl;
- ND_TCHECK_SIZE(otlv);
type = GET_BE_U_2(otlv->type);
tlvl = GET_BE_U_2(otlv->length);
invtlv = tlv_valid(tlvl, rlen);
ND_PRINT("\n\t\tMessy oper TLV header, type (0x%x)\n\t\texcess of %u Bytes ",
GET_BE_U_2(otlv->type),
rlen - GET_BE_U_2(otlv->length));
- return -1;
+ goto invalid;
}
return 0;
-trunc:
- nd_print_trunc(ndo);
+invalid:
return -1;
}
if (rlen > TLV_HLN) {
if (tops->flags & ZERO_TTLV) {
ND_PRINT("<0x%x>Illegal Top level TLV!\n", tops->flags);
- return -1;
+ goto invalid;
}
} else {
if (tops->flags & ZERO_MORE_TTLV)
return 0;
if (tops->flags & ONE_MORE_TTLV) {
ND_PRINT("\tTop level TLV Data missing!\n");
- return -1;
+ goto invalid;
}
}
while (rlen != 0) {
uint16_t type, tlvl;
- ND_TCHECK_SIZE(tltlv);
type = GET_BE_U_2(tltlv->type);
tlvl = GET_BE_U_2(tltlv->length);
invtlv = tlv_valid(tlvl, rlen);
if (!ttlv_valid(type)) {
ND_PRINT("\n\tInvalid ForCES Top TLV type=0x%x",
type);
- return -1;
+ goto invalid;
}
if (ndo->ndo_vflag >= 3)
tlvl,
tlvl - TLV_HDRL);
- rc = tops->print(ndo, (const u_char *) TLV_DATA(tltlv),
+ rc = tops->print(ndo, TLV_DATA(tltlv),
tlvl,
tops->op_msk, 9);
- if (rc < 0) {
- return -1;
- }
+ ND_ICHECK_U(rc, <, 0);
tltlv = GO_NXT_TLV(tltlv, rlen);
ttlv--;
if (ttlv <= 0)
if (rlen) {
ND_PRINT("\tMess TopTLV header: min %u, total %u advertised %u ",
TLV_HDRL, rlen, GET_BE_U_2(tltlv->length));
- return -1;
+ goto invalid;
}
return 0;
-
-trunc:
- nd_print_trunc(ndo);
+invalid:
return -1;
}
tom = GET_U_1(fhdr->fm_tom);
if (!tom_valid(tom)) {
ND_PRINT("Invalid ForCES message type %u\n", tom);
- goto error;
+ goto invalid;
}
mlen = ForCES_BLN(fhdr);
tops = get_forces_tom(tom);
if (tops->v == TOM_RSVD) {
ND_PRINT("\n\tUnknown ForCES message type=0x%x", tom);
- goto error;
+ goto invalid;
}
ND_PRINT("\n\tForCES %s ", tops->s);
if (!ForCES_HLN_VALID(mlen, len)) {
ND_PRINT("Illegal ForCES pkt len - min %u, total recvd %u, advertised %u ",
ForCES_HDRL, len, ForCES_BLN(fhdr));
- goto error;
+ goto invalid;
}
- ND_TCHECK_4(pptr + 20);
flg_raw = GET_BE_U_4(pptr + 20);
if (ndo->ndo_vflag >= 1) {
ND_PRINT("\n\tForCES Version %u len %uB flags 0x%08x ",
ForCES_RS1(fhdr), ForCES_RS2(fhdr));
}
rc = forces_type_print(ndo, pptr, fhdr, mlen, tops);
- if (rc < 0) {
-error:
- hex_print_with_offset(ndo, "\n\t[", pptr, len, 0);
- ND_PRINT("\n\t]");
- return;
- }
+ ND_ICHECK_U(rc, <, 0);
if (ndo->ndo_vflag >= 4) {
ND_PRINT("\n\t Raw ForCES message\n\t [");
- hex_print_with_offset(ndo, "\n\t ", pptr, len, 0);
+ hex_print(ndo, "\n\t ", pptr, len);
ND_PRINT("\n\t ]");
}
- ND_PRINT("\n");
return;
-
-trunc:
- nd_print_trunc(ndo);
+invalid:
+ nd_print_invalid(ndo);
}
projects / tcpdump / blobdiff