There's no link-layer header on Linux ARPHRD_ATM packets; there's

[tcpdump] / print-rx.c

diff --git a/print-rx.c b/print-rx.c
index 8345612cacfe27cc38a97173b9bd3337fd4abf8d..a9e4692e4aba5e87affba73f3d8f35f595c9ac04 100644 (file)
--- a/print-rx.c
+++ b/print-rx.c
@@ -13,7 +13,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rx.c,v 1.18 2000-09-29 04:58:48 guy Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-rx.c,v 1.26 2001-09-09 01:41:49 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -21,6 +21,7 @@ static const char rcsid[] =
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <sys/param.h>
@@ -34,9 +35,6 @@ static const char rcsid[] =
 #include "addrtoname.h"
 #include "extract.h"
 
-#undef NOERROR                                 /* Solaris sucks */
-#include <arpa/nameser.h>
-
 #include "rx.h"
 
 #include "ip.h"
@@ -55,12 +53,18 @@ static struct tok rx_types[] = {
        { 0,                            NULL },
 };
 
-static struct tok rx_flags[] = {
-       { RX_CLIENT_INITIATED,  "client-init" },
-       { RX_REQUEST_ACK,       "req-ack" },
-       { RX_LAST_PACKET,       "last-pckt" },
-       { RX_MORE_PACKETS,      "more-pckts" },
-       { RX_FREE_PACKET,       "free-pckt" }
+static struct double_tok {
+       int flag;               /* Rx flag */
+       int packetType;         /* Packet type */
+       char *s;                /* Flag string */
+} rx_flags[] = {
+       { RX_CLIENT_INITIATED,  0,                      "client-init" },
+       { RX_REQUEST_ACK,       0,                      "req-ack" },
+       { RX_LAST_PACKET,       0,                      "last-pckt" },
+       { RX_MORE_PACKETS,      0,                      "more-pckts" },
+       { RX_FREE_PACKET,       0,                      "free-pckt" },
+       { RX_SLOW_START_OK,     RX_PACKET_TYPE_ACK,     "slow-start" },
+       { RX_JUMBO_PACKET,      RX_PACKET_TYPE_DATA,    "jumbogram" }
 };
 
 static struct tok fs_req[] = {
@@ -98,6 +102,7 @@ static struct tok fs_req[] = {
        { 161,          "dfs-lookup" },
        { 162,          "dfs-flushcps" },
        { 163,          "dfs-symlink" },
+       { 220,          "residency" },
        { 0,            NULL },
 };
 
@@ -113,6 +118,10 @@ static struct tok cb_req[] = {
        { 212,          "whoareyou" },
        { 213,          "initcb3" },
        { 214,          "probeuuid" },
+       { 215,          "getsrvprefs" },
+       { 216,          "getcellservdb" },
+       { 217,          "getlocalcell" },
+       { 218,          "getcacheconf" },
        { 0,            NULL },
 };
 
@@ -138,6 +147,7 @@ static struct tok pt_req[] = {
        { 518,          "get-cps2" },
        { 519,          "get-host-cps" },
        { 520,          "update-entry" },
+       { 521,          "list-entries" },
        { 0,            NULL },
 };
 
@@ -175,6 +185,7 @@ static struct tok vldb_req[] = {
        { 531,          "linked-list-u" },
        { 532,          "regaddr" },
        { 533,          "get-addrs-u" },
+       { 534,          "list-attrib-n2" },
        { 0,            NULL },
 };
 
@@ -269,6 +280,8 @@ static struct tok bos_req[] = {
        { 112,          "start-bozo-log" },
        { 113,          "wait-all" },
        { 114,          "get-instance-strings" },
+       { 115,          "get-restricted" },
+       { 116,          "set-restricted" },
        { 0,            NULL },
 };
 
@@ -377,7 +390,7 @@ static int  rx_cache_find(const struct rx_header *, const struct ip *,
 static void ack_print(const u_char *, int);
 static void fs_print(const u_char *, int);
 static void fs_reply_print(const u_char *, int, int32_t);
-static void acl_print(u_char *, u_char *);
+static void acl_print(u_char *, int, u_char *);
 static void cb_print(const u_char *, int);
 static void cb_reply_print(const u_char *, int, int32_t);
 static void prot_print(const u_char *, int);
@@ -438,7 +451,9 @@ rx_print(register const u_char *bp, int length, int sport, int dport,
 
                if (vflag > 1)
                        for (i = 0; i < NUM_RX_FLAGS; i++) {
-                               if (rxh->flags & rx_flags[i].v) {
+                               if (rxh->flags & rx_flags[i].flag &&
+                                   (!rx_flags[i].packetType ||
+                                    rxh->type == rx_flags[i].packetType)) {
                                        if (!firstflag) {
                                                firstflag = 1;
                                                printf(" ");
@@ -634,14 +649,16 @@ rx_cache_find(const struct rx_header *rxh, const struct ip *ip, int sport,
                        printf(" fid %d/%d/%d", (int) n1, (int) n2, (int) n3); \
                }
 
-#define STROUT(MAX) { int i; \
+#define STROUT(MAX) { unsigned int i; \
                        TCHECK2(bp[0], sizeof(int32_t)); \
-                       i = (int) EXTRACT_32BITS(bp); \
+                       i = EXTRACT_32BITS(bp); \
+                       if (i > (MAX)) \
+                               goto trunc; \
                        bp += sizeof(int32_t); \
-                       TCHECK2(bp[0], i); \
-                       strncpy(s, (char *) bp, min(MAX, i)); \
-                       s[i] = '\0'; \
-                       printf(" \"%s\"", s); \
+                       printf(" \""); \
+                       if (fn_printn(bp, i, snapend)) \
+                               goto trunc; \
+                       printf("\""); \
                        bp += ((i + sizeof(int32_t) - 1) / sizeof(int32_t)) * sizeof(int32_t); \
                }
 
@@ -718,15 +735,20 @@ rx_cache_find(const struct rx_header *rxh, const struct ip *ip, int sport,
  */
 
 #define VECOUT(MAX) { char *sp; \
+                       char s[AFSNAMEMAX]; \
                        int k; \
-                       TCHECK2(bp[0], MAX * sizeof(int32_t)); \
+                       if ((MAX) + 1 > sizeof(s)) \
+                               goto trunc; \
+                       TCHECK2(bp[0], (MAX) * sizeof(int32_t)); \
                        sp = s; \
-                       for (k = 0; k < MAX; k++) { \
+                       for (k = 0; k < (MAX); k++) { \
                                *sp++ = (char) EXTRACT_32BITS(bp); \
                                bp += sizeof(int32_t); \
                        } \
-                       s[MAX] = '\0'; \
-                       printf(" \"%s\"", s); \
+                       s[(MAX)] = '\0'; \
+                       printf(" \""); \
+                       fn_print(s, NULL); \
+                       printf("\""); \
                }
 
 static void
@@ -807,7 +829,6 @@ fs_print(register const u_char *bp, int length)
 {
        int fs_op;
        unsigned long i;
-       char s[AFSNAMEMAX];
 
        if (length <= sizeof(struct rx_header))
                return;
@@ -870,15 +891,16 @@ fs_print(register const u_char *bp, int length)
                        break;
                case 134:       /* Store ACL */
                {
-                       char a[AFSOPAQUEMAX];
+                       char a[AFSOPAQUEMAX+1];
                        FIDOUT();
                        TCHECK2(bp[0], 4);
                        i = EXTRACT_32BITS(bp);
                        bp += sizeof(int32_t);
                        TCHECK2(bp[0], i);
-                       strncpy(a, (char *) bp, min(AFSOPAQUEMAX, i));
+                       i = min(AFSOPAQUEMAX, i);
+                       strncpy(a, (char *) bp, i);
                        a[i] = '\0';
-                       acl_print((u_char *) a, (u_char *) a + i);
+                       acl_print((u_char *) a, sizeof(a), (u_char *) a + i);
                        break;
                }
                case 137:       /* Create file */
@@ -957,7 +979,6 @@ static void
 fs_reply_print(register const u_char *bp, int length, int32_t opcode)
 {
        unsigned long i;
-       char s[AFSNAMEMAX];
        struct rx_header *rxh;
 
        if (length <= sizeof(struct rx_header))
@@ -982,14 +1003,15 @@ fs_reply_print(register const u_char *bp, int length, int32_t opcode)
                switch (opcode) {
                case 131:       /* Fetch ACL */
                {
-                       char a[AFSOPAQUEMAX];
+                       char a[AFSOPAQUEMAX+1];
                        TCHECK2(bp[0], 4);
                        i = EXTRACT_32BITS(bp);
                        bp += sizeof(int32_t);
                        TCHECK2(bp[0], i);
-                       strncpy(a, (char *) bp, min(AFSOPAQUEMAX, i));
+                       i = min(AFSOPAQUEMAX, i);
+                       strncpy(a, (char *) bp, i);
                        a[i] = '\0';
-                       acl_print((u_char *) a, (u_char *) a + i);
+                       acl_print((u_char *) a, sizeof(a), (u_char *) a + i);
                        break;
                }
                case 137:       /* Create file */
@@ -1043,19 +1065,22 @@ trunc:
  */
 
 static void
-acl_print(u_char *s, u_char *end)
+acl_print(u_char *s, int maxsize, u_char *end)
 {
        int pos, neg, acl;
        int n, i;
-       char user[128];
+       char *user;
 
-       if (sscanf((char *) s, "%d %d\n%n", &pos, &neg, &n) != 2)
+       if ((user = (char *)malloc(maxsize)) == NULL)
                return;
+
+       if (sscanf((char *) s, "%d %d\n%n", &pos, &neg, &n) != 2)
+               goto finish;
        
        s += n;
 
        if (s > end)
-               return;
+               goto finish;
 
        /*
         * This wacky order preserves the order used by the "fs" command
@@ -1079,25 +1104,33 @@ acl_print(u_char *s, u_char *end)
 
        for (i = 0; i < pos; i++) {
                if (sscanf((char *) s, "%s %d\n%n", user, &acl, &n) != 2)
-                       return;
+                       goto finish;
                s += n;
-               printf(" +{%s ", user);
+               printf(" +{");
+               fn_print(user, NULL);
+               printf(" ");
                ACLOUT(acl);
                printf("}");
                if (s > end)
-                       return;
+                       goto finish;
        }
 
        for (i = 0; i < neg; i++) {
                if (sscanf((char *) s, "%s %d\n%n", user, &acl, &n) != 2)
-                       return;
+                       goto finish;
                s += n;
-               printf(" -{%s ", user);
+               printf(" -{");
+               fn_print(user, NULL);
+               printf(" ");
                ACLOUT(acl);
                printf("}");
                if (s > end)
-                       return;
+                       goto finish;
        }
+
+finish:
+       free(user);
+       return;
 }
 
 #undef ACLOUT
@@ -1241,7 +1274,6 @@ static void
 prot_print(register const u_char *bp, int length)
 {
        unsigned long i;
-       char s[AFSNAMEMAX];
        int pt_op;
 
        if (length <= sizeof(struct rx_header))
@@ -1385,7 +1417,6 @@ prot_reply_print(register const u_char *bp, int length, int32_t opcode)
 {
        struct rx_header *rxh;
        unsigned long i;
-       char s[AFSNAMEMAX];
 
        if (length < sizeof(struct rx_header))
                return;
@@ -1498,7 +1529,6 @@ vldb_print(register const u_char *bp, int length)
 {
        int vldb_op;
        unsigned long i;
-       char s[AFSNAMEMAX];
 
        if (length <= sizeof(struct rx_header))
                return;
@@ -1592,7 +1622,6 @@ vldb_reply_print(register const u_char *bp, int length, int32_t opcode)
 {
        struct rx_header *rxh;
        unsigned long i;
-       char s[AFSNAMEMAX];
 
        if (length < sizeof(struct rx_header))
                return;
@@ -1779,7 +1808,6 @@ static void
 kauth_print(register const u_char *bp, int length)
 {
        int kauth_op;
-       char s[AFSNAMEMAX];
 
        if (length <= sizeof(struct rx_header))
                return;
@@ -2006,7 +2034,6 @@ static void
 bos_print(register const u_char *bp, int length)
 {
        int bos_op;
-       char s[BOSNAMEMAX];
 
        if (length <= sizeof(struct rx_header))
                return;