X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ed85e20e4d6a27d5405f37366dd34b64c10a9211..refs/pull/494/head:/print-rx.c diff --git a/print-rx.c b/print-rx.c index 8a9babbc..516c387e 100644 --- a/print-rx.c +++ b/print-rx.c @@ -32,7 +32,6 @@ * Ken Hornstein */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -40,9 +39,9 @@ #include #include #include -#include +#include -#include "interface.h" +#include "netdissect.h" #include "addrtoname.h" #include "extract.h" @@ -522,9 +521,9 @@ static int is_ubik(uint32_t); void rx_print(netdissect_options *ndo, register const u_char *bp, int length, int sport, int dport, - u_char *bp2) + const u_char *bp2) { - register struct rx_header *rxh; + register const struct rx_header *rxh; int i; int32_t opcode; @@ -533,7 +532,7 @@ rx_print(netdissect_options *ndo, return; } - rxh = (struct rx_header *) bp; + rxh = (const struct rx_header *) bp; ND_PRINT((ndo, " rx %s", tok2str(rx_types, "type %d", rxh->type))); @@ -689,8 +688,8 @@ rx_cache_insert(netdissect_options *ndo, rx_cache_next = 0; rxent->callnum = rxh->callNumber; - rxent->client = ip->ip_src; - rxent->server = ip->ip_dst; + UNALIGNED_MEMCPY(&rxent->client, &ip->ip_src, sizeof(uint32_t)); + UNALIGNED_MEMCPY(&rxent->server, &ip->ip_dst, sizeof(uint32_t)); rxent->dport = dport; rxent->serviceId = rxh->serviceId; rxent->opcode = EXTRACT_32BITS(bp + sizeof(struct rx_header)); @@ -709,8 +708,11 @@ rx_cache_find(const struct rx_header *rxh, const struct ip *ip, int sport, { int i; struct rx_cache_entry *rxent; - uint32_t clip = ip->ip_dst.s_addr; - uint32_t sip = ip->ip_src.s_addr; + uint32_t clip; + uint32_t sip; + + UNALIGNED_MEMCPY(&clip, &ip->ip_dst, sizeof(uint32_t)); + UNALIGNED_MEMCPY(&sip, &ip->ip_src, sizeof(uint32_t)); /* Start the search where we last left off */ @@ -752,63 +754,63 @@ rx_cache_find(const struct rx_header *rxh, const struct ip *ip, int sport, ND_PRINT((ndo, " fid %d/%d/%d", (int) n1, (int) n2, (int) n3)); \ } -#define STROUT(MAX) { unsigned int i; \ +#define STROUT(MAX) { unsigned int _i; \ ND_TCHECK2(bp[0], sizeof(int32_t)); \ - i = EXTRACT_32BITS(bp); \ - if (i > (MAX)) \ + _i = EXTRACT_32BITS(bp); \ + if (_i > (MAX)) \ goto trunc; \ bp += sizeof(int32_t); \ ND_PRINT((ndo, " \"")); \ - if (fn_printn(ndo, bp, i, ndo->ndo_snapend)) \ + if (fn_printn(ndo, bp, _i, ndo->ndo_snapend)) \ goto trunc; \ ND_PRINT((ndo, "\"")); \ - bp += ((i + sizeof(int32_t) - 1) / sizeof(int32_t)) * sizeof(int32_t); \ + bp += ((_i + sizeof(int32_t) - 1) / sizeof(int32_t)) * sizeof(int32_t); \ } -#define INTOUT() { int i; \ +#define INTOUT() { int _i; \ ND_TCHECK2(bp[0], sizeof(int32_t)); \ - i = (int) EXTRACT_32BITS(bp); \ + _i = (int) EXTRACT_32BITS(bp); \ bp += sizeof(int32_t); \ - ND_PRINT((ndo, " %d", i)); \ + ND_PRINT((ndo, " %d", _i)); \ } -#define UINTOUT() { unsigned long i; \ +#define UINTOUT() { unsigned long _i; \ ND_TCHECK2(bp[0], sizeof(int32_t)); \ - i = EXTRACT_32BITS(bp); \ + _i = EXTRACT_32BITS(bp); \ bp += sizeof(int32_t); \ - ND_PRINT((ndo, " %lu", i)); \ + ND_PRINT((ndo, " %lu", _i)); \ } -#define UINT64OUT() { uint64_t i; \ +#define UINT64OUT() { uint64_t _i; \ ND_TCHECK2(bp[0], sizeof(uint64_t)); \ - i = EXTRACT_64BITS(bp); \ + _i = EXTRACT_64BITS(bp); \ bp += sizeof(uint64_t); \ - ND_PRINT((ndo, " %" PRIu64, i)); \ + ND_PRINT((ndo, " %" PRIu64, _i)); \ } -#define DATEOUT() { time_t t; struct tm *tm; char str[256]; \ +#define DATEOUT() { time_t _t; struct tm *tm; char str[256]; \ ND_TCHECK2(bp[0], sizeof(int32_t)); \ - t = (time_t) EXTRACT_32BITS(bp); \ + _t = (time_t) EXTRACT_32BITS(bp); \ bp += sizeof(int32_t); \ - tm = localtime(&t); \ - strftime(str, 256, "%Y/%m/%d %T", tm); \ + tm = localtime(&_t); \ + strftime(str, 256, "%Y/%m/%d %H:%M:%S", tm); \ ND_PRINT((ndo, " %s", str)); \ } -#define STOREATTROUT() { unsigned long mask, i; \ +#define STOREATTROUT() { unsigned long mask, _i; \ ND_TCHECK2(bp[0], (sizeof(int32_t)*6)); \ mask = EXTRACT_32BITS(bp); bp += sizeof(int32_t); \ if (mask) ND_PRINT((ndo, " StoreStatus")); \ if (mask & 1) { ND_PRINT((ndo, " date")); DATEOUT(); } \ else bp += sizeof(int32_t); \ - i = EXTRACT_32BITS(bp); bp += sizeof(int32_t); \ - if (mask & 2) ND_PRINT((ndo, " owner %lu", i)); \ - i = EXTRACT_32BITS(bp); bp += sizeof(int32_t); \ - if (mask & 4) ND_PRINT((ndo, " group %lu", i)); \ - i = EXTRACT_32BITS(bp); bp += sizeof(int32_t); \ - if (mask & 8) ND_PRINT((ndo, " mode %lo", i & 07777)); \ - i = EXTRACT_32BITS(bp); bp += sizeof(int32_t); \ - if (mask & 16) ND_PRINT((ndo, " segsize %lu", i)); \ + _i = EXTRACT_32BITS(bp); bp += sizeof(int32_t); \ + if (mask & 2) ND_PRINT((ndo, " owner %lu", _i)); \ + _i = EXTRACT_32BITS(bp); bp += sizeof(int32_t); \ + if (mask & 4) ND_PRINT((ndo, " group %lu", _i)); \ + _i = EXTRACT_32BITS(bp); bp += sizeof(int32_t); \ + if (mask & 8) ND_PRINT((ndo, " mode %lo", _i & 07777)); \ + _i = EXTRACT_32BITS(bp); bp += sizeof(int32_t); \ + if (mask & 16) ND_PRINT((ndo, " segsize %lu", _i)); \ /* undocumented in 3.3 docu */ \ if (mask & 1024) ND_PRINT((ndo, " fsync")); \ } @@ -822,7 +824,7 @@ rx_cache_find(const struct rx_header *rxh, const struct ip *ip, int sport, ND_PRINT((ndo, " %d.%d", epoch, counter)); \ } -#define AFSUUIDOUT() {uint32_t temp; int i; \ +#define AFSUUIDOUT() {uint32_t temp; int _i; \ ND_TCHECK2(bp[0], 11*sizeof(uint32_t)); \ temp = EXTRACT_32BITS(bp); \ bp += sizeof(uint32_t); \ @@ -833,7 +835,7 @@ rx_cache_find(const struct rx_header *rxh, const struct ip *ip, int sport, temp = EXTRACT_32BITS(bp); \ bp += sizeof(uint32_t); \ ND_PRINT((ndo, "%04x", temp)); \ - for (i = 0; i < 8; i++) { \ + for (_i = 0; _i < 8; _i++) { \ temp = EXTRACT_32BITS(bp); \ bp += sizeof(uint32_t); \ ND_PRINT((ndo, "%02x", (unsigned char) temp)); \ @@ -951,7 +953,7 @@ fs_print(netdissect_options *ndo, bp += sizeof(int32_t); ND_TCHECK2(bp[0], i); i = min(AFSOPAQUEMAX, i); - strncpy(a, (char *) bp, i); + strncpy(a, (const char *) bp, i); a[i] = '\0'; acl_print(ndo, (u_char *) a, sizeof(a), (u_char *) a + i); break; @@ -1054,12 +1056,12 @@ fs_reply_print(netdissect_options *ndo, register const u_char *bp, int length, int32_t opcode) { unsigned long i; - struct rx_header *rxh; + const struct rx_header *rxh; if (length <= (int)sizeof(struct rx_header)) return; - rxh = (struct rx_header *) bp; + rxh = (const struct rx_header *) bp; /* * Print out the afs call we're invoking. The table used here was @@ -1084,7 +1086,7 @@ fs_reply_print(netdissect_options *ndo, bp += sizeof(int32_t); ND_TCHECK2(bp[0], i); i = min(AFSOPAQUEMAX, i); - strncpy(a, (char *) bp, i); + strncpy(a, (const char *) bp, i); a[i] = '\0'; acl_print(ndo, (u_char *) a, sizeof(a), (u_char *) a + i); break; @@ -1105,8 +1107,6 @@ fs_reply_print(netdissect_options *ndo, ; } } else if (rxh->type == RX_PACKET_TYPE_ABORT) { - int i; - /* * Otherwise, just print out the return code */ @@ -1299,12 +1299,12 @@ static void cb_reply_print(netdissect_options *ndo, register const u_char *bp, int length, int32_t opcode) { - struct rx_header *rxh; + const struct rx_header *rxh; if (length <= (int)sizeof(struct rx_header)) return; - rxh = (struct rx_header *) bp; + rxh = (const struct rx_header *) bp; /* * Print out the afs call we're invoking. The table used here was @@ -1493,13 +1493,13 @@ static void prot_reply_print(netdissect_options *ndo, register const u_char *bp, int length, int32_t opcode) { - struct rx_header *rxh; + const struct rx_header *rxh; unsigned long i; if (length < (int)sizeof(struct rx_header)) return; - rxh = (struct rx_header *) bp; + rxh = (const struct rx_header *) bp; /* * Print out the afs call we're invoking. The table used here was @@ -1700,13 +1700,13 @@ static void vldb_reply_print(netdissect_options *ndo, register const u_char *bp, int length, int32_t opcode) { - struct rx_header *rxh; + const struct rx_header *rxh; unsigned long i; if (length < (int)sizeof(struct rx_header)) return; - rxh = (struct rx_header *) bp; + rxh = (const struct rx_header *) bp; /* * Print out the afs call we're invoking. The table used here was @@ -1752,7 +1752,7 @@ vldb_reply_print(netdissect_options *ndo, ND_TCHECK2(bp[0], sizeof(int32_t)); if (i < nservers) ND_PRINT((ndo, " %s", - intoa(((struct in_addr *) bp)->s_addr))); + intoa(((const struct in_addr *) bp)->s_addr))); bp += sizeof(int32_t); } ND_PRINT((ndo, " partitions")); @@ -1799,7 +1799,7 @@ vldb_reply_print(netdissect_options *ndo, ND_TCHECK2(bp[0], sizeof(int32_t)); if (i < nservers) ND_PRINT((ndo, " %s", - intoa(((struct in_addr *) bp)->s_addr))); + intoa(((const struct in_addr *) bp)->s_addr))); bp += sizeof(int32_t); } ND_PRINT((ndo, " partitions")); @@ -1982,12 +1982,12 @@ static void kauth_reply_print(netdissect_options *ndo, register const u_char *bp, int length, int32_t opcode) { - struct rx_header *rxh; + const struct rx_header *rxh; if (length <= (int)sizeof(struct rx_header)) return; - rxh = (struct rx_header *) bp; + rxh = (const struct rx_header *) bp; /* * Print out the afs call we're invoking. The table used here was @@ -2236,12 +2236,12 @@ static void vol_reply_print(netdissect_options *ndo, register const u_char *bp, int length, int32_t opcode) { - struct rx_header *rxh; + const struct rx_header *rxh; if (length <= (int)sizeof(struct rx_header)) return; - rxh = (struct rx_header *) bp; + rxh = (const struct rx_header *) bp; /* * Print out the afs call we're invoking. The table used here was @@ -2463,12 +2463,12 @@ static void bos_reply_print(netdissect_options *ndo, register const u_char *bp, int length, int32_t opcode) { - struct rx_header *rxh; + const struct rx_header *rxh; if (length <= (int)sizeof(struct rx_header)) return; - rxh = (struct rx_header *) bp; + rxh = (const struct rx_header *) bp; /* * Print out the afs call we're invoking. The table used here was @@ -2632,12 +2632,12 @@ static void ubik_reply_print(netdissect_options *ndo, register const u_char *bp, int length, int32_t opcode) { - struct rx_header *rxh; + const struct rx_header *rxh; if (length < (int)sizeof(struct rx_header)) return; - rxh = (struct rx_header *) bp; + rxh = (const struct rx_header *) bp; /* * Print out the ubik call we're invoking. This table was gleaned @@ -2696,7 +2696,7 @@ static void rx_ack_print(netdissect_options *ndo, register const u_char *bp, int length) { - struct rx_ackPacket *rxa; + const struct rx_ackPacket *rxa; int i, start, last; uint32_t firstPacket; @@ -2715,7 +2715,7 @@ rx_ack_print(netdissect_options *ndo, ND_TCHECK2(bp[0], sizeof(struct rx_ackPacket) - RX_MAXACKS); - rxa = (struct rx_ackPacket *) bp; + rxa = (const struct rx_ackPacket *) bp; bp += (sizeof(struct rx_ackPacket) - RX_MAXACKS); /*