X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ed85e20e4d6a27d5405f37366dd34b64c10a9211..a890c4489fa1bcee9f455ee28d772bb1ccf590bf:/print-rsvp.c diff --git a/print-rsvp.c b/print-rsvp.c index 3f96cb25..263ef3d4 100644 --- a/print-rsvp.c +++ b/print-rsvp.c @@ -486,8 +486,8 @@ static const struct tok rsvp_obj_generalized_uni_values[] = { */ static int rsvp_intserv_print(netdissect_options *ndo, - const u_char *tptr, u_short obj_tlen) { - + const u_char *tptr, u_short obj_tlen) +{ int parameter_id,parameter_length; union { float f; @@ -637,8 +637,8 @@ _U_ _U_ #endif , const u_char *tptr, - const char *ident, u_int tlen) { - + const char *ident, u_int tlen) +{ const struct rsvp_object_header *rsvp_obj_header; const u_char *obj_tptr; union { @@ -658,8 +658,7 @@ _U_ while(tlen>=sizeof(struct rsvp_object_header)) { /* did we capture enough for fully decoding the object header ? */ - if (!ND_TTEST2(*tptr, sizeof(struct rsvp_object_header))) - goto trunc; + ND_TCHECK2(*tptr, sizeof(struct rsvp_object_header)); rsvp_obj_header = (const struct rsvp_object_header *)tptr; rsvp_obj_len=EXTRACT_16BITS(rsvp_obj_header->length); @@ -1796,8 +1795,8 @@ trunc: void rsvp_print(netdissect_options *ndo, - register const u_char *pptr, register u_int len) { - + register const u_char *pptr, register u_int len) +{ struct rsvp_common_header *rsvp_com_header; const u_char *tptr,*subtptr; u_short plen, tlen, subtlen;