Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:42.1
tcpdump
0001-Clean-up-error-message-printing.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0001-Clean-up-error-message-printing.patch of Package tcpdump
From 3e8a443c3671baa37ae7870f08fb9b4bf386fd24 Mon Sep 17 00:00:00 2001 From: Guy Harris <guy@alum.mit.edu> Date: Tue, 11 Nov 2014 18:37:35 -0800 Subject: [PATCH] Clean up error message printing. Have "struct aodv_rerr" just be the header, not including the actual destinations. Simplify the logic somewhat, and make it similar in the print routines for the three types of error messages. --- print-aodv.c | 88 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 46 insertions(+), 42 deletions(-) Index: tcpdump-4.5.1/print-aodv.c =================================================================== --- tcpdump-4.5.1.orig/print-aodv.c 2014-12-12 13:42:54.088588139 +0100 +++ tcpdump-4.5.1/print-aodv.c 2014-12-12 14:01:23.943454376 +0100 @@ -143,34 +143,31 @@ aodv_rrep(const struct aodv_rrep *ap, co } static void -aodv_rerr(const struct aodv_rerr *ap, const u_char *dat, u_int length) +aodv_rerr(netdissect_options *ndo, const struct aodv_rerr *ap, const u_char *dat, u_int length) { - u_int i; - const struct rerr_unreach *dp = NULL; - int n, trunc; + u_int i, dc; + const struct rerr_unreach *dp; if (snapend < dat) { printf(" [|aodv]"); return; } i = min(length, (u_int)(snapend - dat)); - if (i < offsetof(struct aodv_rerr, r)) { + if (i < sizeof(*ap)) { printf(" [|rerr]"); return; } - i -= offsetof(struct aodv_rerr, r); - dp = &ap->r.dest[0]; - n = ap->rerr_dc * sizeof(ap->r.dest[0]); + i -= sizeof(*ap); printf(" rerr %s [items %u] [%u]:", ap->rerr_flags & RERR_NODELETE ? "[D]" : "", ap->rerr_dc, length); - trunc = n - (i/sizeof(ap->r.dest[0])); - for (; i >= sizeof(ap->r.dest[0]); - ++dp, i -= sizeof(ap->r.dest[0])) { + dp = (struct rerr_unreach *)(void *)(ap + 1); + for (dc = ap->rerr_dc; dc != 0 && i >= sizeof(*dp); + ++dp, --dc, i -= sizeof(*dp)) { printf(" {%s}(%ld)", ipaddr_string(&dp->u_da), (unsigned long)EXTRACT_32BITS(&dp->u_ds)); } - if (trunc) + if ((i % sizeof(*dp)) != 0) printf("[|rerr]"); } @@ -253,28 +250,35 @@ aodv_v6_rrep(const struct aodv_rrep6 *ap static void #ifdef INET6 -aodv_v6_rerr(const struct aodv_rerr *ap, u_int length) +aodv_v6_rerr(netdissect_options *ndo, const struct aodv_rerr *ap, const u_char *dat, u_int length) #else -aodv_v6_rerr(const struct aodv_rerr *ap _U_, u_int length) +aodv_v6_rerr(netdissect_options *ndo, const struct aodv_rerr *ap _U_, const u_char *dat, u_int length) #endif { #ifdef INET6 - const struct rerr_unreach6 *dp6 = NULL; - int i, j, n, trunc; + u_int i, dc; + const struct rerr_unreach6 *dp6; - i = length - offsetof(struct aodv_rerr, r); - j = sizeof(ap->r.dest6[0]); - dp6 = &ap->r.dest6[0]; - n = ap->rerr_dc * j; + if (ndo->ndo_snapend < dat) { + ND_PRINT((ndo, " [|aodv]")); + return; + } + i = min(length, (u_int)(ndo->ndo_snapend - dat)); + if (i < sizeof(*ap)) { + ND_PRINT((ndo, " [|rerr]")); + return; + } + i -= sizeof(*ap); printf(" rerr %s [items %u] [%u]:", ap->rerr_flags & RERR_NODELETE ? "[D]" : "", ap->rerr_dc, length); - trunc = n - (i/j); - for (; i -= j >= 0; ++dp6) { + dp6 = (struct rerr_unreach6 *)(void *)(ap + 1); + for (dc = ap->rerr_dc; dc != 0 && i >= sizeof(*dp6); + ++dp6, --dc, i -= sizeof(*dp6)) { printf(" {%s}(%ld)", ip6addr_string(&dp6->u_da), (unsigned long)EXTRACT_32BITS(&dp6->u_ds)); } - if (trunc) + if ((i % sizeof(*dp6)) != 0) printf("[|rerr]"); #else printf(" rerr %u", length); @@ -361,28 +365,35 @@ aodv_v6_draft_01_rrep(const struct aodv_ static void #ifdef INET6 -aodv_v6_draft_01_rerr(const struct aodv_rerr *ap, u_int length) +aodv_v6_draft_01_rerr(netdissect_options *ndo, const struct aodv_rerr *ap, const u_char *dat, u_int length) #else -aodv_v6_draft_01_rerr(const struct aodv_rerr *ap _U_, u_int length) +aodv_v6_draft_01_rerr(netdissect_options *ndo, const struct aodv_rerr *ap _U_, const u_char *dat, u_int length) #endif { #ifdef INET6 - const struct rerr_unreach6_draft_01 *dp6 = NULL; - int i, j, n, trunc; + u_int i, dc; + const struct rerr_unreach6_draft_01 *dp6; - i = length - offsetof(struct aodv_rerr, r); - j = sizeof(ap->r.dest6_draft_01[0]); - dp6 = &ap->r.dest6_draft_01[0]; - n = ap->rerr_dc * j; + if (ndo->ndo_snapend < dat) { + ND_PRINT((ndo, " [|aodv]")); + return; + } + i = min(length, (u_int)(ndo->ndo_snapend - dat)); + if (i < sizeof(*ap)) { + ND_PRINT((ndo, " [|rerr]")); + return; + } + i -= sizeof(*ap); printf(" rerr %s [items %u] [%u]:", ap->rerr_flags & RERR_NODELETE ? "[D]" : "", ap->rerr_dc, length); - trunc = n - (i/j); - for (; i -= j >= 0; ++dp6) { + dp6 = (struct rerr_unreach6_draft_01 *)(void *)(ap + 1); + for (dc = ap->rerr_dc; dc != 0 && i >= sizeof(*dp6); + ++dp6, --dc, i -= sizeof(*dp6)) { printf(" {%s}(%ld)", ip6addr_string(&dp6->u_da), (unsigned long)EXTRACT_32BITS(&dp6->u_ds)); } - if (trunc) + if ((i % sizeof(*dp6)) != 0) printf("[|rerr]"); #else printf(" rerr %u", length); @@ -421,9 +432,9 @@ aodv_print(netdissect_options *ndo, case AODV_RERR: if (is_ip6) - aodv_v6_rerr((const struct aodv_rerr *)dat, length); + aodv_v6_rerr(ndo, (const struct aodv_rerr *)dat, dat, length); else - aodv_rerr((const struct aodv_rerr *)dat, dat, length); + aodv_rerr(ndo, (const struct aodv_rerr *)dat, dat, length); break; case AODV_RREP_ACK: @@ -439,7 +450,7 @@ aodv_print(netdissect_options *ndo, break; case AODV_V6_DRAFT_01_RERR: - aodv_v6_draft_01_rerr((const struct aodv_rerr *)dat, length); + aodv_v6_draft_01_rerr(ndo, (const struct aodv_rerr *)dat, dat, length); break; case AODV_V6_DRAFT_01_RREP_ACK:
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor