aboutsummaryrefslogtreecommitdiff
path: root/print-ipx.c
diff options
context:
space:
mode:
Diffstat (limited to 'print-ipx.c')
-rw-r--r--print-ipx.c193
1 files changed, 111 insertions, 82 deletions
diff --git a/print-ipx.c b/print-ipx.c
index d807a66ea546..f8c0ce7c2213 100644
--- a/print-ipx.c
+++ b/print-ipx.c
@@ -24,13 +24,14 @@
/* \summary: Novell IPX printer */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
#include <stdio.h>
+#define ND_LONGJMP_FROM_TCHECK
#include "netdissect.h"
#include "addrtoname.h"
#include "extract.h"
@@ -46,24 +47,24 @@
/* IPX transport header */
struct ipxHdr {
- uint16_t cksum; /* Checksum */
- uint16_t length; /* Length, in bytes, including header */
- uint8_t tCtl; /* Transport Control (i.e. hop count) */
- uint8_t pType; /* Packet Type (i.e. level 2 protocol) */
- uint16_t dstNet[2]; /* destination net */
- uint8_t dstNode[6]; /* destination node */
- uint16_t dstSkt; /* destination socket */
- uint16_t srcNet[2]; /* source net */
- uint8_t srcNode[6]; /* source node */
- uint16_t srcSkt; /* source socket */
+ nd_uint16_t cksum; /* Checksum */
+ nd_uint16_t length; /* Length, in bytes, including header */
+ nd_uint8_t tCtl; /* Transport Control (i.e. hop count) */
+ nd_uint8_t pType; /* Packet Type (i.e. level 2 protocol) */
+ nd_uint32_t dstNet; /* destination net */
+ nd_mac_addr dstNode; /* destination node */
+ nd_uint16_t dstSkt; /* destination socket */
+ nd_uint32_t srcNet; /* source net */
+ nd_mac_addr srcNode; /* source node */
+ nd_uint16_t srcSkt; /* source socket */
};
#define ipxSize 30
-static const char *ipxaddr_string(uint32_t, const u_char *);
+static const char *ipxaddr_string(netdissect_options *, uint32_t, const u_char *);
static void ipx_decode(netdissect_options *, const struct ipxHdr *, const u_char *, u_int);
-static void ipx_sap_print(netdissect_options *, const u_short *, u_int);
-static void ipx_rip_print(netdissect_options *, const u_short *, u_int);
+static void ipx_sap_print(netdissect_options *, const u_char *, u_int);
+static void ipx_rip_print(netdissect_options *, const u_char *, u_int);
/*
* Print IPX datagram packets.
@@ -73,35 +74,38 @@ ipx_print(netdissect_options *ndo, const u_char *p, u_int length)
{
const struct ipxHdr *ipx = (const struct ipxHdr *)p;
+ ndo->ndo_protocol = "ipx";
if (!ndo->ndo_eflag)
- ND_PRINT((ndo, "IPX "));
+ ND_PRINT("IPX ");
- ND_TCHECK(ipx->srcSkt);
- ND_PRINT((ndo, "%s.%04x > ",
- ipxaddr_string(EXTRACT_32BITS(ipx->srcNet), ipx->srcNode),
- EXTRACT_16BITS(&ipx->srcSkt)));
+ ND_PRINT("%s.%04x > ",
+ ipxaddr_string(ndo, GET_BE_U_4(ipx->srcNet), ipx->srcNode),
+ GET_BE_U_2(ipx->srcSkt));
- ND_PRINT((ndo, "%s.%04x: ",
- ipxaddr_string(EXTRACT_32BITS(ipx->dstNet), ipx->dstNode),
- EXTRACT_16BITS(&ipx->dstSkt)));
+ ND_PRINT("%s.%04x: ",
+ ipxaddr_string(ndo, GET_BE_U_4(ipx->dstNet), ipx->dstNode),
+ GET_BE_U_2(ipx->dstSkt));
/* take length from ipx header */
- ND_TCHECK(ipx->length);
- length = EXTRACT_16BITS(&ipx->length);
+ length = GET_BE_U_2(ipx->length);
+ if (length < ipxSize) {
+ ND_PRINT("[length %u < %u]", length, ipxSize);
+ nd_print_invalid(ndo);
+ return;
+ }
ipx_decode(ndo, ipx, p + ipxSize, length - ipxSize);
- return;
-trunc:
- ND_PRINT((ndo, "[|ipx %d]", length));
}
static const char *
-ipxaddr_string(uint32_t net, const u_char *node)
+ipxaddr_string(netdissect_options *ndo, uint32_t net, const u_char *node)
{
static char line[256];
snprintf(line, sizeof(line), "%08x.%02x:%02x:%02x:%02x:%02x:%02x",
- net, node[0], node[1], node[2], node[3], node[4], node[5]);
+ net, GET_U_1(node), GET_U_1(node + 1),
+ GET_U_1(node + 2), GET_U_1(node + 3),
+ GET_U_1(node + 4), GET_U_1(node + 5));
return line;
}
@@ -109,30 +113,30 @@ ipxaddr_string(uint32_t net, const u_char *node)
static void
ipx_decode(netdissect_options *ndo, const struct ipxHdr *ipx, const u_char *datap, u_int length)
{
- register u_short dstSkt;
+ u_short dstSkt;
- dstSkt = EXTRACT_16BITS(&ipx->dstSkt);
+ dstSkt = GET_BE_U_2(ipx->dstSkt);
switch (dstSkt) {
case IPX_SKT_NCP:
- ND_PRINT((ndo, "ipx-ncp %d", length));
+ ND_PRINT("ipx-ncp %u", length);
break;
case IPX_SKT_SAP:
- ipx_sap_print(ndo, (const u_short *)datap, length);
+ ipx_sap_print(ndo, datap, length);
break;
case IPX_SKT_RIP:
- ipx_rip_print(ndo, (const u_short *)datap, length);
+ ipx_rip_print(ndo, datap, length);
break;
case IPX_SKT_NETBIOS:
- ND_PRINT((ndo, "ipx-netbios %d", length));
+ ND_PRINT("ipx-netbios %u", length);
#ifdef ENABLE_SMB
ipx_netbios_print(ndo, datap, length);
#endif
break;
case IPX_SKT_DIAGNOSTICS:
- ND_PRINT((ndo, "ipx-diags %d", length));
+ ND_PRINT("ipx-diags %u", length);
break;
case IPX_SKT_NWLINK_DGM:
- ND_PRINT((ndo, "ipx-nwlink-dgm %d", length));
+ ND_PRINT("ipx-nwlink-dgm %u", length);
#ifdef ENABLE_SMB
ipx_netbios_print(ndo, datap, length);
#endif
@@ -141,98 +145,123 @@ ipx_decode(netdissect_options *ndo, const struct ipxHdr *ipx, const u_char *data
eigrp_print(ndo, datap, length);
break;
default:
- ND_PRINT((ndo, "ipx-#%x %d", dstSkt, length));
+ ND_PRINT("ipx-#%x %u", dstSkt, length);
break;
}
}
static void
-ipx_sap_print(netdissect_options *ndo, const u_short *ipx, u_int length)
+ipx_sap_print(netdissect_options *ndo, const u_char *ipx, u_int length)
{
int command, i;
- ND_TCHECK(ipx[0]);
- command = EXTRACT_16BITS(ipx);
- ipx++;
+ command = GET_BE_U_2(ipx);
+ ND_LCHECK_U(length, 2);
+ ipx += 2;
length -= 2;
switch (command) {
case 1:
case 3:
if (command == 1)
- ND_PRINT((ndo, "ipx-sap-req"));
+ ND_PRINT("ipx-sap-req");
else
- ND_PRINT((ndo, "ipx-sap-nearest-req"));
+ ND_PRINT("ipx-sap-nearest-req");
- ND_TCHECK(ipx[0]);
- ND_PRINT((ndo, " %s", ipxsap_string(ndo, htons(EXTRACT_16BITS(&ipx[0])))));
+ ND_PRINT(" %s", ipxsap_string(ndo, htons(GET_BE_U_2(ipx))));
break;
case 2:
case 4:
if (command == 2)
- ND_PRINT((ndo, "ipx-sap-resp"));
+ ND_PRINT("ipx-sap-resp");
else
- ND_PRINT((ndo, "ipx-sap-nearest-resp"));
-
- for (i = 0; i < 8 && length > 0; i++) {
- ND_TCHECK(ipx[0]);
- ND_PRINT((ndo, " %s '", ipxsap_string(ndo, htons(EXTRACT_16BITS(&ipx[0])))));
- if (fn_printzp(ndo, (const u_char *)&ipx[1], 48, ndo->ndo_snapend)) {
- ND_PRINT((ndo, "'"));
- goto trunc;
+ ND_PRINT("ipx-sap-nearest-resp");
+
+ for (i = 0; i < 8 && length != 0; i++) {
+ ND_TCHECK_2(ipx);
+ if (length < 2)
+ goto invalid;
+ ND_PRINT(" %s '", ipxsap_string(ndo, htons(GET_BE_U_2(ipx))));
+ ipx += 2;
+ length -= 2;
+ if (length < 48) {
+ ND_PRINT("'");
+ goto invalid;
}
- ND_TCHECK2(ipx[25], 10);
- ND_PRINT((ndo, "' addr %s",
- ipxaddr_string(EXTRACT_32BITS(&ipx[25]), (const u_char *)&ipx[27])));
- ipx += 32;
- length -= 64;
+ nd_printjnp(ndo, ipx, 48);
+ ND_PRINT("'");
+ ipx += 48;
+ length -= 48;
+ /*
+ * 10 bytes of IPX address.
+ */
+ ND_TCHECK_LEN(ipx, 10);
+ if (length < 10)
+ goto invalid;
+ ND_PRINT(" addr %s",
+ ipxaddr_string(ndo, GET_BE_U_4(ipx), ipx + 4));
+ ipx += 10;
+ length -= 10;
+ /*
+ * 2 bytes of socket and 2 bytes of number of intermediate
+ * networks.
+ */
+ ND_TCHECK_4(ipx);
+ if (length < 4)
+ goto invalid;
+ ipx += 4;
+ length -= 4;
}
break;
default:
- ND_PRINT((ndo, "ipx-sap-?%x", command));
+ ND_PRINT("ipx-sap-?%x", command);
break;
}
return;
-trunc:
- ND_PRINT((ndo, "[|ipx %d]", length));
+
+invalid:
+ nd_print_invalid(ndo);
}
static void
-ipx_rip_print(netdissect_options *ndo, const u_short *ipx, u_int length)
+ipx_rip_print(netdissect_options *ndo, const u_char *ipx, u_int length)
{
int command, i;
- ND_TCHECK(ipx[0]);
- command = EXTRACT_16BITS(ipx);
- ipx++;
+ command = GET_BE_U_2(ipx);
+ ND_LCHECK_U(length, 2);
+ ipx += 2;
length -= 2;
switch (command) {
case 1:
- ND_PRINT((ndo, "ipx-rip-req"));
- if (length > 0) {
- ND_TCHECK(ipx[3]);
- ND_PRINT((ndo, " %08x/%d.%d", EXTRACT_32BITS(&ipx[0]),
- EXTRACT_16BITS(&ipx[2]), EXTRACT_16BITS(&ipx[3])));
+ ND_PRINT("ipx-rip-req");
+ if (length != 0) {
+ if (length < 8)
+ goto invalid;
+ ND_PRINT(" %08x/%u.%u", GET_BE_U_4(ipx),
+ GET_BE_U_2(ipx + 4), GET_BE_U_2(ipx + 6));
}
break;
case 2:
- ND_PRINT((ndo, "ipx-rip-resp"));
- for (i = 0; i < 50 && length > 0; i++) {
- ND_TCHECK(ipx[3]);
- ND_PRINT((ndo, " %08x/%d.%d", EXTRACT_32BITS(&ipx[0]),
- EXTRACT_16BITS(&ipx[2]), EXTRACT_16BITS(&ipx[3])));
+ ND_PRINT("ipx-rip-resp");
+ for (i = 0; i < 50 && length != 0; i++) {
+ if (length < 8)
+ goto invalid;
+ ND_PRINT(" %08x/%u.%u", GET_BE_U_4(ipx),
+ GET_BE_U_2(ipx + 4), GET_BE_U_2(ipx + 6));
- ipx += 4;
+ ipx += 8;
length -= 8;
}
break;
default:
- ND_PRINT((ndo, "ipx-rip-?%x", command));
+ ND_PRINT("ipx-rip-?%x", command);
break;
}
return;
-trunc:
- ND_PRINT((ndo, "[|ipx %d]", length));
+
+invalid:
+ nd_print_invalid(ndo);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 23:44:25 +0000