1999-10-08 07:47:09 +08:00
|
|
|
/*
|
|
|
|
* Copyright (c) 1989, 1990, 1991, 1993, 1994, 1996
|
|
|
|
* The Regents of the University of California. All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that: (1) source code distributions
|
|
|
|
* retain the above copyright notice and this paragraph in its entirety, (2)
|
|
|
|
* distributions including binary code include the above copyright notice and
|
|
|
|
* this paragraph in its entirety in the documentation or other materials
|
|
|
|
* provided with the distribution, and (3) all advertising materials mentioning
|
|
|
|
* features or use of this software display the following acknowledgement:
|
|
|
|
* ``This product includes software developed by the University of California,
|
|
|
|
* Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
|
|
|
|
* the University nor the names of its contributors may be used to endorse
|
|
|
|
* or promote products derived from this software without specific prior
|
|
|
|
* written permission.
|
|
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
|
|
|
|
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
|
|
|
|
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
*/
|
|
|
|
|
1999-11-21 17:36:43 +08:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
1999-10-08 07:47:09 +08:00
|
|
|
#endif
|
|
|
|
|
2002-08-01 16:52:55 +08:00
|
|
|
#include <tcpdump-stdinc.h>
|
1999-10-08 07:47:09 +08:00
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
#include "interface.h"
|
|
|
|
#include "addrtoname.h"
|
|
|
|
#include "extract.h" /* must come after interface.h */
|
|
|
|
|
2006-02-21 18:27:40 +08:00
|
|
|
#include "af.h"
|
|
|
|
|
2013-12-26 22:08:06 +08:00
|
|
|
static const char tstr[] = "[|rip]";
|
|
|
|
|
1999-10-08 07:47:09 +08:00
|
|
|
struct rip {
|
2014-04-23 15:20:40 +08:00
|
|
|
uint8_t rip_cmd; /* request/response */
|
|
|
|
uint8_t rip_vers; /* protocol version # */
|
|
|
|
uint8_t unused[2]; /* unused */
|
2002-12-11 15:13:49 +08:00
|
|
|
};
|
2002-12-22 10:01:49 +08:00
|
|
|
|
1999-10-08 07:47:09 +08:00
|
|
|
#define RIPCMD_REQUEST 1 /* want info */
|
|
|
|
#define RIPCMD_RESPONSE 2 /* responding to request */
|
|
|
|
#define RIPCMD_TRACEON 3 /* turn tracing on */
|
|
|
|
#define RIPCMD_TRACEOFF 4 /* turn it off */
|
|
|
|
#define RIPCMD_POLL 5 /* want info from everybody */
|
|
|
|
#define RIPCMD_POLLENTRY 6 /* poll for entry */
|
|
|
|
|
2002-12-22 10:01:49 +08:00
|
|
|
static const struct tok rip_cmd_values[] = {
|
|
|
|
{ RIPCMD_REQUEST, "Request" },
|
|
|
|
{ RIPCMD_RESPONSE, "Response" },
|
|
|
|
{ RIPCMD_TRACEON, "Trace on" },
|
|
|
|
{ RIPCMD_TRACEOFF, "Trace off" },
|
|
|
|
{ RIPCMD_POLL, "Poll" },
|
|
|
|
{ RIPCMD_POLLENTRY, "Poll Entry" },
|
|
|
|
{ 0, NULL}
|
|
|
|
};
|
|
|
|
|
|
|
|
#define RIP_AUTHLEN 16
|
|
|
|
#define RIP_ROUTELEN 20
|
|
|
|
|
|
|
|
/*
|
|
|
|
* rfc 1723
|
2014-01-02 10:27:54 +08:00
|
|
|
*
|
2002-12-22 10:01:49 +08:00
|
|
|
* 0 1 2 3 3
|
|
|
|
* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
|
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
* | Command (1) | Version (1) | unused |
|
|
|
|
* +---------------+---------------+-------------------------------+
|
|
|
|
* | Address Family Identifier (2) | Route Tag (2) |
|
|
|
|
* +-------------------------------+-------------------------------+
|
|
|
|
* | IP Address (4) |
|
|
|
|
* +---------------------------------------------------------------+
|
|
|
|
* | Subnet Mask (4) |
|
|
|
|
* +---------------------------------------------------------------+
|
|
|
|
* | Next Hop (4) |
|
|
|
|
* +---------------------------------------------------------------+
|
|
|
|
* | Metric (4) |
|
|
|
|
* +---------------------------------------------------------------+
|
|
|
|
*
|
|
|
|
*/
|
2000-06-19 01:41:35 +08:00
|
|
|
|
1999-10-08 07:47:09 +08:00
|
|
|
struct rip_netinfo {
|
2014-04-23 15:20:40 +08:00
|
|
|
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 */
|
2002-12-11 15:13:49 +08:00
|
|
|
};
|
1999-10-08 07:47:09 +08:00
|
|
|
|
2000-06-19 01:41:35 +08:00
|
|
|
static void
|
2014-03-19 17:57:56 +08:00
|
|
|
rip_entry_print_v1(netdissect_options *ndo,
|
|
|
|
register const struct rip_netinfo *ni)
|
2000-06-19 01:41:35 +08:00
|
|
|
{
|
|
|
|
register u_short family;
|
|
|
|
|
|
|
|
/* RFC 1058 */
|
|
|
|
family = EXTRACT_16BITS(&ni->rip_family);
|
2012-06-12 01:01:34 +08:00
|
|
|
if (family != BSD_AFNUM_INET && family != 0) {
|
2014-03-19 17:57:56 +08:00
|
|
|
ND_PRINT((ndo, "\n\t AFI %s, ", tok2str(bsd_af_values, "Unknown (%u)", family)));
|
2014-04-23 15:20:40 +08:00
|
|
|
print_unknown_data(ndo, (uint8_t *)&ni->rip_family, "\n\t ", RIP_ROUTELEN);
|
2000-06-19 01:41:35 +08:00
|
|
|
return;
|
|
|
|
}
|
2002-12-11 15:13:49 +08:00
|
|
|
if (EXTRACT_16BITS(&ni->rip_tag) ||
|
|
|
|
EXTRACT_32BITS(&ni->rip_dest_mask) ||
|
|
|
|
EXTRACT_32BITS(&ni->rip_router)) {
|
2000-06-19 01:41:35 +08:00
|
|
|
/* MBZ fields not zero */
|
2014-04-23 15:20:40 +08:00
|
|
|
print_unknown_data(ndo, (uint8_t *)&ni->rip_family, "\n\t ", RIP_ROUTELEN);
|
2000-06-19 01:41:35 +08:00
|
|
|
return;
|
2012-06-12 01:01:34 +08:00
|
|
|
}
|
|
|
|
if (family == 0) {
|
2014-03-19 17:57:56 +08:00
|
|
|
ND_PRINT((ndo, "\n\t AFI 0, %s, metric: %u",
|
2014-04-04 15:43:46 +08:00
|
|
|
ipaddr_string(ndo, &ni->rip_dest),
|
2014-03-19 17:57:56 +08:00
|
|
|
EXTRACT_32BITS(&ni->rip_metric)));
|
2012-06-12 01:01:34 +08:00
|
|
|
return;
|
2006-03-23 22:58:44 +08:00
|
|
|
} /* BSD_AFNUM_INET */
|
2014-03-19 17:57:56 +08:00
|
|
|
ND_PRINT((ndo, "\n\t %s, metric: %u",
|
2014-04-04 15:43:46 +08:00
|
|
|
ipaddr_string(ndo, &ni->rip_dest),
|
2014-03-19 17:57:56 +08:00
|
|
|
EXTRACT_32BITS(&ni->rip_metric)));
|
2000-06-19 01:41:35 +08:00
|
|
|
}
|
1999-10-08 07:47:09 +08:00
|
|
|
|
2012-06-12 01:06:00 +08:00
|
|
|
static unsigned
|
2014-03-19 17:57:56 +08:00
|
|
|
rip_entry_print_v2(netdissect_options *ndo,
|
|
|
|
register const struct rip_netinfo *ni, const unsigned remaining)
|
2000-06-19 01:41:35 +08:00
|
|
|
{
|
|
|
|
register u_short family;
|
|
|
|
|
|
|
|
family = EXTRACT_16BITS(&ni->rip_family);
|
2012-06-12 01:06:00 +08:00
|
|
|
if (family == 0xFFFF) { /* variable-sized authentication structures */
|
2014-04-23 15:20:40 +08:00
|
|
|
uint16_t auth_type = EXTRACT_16BITS(&ni->rip_tag);
|
2012-06-12 01:06:00 +08:00
|
|
|
if (auth_type == 2) {
|
|
|
|
register u_char *p = (u_char *)&ni->rip_dest;
|
|
|
|
u_int i = 0;
|
2014-03-19 17:57:56 +08:00
|
|
|
ND_PRINT((ndo, "\n\t Simple Text Authentication data: "));
|
2012-06-12 01:06:00 +08:00
|
|
|
for (; i < RIP_AUTHLEN; p++, i++)
|
2014-04-03 20:02:07 +08:00
|
|
|
ND_PRINT((ndo, "%c", ND_ISPRINT(*p) ? *p : '.'));
|
2012-06-12 01:06:00 +08:00
|
|
|
} else if (auth_type == 3) {
|
2014-03-19 17:57:56 +08:00
|
|
|
ND_PRINT((ndo, "\n\t Auth header:"));
|
2014-04-23 15:20:40 +08:00
|
|
|
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)));
|
2014-03-19 17:57:56 +08:00
|
|
|
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)));
|
2012-06-12 01:06:00 +08:00
|
|
|
} else if (auth_type == 1) {
|
2014-03-19 17:57:56 +08:00
|
|
|
ND_PRINT((ndo, "\n\t Auth trailer:"));
|
2014-04-23 15:20:40 +08:00
|
|
|
print_unknown_data(ndo, (uint8_t *)&ni->rip_dest, "\n\t ", remaining);
|
2012-06-12 01:06:00 +08:00
|
|
|
return remaining; /* AT spans till the packet end */
|
2014-03-19 17:57:56 +08:00
|
|
|
} else {
|
|
|
|
ND_PRINT((ndo, "\n\t Unknown (%u) Authentication data:",
|
|
|
|
EXTRACT_16BITS(&ni->rip_tag)));
|
2014-04-23 15:20:40 +08:00
|
|
|
print_unknown_data(ndo, (uint8_t *)&ni->rip_dest, "\n\t ", remaining);
|
2000-06-19 01:41:35 +08:00
|
|
|
}
|
2012-06-12 01:01:34 +08:00
|
|
|
} else if (family != BSD_AFNUM_INET && family != 0) {
|
2014-03-19 17:57:56 +08:00
|
|
|
ND_PRINT((ndo, "\n\t AFI %s", tok2str(bsd_af_values, "Unknown (%u)", family)));
|
2014-04-23 15:20:40 +08:00
|
|
|
print_unknown_data(ndo, (uint8_t *)&ni->rip_tag, "\n\t ", RIP_ROUTELEN-2);
|
2012-06-12 01:01:34 +08:00
|
|
|
} else { /* BSD_AFNUM_INET or AFI 0 */
|
2014-03-19 17:57:56 +08:00
|
|
|
ND_PRINT((ndo, "\n\t AFI %s, %15s/%-2d, tag 0x%04x, metric: %u, next-hop: ",
|
2012-06-12 01:01:34 +08:00
|
|
|
tok2str(bsd_af_values, "%u", family),
|
2014-04-04 15:43:46 +08:00
|
|
|
ipaddr_string(ndo, &ni->rip_dest),
|
2002-12-22 10:01:49 +08:00
|
|
|
mask2plen(EXTRACT_32BITS(&ni->rip_dest_mask)),
|
|
|
|
EXTRACT_16BITS(&ni->rip_tag),
|
2014-03-19 17:57:56 +08:00
|
|
|
EXTRACT_32BITS(&ni->rip_metric)));
|
2002-12-11 15:13:49 +08:00
|
|
|
if (EXTRACT_32BITS(&ni->rip_router))
|
2014-04-04 15:43:46 +08:00
|
|
|
ND_PRINT((ndo, "%s", ipaddr_string(ndo, &ni->rip_router)));
|
2014-03-19 17:57:56 +08:00
|
|
|
else
|
|
|
|
ND_PRINT((ndo, "self"));
|
1999-10-08 07:47:09 +08:00
|
|
|
}
|
2012-06-12 01:06:00 +08:00
|
|
|
return sizeof (*ni);
|
1999-10-08 07:47:09 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2014-03-19 17:57:56 +08:00
|
|
|
rip_print(netdissect_options *ndo,
|
|
|
|
const u_char *dat, u_int length)
|
1999-10-08 07:47:09 +08:00
|
|
|
{
|
|
|
|
register const struct rip *rp;
|
|
|
|
register const struct rip_netinfo *ni;
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
register u_int i, j;
|
1999-10-08 07:47:09 +08:00
|
|
|
|
2014-03-19 17:57:56 +08:00
|
|
|
if (ndo->ndo_snapend < dat) {
|
|
|
|
ND_PRINT((ndo, " %s", tstr));
|
1999-10-08 07:47:09 +08:00
|
|
|
return;
|
1999-11-22 12:24:28 +08:00
|
|
|
}
|
2014-03-19 17:57:56 +08:00
|
|
|
i = ndo->ndo_snapend - dat;
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
if (i > length)
|
|
|
|
i = length;
|
|
|
|
if (i < sizeof(*rp)) {
|
2014-03-19 17:57:56 +08:00
|
|
|
ND_PRINT((ndo, " %s", tstr));
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
i -= sizeof(*rp);
|
1999-10-08 07:47:09 +08:00
|
|
|
|
|
|
|
rp = (struct rip *)dat;
|
2002-12-22 10:01:49 +08:00
|
|
|
|
2014-03-19 17:57:56 +08:00
|
|
|
ND_PRINT((ndo, "%sRIPv%u",
|
|
|
|
(ndo->ndo_vflag >= 1) ? "\n\t" : "",
|
|
|
|
rp->rip_vers));
|
2002-12-22 10:01:49 +08:00
|
|
|
|
1999-10-08 07:47:09 +08:00
|
|
|
switch (rp->rip_vers) {
|
2000-06-19 01:41:35 +08:00
|
|
|
case 0:
|
2000-09-24 15:59:35 +08:00
|
|
|
/*
|
|
|
|
* RFC 1058.
|
|
|
|
*
|
|
|
|
* XXX - RFC 1058 says
|
|
|
|
*
|
|
|
|
* 0 Datagrams whose version number is zero are to be ignored.
|
|
|
|
* These are from a previous version of the protocol, whose
|
|
|
|
* packet format was machine-specific.
|
|
|
|
*
|
2002-12-22 10:01:49 +08:00
|
|
|
* so perhaps we should just dump the packet, in hex.
|
2001-01-28 16:14:55 +08:00
|
|
|
*/
|
2014-04-23 15:20:40 +08:00
|
|
|
print_unknown_data(ndo, (uint8_t *)&rp->rip_cmd, "\n\t", length);
|
1999-10-08 07:47:09 +08:00
|
|
|
break;
|
|
|
|
default:
|
2002-12-22 10:01:49 +08:00
|
|
|
/* dump version and lets see if we know the commands name*/
|
2014-03-19 17:57:56 +08:00
|
|
|
ND_PRINT((ndo, ", %s, length: %u",
|
2002-12-22 10:01:49 +08:00
|
|
|
tok2str(rip_cmd_values,
|
|
|
|
"unknown command (%u)",
|
|
|
|
rp->rip_cmd),
|
2014-03-19 17:57:56 +08:00
|
|
|
length));
|
2002-12-22 10:01:49 +08:00
|
|
|
|
2014-03-19 17:57:56 +08:00
|
|
|
if (ndo->ndo_vflag < 1)
|
2002-12-22 10:01:49 +08:00
|
|
|
return;
|
|
|
|
|
2000-06-19 01:41:35 +08:00
|
|
|
switch (rp->rip_cmd) {
|
2012-06-12 01:01:34 +08:00
|
|
|
case RIPCMD_REQUEST:
|
2000-06-19 01:41:35 +08:00
|
|
|
case RIPCMD_RESPONSE:
|
|
|
|
j = length / sizeof(*ni);
|
2014-03-19 17:57:56 +08:00
|
|
|
ND_PRINT((ndo, ", routes: %u%s", j, rp->rip_vers == 2 ? " or less" : ""));
|
2000-06-19 01:41:35 +08:00
|
|
|
ni = (struct rip_netinfo *)(rp + 1);
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
for (; i >= sizeof(*ni); ++ni) {
|
2000-06-19 01:41:35 +08:00
|
|
|
if (rp->rip_vers == 1)
|
2012-06-12 01:06:00 +08:00
|
|
|
{
|
2014-03-19 17:57:56 +08:00
|
|
|
rip_entry_print_v1(ndo, ni);
|
2012-06-12 01:06:00 +08:00
|
|
|
i -= sizeof(*ni);
|
|
|
|
}
|
2002-12-22 10:01:49 +08:00
|
|
|
else if (rp->rip_vers == 2)
|
2014-03-19 17:57:56 +08:00
|
|
|
i -= rip_entry_print_v2(ndo, ni, i);
|
2002-12-22 10:01:49 +08:00
|
|
|
else
|
|
|
|
break;
|
2000-06-19 01:41:35 +08:00
|
|
|
}
|
2012-06-12 01:06:00 +08:00
|
|
|
if (i)
|
2014-03-19 17:57:56 +08:00
|
|
|
ND_PRINT((ndo, "%s", tstr));
|
2000-06-19 01:41:35 +08:00
|
|
|
break;
|
2002-12-22 10:01:49 +08:00
|
|
|
|
2000-06-19 01:41:35 +08:00
|
|
|
case RIPCMD_TRACEOFF:
|
|
|
|
case RIPCMD_POLL:
|
|
|
|
case RIPCMD_POLLENTRY:
|
|
|
|
break;
|
2002-12-22 10:01:49 +08:00
|
|
|
|
|
|
|
case RIPCMD_TRACEON:
|
|
|
|
/* fall through */
|
|
|
|
default:
|
2014-03-19 17:57:56 +08:00
|
|
|
if (ndo->ndo_vflag <= 1) {
|
2014-04-23 15:20:40 +08:00
|
|
|
if(!print_unknown_data(ndo, (uint8_t *)rp, "\n\t", length))
|
2002-12-22 10:01:49 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* do we want to see an additionally hexdump ? */
|
2014-03-19 17:57:56 +08:00
|
|
|
if (ndo->ndo_vflag> 1) {
|
2014-04-23 15:20:40 +08:00
|
|
|
if(!print_unknown_data(ndo, (uint8_t *)rp, "\n\t", length))
|
2002-12-22 10:01:49 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
1999-10-08 07:47:09 +08:00
|
|
|
}
|
2002-12-22 10:01:49 +08:00
|
|
|
|
|
|
|
|