Updates to RX support, from Nickolai Zeldovich <[email protected]>.

diff --git a/CREDITS b/CREDITS
index d437fd818bddc9f73f933bc27b0140a328465982..c45e67ede17468c8c233ddc2948af8618f245408 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -51,6 +51,7 @@ Additional people who have contributed patches:
        Monroe Williams                 <[email protected]>
        Motonori Shindo                 <[email protected]>
        Nathan J. Williams              <[email protected]>
+       Nickolai Zeldovich              <[email protected]>
        Olaf Kirch                      <[email protected]>
        Onno van der Linden             <[email protected]>
        Pascal Hennequin                <[email protected]>

diff --git a/print-rx.c b/print-rx.c
index e656b3235c2dbb621054d73641093cb777996563..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.25 2001-07-09 09:24:09 itojun Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-rx.c,v 1.26 2001-09-09 01:41:49 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -53,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[] = {
@@ -96,6 +102,7 @@ static struct tok fs_req[] = {
        { 161,          "dfs-lookup" },
        { 162,          "dfs-flushcps" },
        { 163,          "dfs-symlink" },
+       { 220,          "residency" },
        { 0,            NULL },
 };
 
@@ -111,6 +118,10 @@ static struct tok cb_req[] = {
        { 212,          "whoareyou" },
        { 213,          "initcb3" },
        { 214,          "probeuuid" },
+       { 215,          "getsrvprefs" },
+       { 216,          "getcellservdb" },
+       { 217,          "getlocalcell" },
+       { 218,          "getcacheconf" },
        { 0,            NULL },
 };
 
@@ -136,6 +147,7 @@ static struct tok pt_req[] = {
        { 518,          "get-cps2" },
        { 519,          "get-host-cps" },
        { 520,          "update-entry" },
+       { 521,          "list-entries" },
        { 0,            NULL },
 };
 
@@ -173,6 +185,7 @@ static struct tok vldb_req[] = {
        { 531,          "linked-list-u" },
        { 532,          "regaddr" },
        { 533,          "get-addrs-u" },
+       { 534,          "list-attrib-n2" },
        { 0,            NULL },
 };
 
@@ -267,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 },
 };
 
@@ -436,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(" ");

diff --git a/rx.h b/rx.h
index bd563939ef83991391a85cd798a63ce5b04554ec..ec0740aa5b5ffa87415a19c18805edf711e3ad0a 100644 (file)
--- a/rx.h
+++ b/rx.h
@@ -1,7 +1,7 @@
 /*
  * Rx protocol format
  *
- * $Id: rx.h,v 1.3 2000-10-03 02:55:02 itojun Exp $
+ * $Id: rx.h,v 1.4 2001-09-09 01:41:50 guy Exp $
  */
 
 #define FS_RX_PORT     7000
@@ -57,6 +57,8 @@ struct rx_header {
 #define RX_LAST_PACKET         4
 #define RX_MORE_PACKETS                8
 #define RX_FREE_PACKET         16
+#define RX_SLOW_START_OK       32
+#define RX_JUMBO_PACKET                32
        u_int8_t userStatus;
        u_int8_t securityIndex;
        u_int16_t spare;                /* How clever: even though the AFS */
@@ -65,7 +67,7 @@ struct rx_header {
                                        /* encoded _after_ the spare field */
                                        /* I wasted a day figuring that out! */
 
-#define NUM_RX_FLAGS 5
+#define NUM_RX_FLAGS 7
 
 #define RX_MAXACKS 255