Upgrade tcpdump to tcpdump-4.99.1
Test: make
Change-Id: I052ed8f5279c806e4d2ff925f581b71db3ac03c0
diff --git a/print-egp.c b/print-egp.c
index 8fba9ce..d20e5be 100644
--- a/print-egp.c
+++ b/print-egp.c
@@ -20,26 +20,28 @@
/* \summary: Exterior Gateway Protocol (EGP) printer */
+/* specification: RFC 827 */
+
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
#include "netdissect.h"
#include "addrtoname.h"
#include "extract.h"
struct egp_packet {
- uint8_t egp_version;
+ nd_uint8_t egp_version;
#define EGP_VERSION 2
- uint8_t egp_type;
+ nd_uint8_t egp_type;
#define EGPT_ACQUIRE 3
#define EGPT_REACH 5
#define EGPT_POLL 2
#define EGPT_UPDATE 1
#define EGPT_ERROR 8
- uint8_t egp_code;
+ nd_uint8_t egp_code;
#define EGPC_REQUEST 0
#define EGPC_CONFIRM 1
#define EGPC_REFUSE 2
@@ -47,7 +49,7 @@
#define EGPC_CEASEACK 4
#define EGPC_HELLO 0
#define EGPC_HEARDU 1
- uint8_t egp_status;
+ nd_uint8_t egp_status;
#define EGPS_UNSPEC 0
#define EGPS_ACTIVE 1
#define EGPS_PASSIVE 2
@@ -60,13 +62,13 @@
#define EGPS_UP 1
#define EGPS_DOWN 2
#define EGPS_UNSOL 0x80
- uint16_t egp_checksum;
- uint16_t egp_as;
- uint16_t egp_sequence;
+ nd_uint16_t egp_checksum;
+ nd_uint16_t egp_as;
+ nd_uint16_t egp_sequence;
union {
- uint16_t egpu_hello;
- uint8_t egpu_gws[2];
- uint16_t egpu_reason;
+ nd_uint16_t egpu_hello;
+ nd_uint8_t egpu_gws[2];
+ nd_uint16_t egpu_reason;
#define EGPR_UNSPEC 0
#define EGPR_BADHEAD 1
#define EGPR_BADDATA 2
@@ -80,8 +82,8 @@
#define egp_extgw egp_handg.egpu_gws[1]
#define egp_reason egp_handg.egpu_reason
union {
- uint16_t egpu_poll;
- uint32_t egpu_sourcenet;
+ nd_uint16_t egpu_poll;
+ nd_ipv4 egpu_sourcenet;
} egp_pands;
#define egp_poll egp_pands.egpu_poll
#define egp_sourcenet egp_pands.egpu_sourcenet
@@ -128,18 +130,18 @@
};
static void
-egpnrprint(netdissect_options *ndo,
- register const struct egp_packet *egp, u_int length)
+egpnr_print(netdissect_options *ndo,
+ const struct egp_packet *egp, u_int length)
{
- register const uint8_t *cp;
+ const uint8_t *cp;
uint32_t addr;
- register uint32_t net;
- register u_int netlen;
- int gateways, distances, networks;
- int t_gateways;
+ uint32_t net;
+ u_int netlen;
+ u_int gateways, distances, networks;
+ u_int intgw, extgw, t_gateways;
const char *comma;
- addr = egp->egp_sourcenet;
+ addr = GET_IPV4_TO_NETWORK_ORDER(egp->egp_sourcenet);
if (IN_CLASSA(addr)) {
net = addr & IN_CLASSA_NET;
netlen = 1;
@@ -156,139 +158,152 @@
cp = (const uint8_t *)(egp + 1);
length -= sizeof(*egp);
- t_gateways = egp->egp_intgw + egp->egp_extgw;
+ intgw = GET_U_1(egp->egp_intgw);
+ extgw = GET_U_1(egp->egp_extgw);
+ t_gateways = intgw + extgw;
for (gateways = 0; gateways < t_gateways; ++gateways) {
/* Pickup host part of gateway address */
addr = 0;
if (length < 4 - netlen)
goto trunc;
- ND_TCHECK2(cp[0], 4 - netlen);
+ ND_TCHECK_LEN(cp, 4 - netlen);
switch (netlen) {
case 1:
- addr = *cp++;
+ addr = GET_U_1(cp);
+ cp++;
/* fall through */
case 2:
- addr = (addr << 8) | *cp++;
+ addr = (addr << 8) | GET_U_1(cp);
+ cp++;
/* fall through */
case 3:
- addr = (addr << 8) | *cp++;
+ addr = (addr << 8) | GET_U_1(cp);
+ cp++;
+ break;
}
addr |= net;
length -= 4 - netlen;
if (length < 1)
goto trunc;
- ND_TCHECK2(cp[0], 1);
- distances = *cp++;
+ distances = GET_U_1(cp);
+ cp++;
length--;
- ND_PRINT((ndo, " %s %s ",
- gateways < (int)egp->egp_intgw ? "int" : "ext",
- ipaddr_string(ndo, &addr)));
+ ND_PRINT(" %s %s ",
+ gateways < intgw ? "int" : "ext",
+ ipaddr_string(ndo, (const u_char *)&addr));
comma = "";
- ND_PRINT((ndo, "("));
- while (--distances >= 0) {
+ ND_PRINT("(");
+ while (distances != 0) {
if (length < 2)
goto trunc;
- ND_TCHECK2(cp[0], 2);
- ND_PRINT((ndo, "%sd%d:", comma, (int)*cp++));
+ ND_PRINT("%sd%u:", comma, GET_U_1(cp));
+ cp++;
comma = ", ";
- networks = *cp++;
+ networks = GET_U_1(cp);
+ cp++;
length -= 2;
- while (--networks >= 0) {
+ while (networks != 0) {
/* Pickup network number */
if (length < 1)
goto trunc;
- ND_TCHECK2(cp[0], 1);
- addr = (uint32_t)*cp++ << 24;
+ addr = ((uint32_t) GET_U_1(cp)) << 24;
+ cp++;
length--;
if (IN_CLASSB(addr)) {
if (length < 1)
goto trunc;
- ND_TCHECK2(cp[0], 1);
- addr |= (uint32_t)*cp++ << 16;
+ addr |= ((uint32_t) GET_U_1(cp)) << 16;
+ cp++;
length--;
} else if (!IN_CLASSA(addr)) {
if (length < 2)
goto trunc;
- ND_TCHECK2(cp[0], 2);
- addr |= (uint32_t)*cp++ << 16;
- addr |= (uint32_t)*cp++ << 8;
+ addr |= ((uint32_t) GET_U_1(cp)) << 16;
+ cp++;
+ addr |= ((uint32_t) GET_U_1(cp)) << 8;
+ cp++;
length -= 2;
}
- ND_PRINT((ndo, " %s", ipaddr_string(ndo, &addr)));
+ ND_PRINT(" %s", ipaddr_string(ndo, (const u_char *)&addr));
+ networks--;
}
+ distances--;
}
- ND_PRINT((ndo, ")"));
+ ND_PRINT(")");
}
return;
trunc:
- ND_PRINT((ndo, "[|]"));
+ nd_print_trunc(ndo);
}
void
egp_print(netdissect_options *ndo,
- register const uint8_t *bp, register u_int length)
+ const uint8_t *bp, u_int length)
{
- register const struct egp_packet *egp;
- register int status;
- register int code;
- register int type;
+ const struct egp_packet *egp;
+ u_int version;
+ u_int type;
+ u_int code;
+ u_int status;
+ ndo->ndo_protocol = "egp";
egp = (const struct egp_packet *)bp;
- if (length < sizeof(*egp) || !ND_TTEST(*egp)) {
- ND_PRINT((ndo, "[|egp]"));
+ if (length < sizeof(*egp) || !ND_TTEST_SIZE(egp)) {
+ nd_print_trunc(ndo);
return;
}
+ version = GET_U_1(egp->egp_version);
if (!ndo->ndo_vflag) {
- ND_PRINT((ndo, "EGPv%u, AS %u, seq %u, length %u",
- egp->egp_version,
- EXTRACT_16BITS(&egp->egp_as),
- EXTRACT_16BITS(&egp->egp_sequence),
- length));
+ ND_PRINT("EGPv%u, AS %u, seq %u, length %u",
+ version,
+ GET_BE_U_2(egp->egp_as),
+ GET_BE_U_2(egp->egp_sequence),
+ length);
return;
} else
- ND_PRINT((ndo, "EGPv%u, length %u",
- egp->egp_version,
- length));
+ ND_PRINT("EGPv%u, length %u",
+ version,
+ length);
- if (egp->egp_version != EGP_VERSION) {
- ND_PRINT((ndo, "[version %d]", egp->egp_version));
+ if (version != EGP_VERSION) {
+ ND_PRINT("[version %u]", version);
return;
}
- type = egp->egp_type;
- code = egp->egp_code;
- status = egp->egp_status;
+ type = GET_U_1(egp->egp_type);
+ code = GET_U_1(egp->egp_code);
+ status = GET_U_1(egp->egp_status);
switch (type) {
case EGPT_ACQUIRE:
- ND_PRINT((ndo, " acquire"));
+ ND_PRINT(" acquire");
switch (code) {
case EGPC_REQUEST:
case EGPC_CONFIRM:
- ND_PRINT((ndo, " %s", egp_acquire_codes[code]));
+ ND_PRINT(" %s", egp_acquire_codes[code]);
switch (status) {
case EGPS_UNSPEC:
case EGPS_ACTIVE:
case EGPS_PASSIVE:
- ND_PRINT((ndo, " %s", egp_acquire_status[status]));
+ ND_PRINT(" %s", egp_acquire_status[status]);
break;
default:
- ND_PRINT((ndo, " [status %d]", status));
+ ND_PRINT(" [status %u]", status);
break;
}
- ND_PRINT((ndo, " hello:%d poll:%d",
- EXTRACT_16BITS(&egp->egp_hello),
- EXTRACT_16BITS(&egp->egp_poll)));
+ ND_PRINT(" hello:%u poll:%u",
+ GET_BE_U_2(egp->egp_hello),
+ GET_BE_U_2(egp->egp_poll));
break;
case EGPC_REFUSE:
case EGPC_CEASE:
case EGPC_CEASEACK:
- ND_PRINT((ndo, " %s", egp_acquire_codes[code]));
+ ND_PRINT(" %s", egp_acquire_codes[code]);
switch (status ) {
case EGPS_UNSPEC:
case EGPS_NORES:
@@ -296,17 +311,17 @@
case EGPS_GODOWN:
case EGPS_PARAM:
case EGPS_PROTO:
- ND_PRINT((ndo, " %s", egp_acquire_status[status]));
+ ND_PRINT(" %s", egp_acquire_status[status]);
break;
default:
- ND_PRINT((ndo, "[status %d]", status));
+ ND_PRINT("[status %u]", status);
break;
}
break;
default:
- ND_PRINT((ndo, "[code %d]", code));
+ ND_PRINT("[code %u]", code);
break;
}
break;
@@ -316,61 +331,62 @@
case EGPC_HELLO:
case EGPC_HEARDU:
- ND_PRINT((ndo, " %s", egp_reach_codes[code]));
+ ND_PRINT(" %s", egp_reach_codes[code]);
if (status <= EGPS_DOWN)
- ND_PRINT((ndo, " state:%s", egp_status_updown[status]));
+ ND_PRINT(" state:%s", egp_status_updown[status]);
else
- ND_PRINT((ndo, " [status %d]", status));
+ ND_PRINT(" [status %u]", status);
break;
default:
- ND_PRINT((ndo, "[reach code %d]", code));
+ ND_PRINT("[reach code %u]", code);
break;
}
break;
case EGPT_POLL:
- ND_PRINT((ndo, " poll"));
- if (egp->egp_status <= EGPS_DOWN)
- ND_PRINT((ndo, " state:%s", egp_status_updown[status]));
+ ND_PRINT(" poll");
+ if (status <= EGPS_DOWN)
+ ND_PRINT(" state:%s", egp_status_updown[status]);
else
- ND_PRINT((ndo, " [status %d]", status));
- ND_PRINT((ndo, " net:%s", ipaddr_string(ndo, &egp->egp_sourcenet)));
+ ND_PRINT(" [status %u]", status);
+ ND_PRINT(" net:%s", GET_IPADDR_STRING(egp->egp_sourcenet));
break;
case EGPT_UPDATE:
- ND_PRINT((ndo, " update"));
+ ND_PRINT(" update");
if (status & EGPS_UNSOL) {
status &= ~EGPS_UNSOL;
- ND_PRINT((ndo, " unsolicited"));
+ ND_PRINT(" unsolicited");
}
if (status <= EGPS_DOWN)
- ND_PRINT((ndo, " state:%s", egp_status_updown[status]));
+ ND_PRINT(" state:%s", egp_status_updown[status]);
else
- ND_PRINT((ndo, " [status %d]", status));
- ND_PRINT((ndo, " %s int %d ext %d",
- ipaddr_string(ndo, &egp->egp_sourcenet),
- egp->egp_intgw,
- egp->egp_extgw));
+ ND_PRINT(" [status %u]", status);
+ ND_PRINT(" %s int %u ext %u",
+ GET_IPADDR_STRING(egp->egp_sourcenet),
+ GET_U_1(egp->egp_intgw),
+ GET_U_1(egp->egp_extgw));
if (ndo->ndo_vflag)
- egpnrprint(ndo, egp, length);
+ egpnr_print(ndo, egp, length);
break;
case EGPT_ERROR:
- ND_PRINT((ndo, " error"));
+ ND_PRINT(" error");
if (status <= EGPS_DOWN)
- ND_PRINT((ndo, " state:%s", egp_status_updown[status]));
+ ND_PRINT(" state:%s", egp_status_updown[status]);
else
- ND_PRINT((ndo, " [status %d]", status));
+ ND_PRINT(" [status %u]", status);
- if (EXTRACT_16BITS(&egp->egp_reason) <= EGPR_UVERSION)
- ND_PRINT((ndo, " %s", egp_reasons[EXTRACT_16BITS(&egp->egp_reason)]));
+ if (GET_BE_U_2(egp->egp_reason) <= EGPR_UVERSION)
+ ND_PRINT(" %s",
+ egp_reasons[GET_BE_U_2(egp->egp_reason)]);
else
- ND_PRINT((ndo, " [reason %d]", EXTRACT_16BITS(&egp->egp_reason)));
+ ND_PRINT(" [reason %u]", GET_BE_U_2(egp->egp_reason));
break;
default:
- ND_PRINT((ndo, "[type %d]", type));
+ ND_PRINT("[type %u]", type);
break;
}
}