X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ad7a38341c19e71e3595c17368ac18f08b71482d..refs/pull/433/head:/print-rip.c diff --git a/print-rip.c b/print-rip.c index c0b5f09a..c1b036e4 100644 --- a/print-rip.c +++ b/print-rip.c @@ -19,11 +19,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-rip.c,v 1.59 2006-03-23 14:58:44 hannes Exp $ (LBL)"; -#endif - +#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -31,7 +27,6 @@ static const char rcsid[] _U_ = #include #include -#include #include "interface.h" #include "addrtoname.h" @@ -42,9 +37,9 @@ static const char rcsid[] _U_ = static const char tstr[] = "[|rip]"; struct rip { - u_int8_t rip_cmd; /* request/response */ - u_int8_t rip_vers; /* protocol version # */ - u_int8_t unused[2]; /* unused */ + uint8_t rip_cmd; /* request/response */ + uint8_t rip_vers; /* protocol version # */ + uint8_t unused[2]; /* unused */ }; #define RIPCMD_REQUEST 1 /* want info */ @@ -89,118 +84,121 @@ static const struct tok rip_cmd_values[] = { */ struct rip_netinfo { - u_int16_t rip_family; - u_int16_t rip_tag; - u_int32_t rip_dest; - u_int32_t rip_dest_mask; - u_int32_t rip_router; - u_int32_t rip_metric; /* cost of route */ + uint16_t rip_family; + uint16_t rip_tag; + uint32_t rip_dest; + uint32_t rip_dest_mask; + uint32_t rip_router; + uint32_t rip_metric; /* cost of route */ }; static void -rip_entry_print_v1(register const struct rip_netinfo *ni) +rip_entry_print_v1(netdissect_options *ndo, + register const struct rip_netinfo *ni) { register u_short family; /* RFC 1058 */ family = EXTRACT_16BITS(&ni->rip_family); if (family != BSD_AFNUM_INET && family != 0) { - printf("\n\t AFI %s, ", tok2str(bsd_af_values, "Unknown (%u)", family)); - print_unknown_data(gndo,(u_int8_t *)&ni->rip_family,"\n\t ",RIP_ROUTELEN); + ND_PRINT((ndo, "\n\t AFI %s, ", tok2str(bsd_af_values, "Unknown (%u)", family))); + print_unknown_data(ndo, (uint8_t *)&ni->rip_family, "\n\t ", RIP_ROUTELEN); return; } if (EXTRACT_16BITS(&ni->rip_tag) || EXTRACT_32BITS(&ni->rip_dest_mask) || EXTRACT_32BITS(&ni->rip_router)) { /* MBZ fields not zero */ - print_unknown_data(gndo,(u_int8_t *)&ni->rip_family,"\n\t ",RIP_ROUTELEN); + print_unknown_data(ndo, (uint8_t *)&ni->rip_family, "\n\t ", RIP_ROUTELEN); return; } if (family == 0) { - printf("\n\t AFI 0, %s, metric: %u", - ipaddr_string(&ni->rip_dest), - EXTRACT_32BITS(&ni->rip_metric)); + ND_PRINT((ndo, "\n\t AFI 0, %s, metric: %u", + ipaddr_string(ndo, &ni->rip_dest), + EXTRACT_32BITS(&ni->rip_metric))); return; } /* BSD_AFNUM_INET */ - printf("\n\t %s, metric: %u", - ipaddr_string(&ni->rip_dest), - EXTRACT_32BITS(&ni->rip_metric)); + ND_PRINT((ndo, "\n\t %s, metric: %u", + ipaddr_string(ndo, &ni->rip_dest), + EXTRACT_32BITS(&ni->rip_metric))); } static unsigned -rip_entry_print_v2(register const struct rip_netinfo *ni, const unsigned remaining) +rip_entry_print_v2(netdissect_options *ndo, + register const struct rip_netinfo *ni, const unsigned remaining) { register u_short family; family = EXTRACT_16BITS(&ni->rip_family); if (family == 0xFFFF) { /* variable-sized authentication structures */ - u_int16_t auth_type = EXTRACT_16BITS(&ni->rip_tag); + uint16_t auth_type = EXTRACT_16BITS(&ni->rip_tag); if (auth_type == 2) { register u_char *p = (u_char *)&ni->rip_dest; u_int i = 0; - printf("\n\t Simple Text Authentication data: "); + ND_PRINT((ndo, "\n\t Simple Text Authentication data: ")); for (; i < RIP_AUTHLEN; p++, i++) - putchar (isprint(*p) ? *p : '.'); + ND_PRINT((ndo, "%c", ND_ISPRINT(*p) ? *p : '.')); } else if (auth_type == 3) { - printf("\n\t Auth header:"); - printf(" Packet Len %u,", EXTRACT_16BITS((u_int8_t *)ni + 4)); - printf(" Key-ID %u,", *((u_int8_t *)ni + 6)); - printf(" Auth Data Len %u,", *((u_int8_t *)ni + 7)); - printf(" SeqNo %u,", EXTRACT_32BITS(&ni->rip_dest_mask)); - printf(" MBZ %u,", EXTRACT_32BITS(&ni->rip_router)); - printf(" MBZ %u", EXTRACT_32BITS(&ni->rip_metric)); + ND_PRINT((ndo, "\n\t Auth header:")); + ND_PRINT((ndo, " Packet Len %u,", EXTRACT_16BITS((uint8_t *)ni + 4))); + ND_PRINT((ndo, " Key-ID %u,", *((uint8_t *)ni + 6))); + ND_PRINT((ndo, " Auth Data Len %u,", *((uint8_t *)ni + 7))); + ND_PRINT((ndo, " SeqNo %u,", EXTRACT_32BITS(&ni->rip_dest_mask))); + ND_PRINT((ndo, " MBZ %u,", EXTRACT_32BITS(&ni->rip_router))); + ND_PRINT((ndo, " MBZ %u", EXTRACT_32BITS(&ni->rip_metric))); } else if (auth_type == 1) { - printf("\n\t Auth trailer:"); - print_unknown_data(gndo,(u_int8_t *)&ni->rip_dest,"\n\t ",remaining); + ND_PRINT((ndo, "\n\t Auth trailer:")); + print_unknown_data(ndo, (uint8_t *)&ni->rip_dest, "\n\t ", remaining); return remaining; /* AT spans till the packet end */ - } else { - printf("\n\t Unknown (%u) Authentication data:", - EXTRACT_16BITS(&ni->rip_tag)); - print_unknown_data(gndo,(u_int8_t *)&ni->rip_dest,"\n\t ",remaining); + } else { + ND_PRINT((ndo, "\n\t Unknown (%u) Authentication data:", + EXTRACT_16BITS(&ni->rip_tag))); + print_unknown_data(ndo, (uint8_t *)&ni->rip_dest, "\n\t ", remaining); } } else if (family != BSD_AFNUM_INET && family != 0) { - printf("\n\t AFI %s", tok2str(bsd_af_values, "Unknown (%u)", family)); - print_unknown_data(gndo,(u_int8_t *)&ni->rip_tag,"\n\t ",RIP_ROUTELEN-2); + ND_PRINT((ndo, "\n\t AFI %s", tok2str(bsd_af_values, "Unknown (%u)", family))); + print_unknown_data(ndo, (uint8_t *)&ni->rip_tag, "\n\t ", RIP_ROUTELEN-2); } else { /* BSD_AFNUM_INET or AFI 0 */ - printf("\n\t AFI %s, %15s/%-2d, tag 0x%04x, metric: %u, next-hop: ", + ND_PRINT((ndo, "\n\t AFI %s, %15s/%-2d, tag 0x%04x, metric: %u, next-hop: ", tok2str(bsd_af_values, "%u", family), - ipaddr_string(&ni->rip_dest), + ipaddr_string(ndo, &ni->rip_dest), mask2plen(EXTRACT_32BITS(&ni->rip_dest_mask)), EXTRACT_16BITS(&ni->rip_tag), - EXTRACT_32BITS(&ni->rip_metric)); + EXTRACT_32BITS(&ni->rip_metric))); if (EXTRACT_32BITS(&ni->rip_router)) - printf("%s", ipaddr_string(&ni->rip_router)); - else - printf("self"); + ND_PRINT((ndo, "%s", ipaddr_string(ndo, &ni->rip_router))); + else + ND_PRINT((ndo, "self")); } return sizeof (*ni); } void -rip_print(const u_char *dat, u_int length) +rip_print(netdissect_options *ndo, + const u_char *dat, u_int length) { register const struct rip *rp; register const struct rip_netinfo *ni; register u_int i, j; - if (snapend < dat) { - printf(" %s", tstr); + if (ndo->ndo_snapend < dat) { + ND_PRINT((ndo, " %s", tstr)); return; } - i = snapend - dat; + i = ndo->ndo_snapend - dat; if (i > length) i = length; if (i < sizeof(*rp)) { - printf(" %s", tstr); + ND_PRINT((ndo, " %s", tstr)); return; } i -= sizeof(*rp); rp = (struct rip *)dat; - printf("%sRIPv%u", - (vflag >= 1) ? "\n\t" : "", - rp->rip_vers); + ND_PRINT((ndo, "%sRIPv%u", + (ndo->ndo_vflag >= 1) ? "\n\t" : "", + rp->rip_vers)); switch (rp->rip_vers) { case 0: @@ -215,38 +213,38 @@ rip_print(const u_char *dat, u_int length) * * so perhaps we should just dump the packet, in hex. */ - print_unknown_data(gndo,(u_int8_t *)&rp->rip_cmd,"\n\t",length); + print_unknown_data(ndo, (uint8_t *)&rp->rip_cmd, "\n\t", length); break; default: /* dump version and lets see if we know the commands name*/ - printf(", %s, length: %u", + ND_PRINT((ndo, ", %s, length: %u", tok2str(rip_cmd_values, "unknown command (%u)", rp->rip_cmd), - length); + length)); - if (vflag < 1) + if (ndo->ndo_vflag < 1) return; switch (rp->rip_cmd) { case RIPCMD_REQUEST: case RIPCMD_RESPONSE: j = length / sizeof(*ni); - printf(", routes: %u%s", j, rp->rip_vers == 2 ? " or less" : ""); + ND_PRINT((ndo, ", routes: %u%s", j, rp->rip_vers == 2 ? " or less" : "")); ni = (struct rip_netinfo *)(rp + 1); for (; i >= sizeof(*ni); ++ni) { if (rp->rip_vers == 1) { - rip_entry_print_v1(ni); + rip_entry_print_v1(ndo, ni); i -= sizeof(*ni); } else if (rp->rip_vers == 2) - i -= rip_entry_print_v2(ni, i); + i -= rip_entry_print_v2(ndo, ni, i); else break; } if (i) - printf("%s", tstr); + ND_PRINT((ndo, "%s", tstr)); break; case RIPCMD_TRACEOFF: @@ -257,15 +255,15 @@ rip_print(const u_char *dat, u_int length) case RIPCMD_TRACEON: /* fall through */ default: - if (vflag <= 1) { - if(!print_unknown_data(gndo,(u_int8_t *)rp,"\n\t",length)) + if (ndo->ndo_vflag <= 1) { + if(!print_unknown_data(ndo, (uint8_t *)rp, "\n\t", length)) return; } break; } /* do we want to see an additionally hexdump ? */ - if (vflag> 1) { - if(!print_unknown_data(gndo,(u_int8_t *)rp,"\n\t",length)) + if (ndo->ndo_vflag> 1) { + if(!print_unknown_data(ndo, (uint8_t *)rp, "\n\t", length)) return; } }