The Tcpdump Group git mirrors - tcpdump/blobdiff

diff --git a/print-pgm.c b/print-pgm.c

index ea9204f40b0ea831e08bc2526ca8adb51f500f9a..6a8342539f477707d8d4dc05deb62d1c8c29b22f 100644 (file)

--- a/print-pgm.c

+++ b/print-pgm.c

@@ -29,67 +29,68 @@

#include "ip6.h"

#endif

#include "ipproto.h"

+#include "af.h"

/*

* PGM header (RFC 3208)

*/

struct pgm_header {

- u_int16_t pgm_sport;

- u_int16_t pgm_dport;

- u_int8_t pgm_type;

- u_int8_t pgm_options;

- u_int16_t pgm_sum;

- u_int8_t pgm_gsid[6];

- u_int16_t pgm_length;

+ uint16_t pgm_sport;

+ uint16_t pgm_dport;

+ uint8_t pgm_type;

+ uint8_t pgm_options;

+ uint16_t pgm_sum;

+ uint8_t pgm_gsid[6];

+ uint16_t pgm_length;

};

struct pgm_spm {

- u_int32_t pgms_seq;

- u_int32_t pgms_trailseq;

- u_int32_t pgms_leadseq;

- u_int16_t pgms_nla_afi;

- u_int16_t pgms_reserved;

- /* ... u_int8_t pgms_nla[0]; */

+ uint32_t pgms_seq;

+ uint32_t pgms_trailseq;

+ uint32_t pgms_leadseq;

+ uint16_t pgms_nla_afi;

+ uint16_t pgms_reserved;

+ /* ... uint8_t pgms_nla[0]; */

/* ... options */

};

struct pgm_nak {

- u_int32_t pgmn_seq;

- u_int16_t pgmn_source_afi;

- u_int16_t pgmn_reserved;

- /* ... u_int8_t pgmn_source[0]; */

- /* ... u_int16_t pgmn_group_afi */

- /* ... u_int16_t pgmn_reserved2; */

- /* ... u_int8_t pgmn_group[0]; */

+ uint32_t pgmn_seq;

+ uint16_t pgmn_source_afi;

+ uint16_t pgmn_reserved;

+ /* ... uint8_t pgmn_source[0]; */

+ /* ... uint16_t pgmn_group_afi */

+ /* ... uint16_t pgmn_reserved2; */

+ /* ... uint8_t pgmn_group[0]; */

/* ... options */

};

struct pgm_ack {

- u_int32_t pgma_rx_max_seq;

- u_int32_t pgma_bitmap;

+ uint32_t pgma_rx_max_seq;

+ uint32_t pgma_bitmap;

/* ... options */

};

struct pgm_poll {

- u_int32_t pgmp_seq;

- u_int16_t pgmp_round;

- u_int16_t pgmp_reserved;

+ uint32_t pgmp_seq;

+ uint16_t pgmp_round;

+ uint16_t pgmp_reserved;

/* ... options */

};

struct pgm_polr {

- u_int32_t pgmp_seq;

- u_int16_t pgmp_round;

- u_int16_t pgmp_subtype;

- u_int16_t pgmp_nla_afi;

- u_int16_t pgmp_reserved;

- /* ... u_int8_t pgmp_nla[0]; */

+ uint32_t pgmp_seq;

+ uint16_t pgmp_round;

+ uint16_t pgmp_subtype;

+ uint16_t pgmp_nla_afi;

+ uint16_t pgmp_reserved;

+ /* ... uint8_t pgmp_nla[0]; */

/* ... options */

};

struct pgm_data {

- u_int32_t pgmd_seq;

- u_int32_t pgmd_trailseq;

+ uint32_t pgmd_seq;

+ uint32_t pgmd_trailseq;

/* ... options */

};

@@ -141,11 +142,6 @@ typedef enum _pgm_type {

#define PGM_MIN_OPT_LEN 4

-#ifndef AFI_IP

-#define AFI_IP 1

-#define AFI_IP6 2

-#endif

-

void

pgm_print(netdissect_options *ndo,

register const u_char *bp, register u_int length,

@@ -154,7 +150,7 @@ pgm_print(netdissect_options *ndo,

register const struct pgm_header *pgm;

register const struct ip *ip;

register char ch;

- u_int16_t sport, dport;

+ uint16_t sport, dport;

int addr_size;

const void *nla;

int nla_af;

@@ -164,8 +160,8 @@ pgm_print(netdissect_options *ndo,

#else

char nla_buf[INET_ADDRSTRLEN];

#endif

- u_int8_t opt_type, opt_len;

- u_int32_t seq, opts_len, len, offset;

+ uint8_t opt_type, opt_len;

+ uint32_t seq, opts_len, len, offset;

pgm = (struct pgm_header *)bp;

ip = (struct ip *)bp2;

@@ -185,15 +181,15 @@ pgm_print(netdissect_options *ndo,

#ifdef INET6

if (ip6) {

ND_PRINT((ndo, "%s > %s: [|pgm]",

- ip6addr_string(&ip6->ip6_src),

- ip6addr_string(&ip6->ip6_dst)));

+ ip6addr_string(ndo, &ip6->ip6_src),

+ ip6addr_string(ndo, &ip6->ip6_dst)));

return;

} else

#endif /* INET6 */

{

ND_PRINT((ndo, "%s > %s: [|pgm]",

- ipaddr_string(&ip->ip_src),

- ipaddr_string(&ip->ip_dst)));

+ ipaddr_string(ndo, &ip->ip_src),

+ ipaddr_string(ndo, &ip->ip_dst)));

return;

}

@@ -205,9 +201,9 @@ pgm_print(netdissect_options *ndo,

if (ip6) {

if (ip6->ip6_nxt == IPPROTO_PGM) {

ND_PRINT((ndo, "%s.%s > %s.%s: ",

- ip6addr_string(&ip6->ip6_src),

+ ip6addr_string(ndo, &ip6->ip6_src),

tcpport_string(sport),

- ip6addr_string(&ip6->ip6_dst),

+ ip6addr_string(ndo, &ip6->ip6_dst),

tcpport_string(dport)));

} else {

ND_PRINT((ndo, "%s > %s: ",

@@ -218,9 +214,9 @@ pgm_print(netdissect_options *ndo,

{

if (ip->ip_p == IPPROTO_PGM) {

ND_PRINT((ndo, "%s.%s > %s.%s: ",

- ipaddr_string(&ip->ip_src),

+ ipaddr_string(ndo, &ip->ip_src),

tcpport_string(sport),

- ipaddr_string(&ip->ip_dst),

+ ipaddr_string(ndo, &ip->ip_dst),

tcpport_string(dport)));

} else {

ND_PRINT((ndo, "%s > %s: ",

@@ -250,12 +246,12 @@ pgm_print(netdissect_options *ndo,

ND_TCHECK(*spm);

switch (EXTRACT_16BITS(&spm->pgms_nla_afi)) {

- case AFI_IP:

+ case AFNUM_INET:

addr_size = sizeof(struct in_addr);

nla_af = AF_INET;

break;

#ifdef INET6

- case AFI_IP6:

+ case AFNUM_INET6:

addr_size = sizeof(struct in6_addr);

nla_af = AF_INET6;

break;

@@ -291,18 +287,18 @@ pgm_print(netdissect_options *ndo,

}

case PGM_POLR: {

struct pgm_polr *polr;

- u_int32_t ivl, rnd, mask;

+ uint32_t ivl, rnd, mask;

polr = (struct pgm_polr *)(pgm + 1);

ND_TCHECK(*polr);

switch (EXTRACT_16BITS(&polr->pgmp_nla_afi)) {

- case AFI_IP:

+ case AFNUM_INET:

addr_size = sizeof(struct in_addr);

nla_af = AF_INET;

break;

#ifdef INET6

- case AFI_IP6:

+ case AFNUM_INET6:

addr_size = sizeof(struct in6_addr);

nla_af = AF_INET6;

break;

@@ -318,17 +314,17 @@ pgm_print(netdissect_options *ndo,

inet_ntop(nla_af, nla, nla_buf, sizeof(nla_buf));

- ND_TCHECK2(*bp, sizeof(u_int32_t));

+ ND_TCHECK2(*bp, sizeof(uint32_t));

ivl = EXTRACT_32BITS(bp);

- bp += sizeof(u_int32_t);

+ bp += sizeof(uint32_t);

- ND_TCHECK2(*bp, sizeof(u_int32_t));

+ ND_TCHECK2(*bp, sizeof(uint32_t));

rnd = EXTRACT_32BITS(bp);

- bp += sizeof(u_int32_t);

+ bp += sizeof(uint32_t);

- ND_TCHECK2(*bp, sizeof(u_int32_t));

+ ND_TCHECK2(*bp, sizeof(uint32_t));

mask = EXTRACT_32BITS(bp);

- bp += sizeof(u_int32_t);

+ bp += sizeof(uint32_t);

ND_PRINT((ndo, "POLR seq %u round %u nla %s ivl %u rnd 0x%08x "

"mask 0x%08x", EXTRACT_32BITS(&polr->pgmp_seq),

@@ -379,12 +375,12 @@ pgm_print(netdissect_options *ndo,

* and stopping if we don't have enough.

*/

switch (EXTRACT_16BITS(&nak->pgmn_source_afi)) {

- case AFI_IP:

+ case AFNUM_INET:

addr_size = sizeof(struct in_addr);

source_af = AF_INET;

break;

#ifdef INET6

- case AFI_IP6:

+ case AFNUM_INET6:

addr_size = sizeof(struct in6_addr);

source_af = AF_INET6;

break;

@@ -403,12 +399,12 @@ pgm_print(netdissect_options *ndo,

* and stopping if we don't have enough.

*/

switch (EXTRACT_16BITS(bp)) {

- case AFI_IP:

+ case AFNUM_INET:

addr_size = sizeof(struct in_addr);

group_af = AF_INET;

break;

#ifdef INET6

- case AFI_IP6:

+ case AFNUM_INET6:

addr_size = sizeof(struct in6_addr);

group_af = AF_INET6;

break;

@@ -417,7 +413,7 @@ pgm_print(netdissect_options *ndo,

goto trunc;

break;

}

- bp += (2 * sizeof(u_int16_t));

+ bp += (2 * sizeof(uint16_t));

ND_TCHECK2(*bp, addr_size);

group = bp;

bp += addr_size;

@@ -494,7 +490,7 @@ pgm_print(netdissect_options *ndo,

ND_PRINT((ndo, "[Bad total option length %u < 4]", opts_len));

return;

}

- bp += sizeof(u_int16_t);

+ bp += sizeof(uint16_t);

ND_PRINT((ndo, " OPTS LEN %d", opts_len));

opts_len -= 4;

@@ -526,7 +522,7 @@ pgm_print(netdissect_options *ndo,

return;

}

ND_PRINT((ndo, " OPTS LEN (extra?) %d", EXTRACT_16BITS(bp)));

- bp += sizeof(u_int16_t);

+ bp += sizeof(uint16_t);

opts_len -= 4;

break;

@@ -537,29 +533,29 @@ pgm_print(netdissect_options *ndo,

}

bp += 2;

seq = EXTRACT_32BITS(bp);

- bp += sizeof(u_int32_t);

+ bp += sizeof(uint32_t);

offset = EXTRACT_32BITS(bp);

- bp += sizeof(u_int32_t);

+ bp += sizeof(uint32_t);

len = EXTRACT_32BITS(bp);

- bp += sizeof(u_int32_t);

+ bp += sizeof(uint32_t);

ND_PRINT((ndo, " FRAG seq %u off %u len %u", seq, offset, len));

opts_len -= 16;

break;

case PGM_OPT_NAK_LIST:

bp += 2;

- opt_len -= sizeof(u_int32_t); /* option header */

+ opt_len -= sizeof(uint32_t); /* option header */

ND_PRINT((ndo, " NAK LIST"));

while (opt_len) {

- if (opt_len < sizeof(u_int32_t)) {

+ if (opt_len < sizeof(uint32_t)) {

ND_PRINT((ndo, "[Option length not a multiple of 4]"));

return;

}

- ND_TCHECK2(*bp, sizeof(u_int32_t));

+ ND_TCHECK2(*bp, sizeof(uint32_t));

ND_PRINT((ndo, " %u", EXTRACT_32BITS(bp)));

- bp += sizeof(u_int32_t);

- opt_len -= sizeof(u_int32_t);

- opts_len -= sizeof(u_int32_t);

+ bp += sizeof(uint32_t);

+ opt_len -= sizeof(uint32_t);

+ opts_len -= sizeof(uint32_t);

}

break;

@@ -570,7 +566,7 @@ pgm_print(netdissect_options *ndo,

}

bp += 2;

seq = EXTRACT_32BITS(bp);

- bp += sizeof(u_int32_t);

+ bp += sizeof(uint32_t);

ND_PRINT((ndo, " JOIN %u", seq));

opts_len -= 8;

break;

@@ -582,9 +578,9 @@ pgm_print(netdissect_options *ndo,

}

bp += 2;

offset = EXTRACT_32BITS(bp);

- bp += sizeof(u_int32_t);

+ bp += sizeof(uint32_t);

seq = EXTRACT_32BITS(bp);

- bp += sizeof(u_int32_t);

+ bp += sizeof(uint32_t);

ND_PRINT((ndo, " BACKOFF ivl %u ivlseq %u", offset, seq));

opts_len -= 12;

break;

@@ -596,9 +592,9 @@ pgm_print(netdissect_options *ndo,

}

bp += 2;

offset = EXTRACT_32BITS(bp);

- bp += sizeof(u_int32_t);

+ bp += sizeof(uint32_t);

seq = EXTRACT_32BITS(bp);

- bp += sizeof(u_int32_t);

+ bp += sizeof(uint32_t);

ND_PRINT((ndo, " BACKOFF max %u min %u", offset, seq));

opts_len -= 12;

break;

@@ -606,12 +602,12 @@ pgm_print(netdissect_options *ndo,

case PGM_OPT_REDIRECT:

bp += 2;

switch (EXTRACT_16BITS(bp)) {

- case AFI_IP:

+ case AFNUM_INET:

addr_size = sizeof(struct in_addr);

nla_af = AF_INET;

break;

#ifdef INET6

- case AFI_IP6:

+ case AFNUM_INET6:

addr_size = sizeof(struct in6_addr);

nla_af = AF_INET6;

break;

@@ -620,7 +616,7 @@ pgm_print(netdissect_options *ndo,

goto trunc;

break;

}

- bp += (2 * sizeof(u_int16_t));

+ bp += (2 * sizeof(uint16_t));

if (opt_len != 4 + addr_size) {

ND_PRINT((ndo, "[Bad OPT_REDIRECT option, length %u != 4 + address size]", opt_len));

return;

@@ -641,7 +637,7 @@ pgm_print(netdissect_options *ndo,

}

bp += 2;

len = EXTRACT_32BITS(bp);

- bp += sizeof(u_int32_t);

+ bp += sizeof(uint32_t);

ND_PRINT((ndo, " PARITY MAXTGS %u", len));

opts_len -= 8;

break;

@@ -653,7 +649,7 @@ pgm_print(netdissect_options *ndo,

}

bp += 2;

seq = EXTRACT_32BITS(bp);

- bp += sizeof(u_int32_t);

+ bp += sizeof(uint32_t);

ND_PRINT((ndo, " PARITY GROUP %u", seq));

opts_len -= 8;

break;

@@ -665,7 +661,7 @@ pgm_print(netdissect_options *ndo,

}

bp += 2;

len = EXTRACT_32BITS(bp);

- bp += sizeof(u_int32_t);

+ bp += sizeof(uint32_t);

ND_PRINT((ndo, " PARITY ATGS %u", len));

opts_len -= 8;

break;

@@ -735,14 +731,14 @@ pgm_print(netdissect_options *ndo,

case PGM_OPT_PGMCC_DATA:

bp += 2;

offset = EXTRACT_32BITS(bp);

- bp += sizeof(u_int32_t);

+ bp += sizeof(uint32_t);

switch (EXTRACT_16BITS(bp)) {

- case AFI_IP:

+ case AFNUM_INET:

addr_size = sizeof(struct in_addr);

nla_af = AF_INET;

break;

#ifdef INET6

- case AFI_IP6:

+ case AFNUM_INET6:

addr_size = sizeof(struct in6_addr);

nla_af = AF_INET6;

break;

@@ -751,7 +747,7 @@ pgm_print(netdissect_options *ndo,

goto trunc;

break;

}

- bp += (2 * sizeof(u_int16_t));

+ bp += (2 * sizeof(uint16_t));

if (opt_len != 12 + addr_size) {

ND_PRINT((ndo, "[Bad OPT_PGMCC_DATA option, length %u != 12 + address size]", opt_len));

return;

@@ -768,14 +764,14 @@ pgm_print(netdissect_options *ndo,

case PGM_OPT_PGMCC_FEEDBACK:

bp += 2;

offset = EXTRACT_32BITS(bp);

- bp += sizeof(u_int32_t);

+ bp += sizeof(uint32_t);

switch (EXTRACT_16BITS(bp)) {

- case AFI_IP:

+ case AFNUM_INET:

addr_size = sizeof(struct in_addr);

nla_af = AF_INET;

break;

#ifdef INET6

- case AFI_IP6:

+ case AFNUM_INET6:

addr_size = sizeof(struct in6_addr);

nla_af = AF_INET6;

break;

@@ -784,7 +780,7 @@ pgm_print(netdissect_options *ndo,

goto trunc;

break;

}

- bp += (2 * sizeof(u_int16_t));

+ bp += (2 * sizeof(uint16_t));

if (opt_len != 12 + addr_size) {

ND_PRINT((ndo, "[Bad OPT_PGMCC_FEEDBACK option, length %u != 12 + address size]", opt_len));

return;