Use "proto_tree_add_item()" rather than passing a "tvb_get_" function's

result to "proto_tree_add_uint()".

Get rid of the structure declarations in "packet-rx.h"; they're not
used, and one of them has a zero-length array in it, which is not
standard C, and not accepted by all C compilers.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@3852 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 9 insertions, 51 deletions

diff --git a/packet-rx.h b/packet-rx.h
index aef406405e..187af98d04 100644
--- a/packet-rx.h
+++ b/packet-rx.h
@@ -1,7 +1,7 @@
 /* packet-rx.h
  * Definitions for packet disassembly structures and routines
  *
- * $Id: packet-rx.h,v 1.6 2001/08/04 04:04:34 guy Exp $
+ * $Id: packet-rx.h,v 1.7 2001/08/20 02:11:13 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -39,13 +39,10 @@ struct rxinfo {
 /*
  * RX protocol definitions.
  */
-struct rx_header {
-	guint32 epoch;
-	guint32 cid;
-	guint32 callNumber;
-	guint32 seq;
-	guint32 serial;
-	u_char type;
+
+/*
+ * Packet types.
+ */
 #define RX_PACKET_TYPE_DATA		1
 #define RX_PACKET_TYPE_ACK		2
 #define RX_PACKET_TYPE_BUSY		3
@@ -56,30 +53,15 @@ struct rx_header {
 #define RX_PACKET_TYPE_DEBUG		8
 #define RX_PACKET_TYPE_PARAMS		9
 #define RX_PACKET_TYPE_VERSION		13
-	u_char flags; 
+
+/*
+ * Flag bits in the RX header.
+ */
 #define RX_CLIENT_INITIATED 1
 #define RX_REQUEST_ACK 2
 #define RX_LAST_PACKET 4
 #define RX_MORE_PACKETS 8
 #define RX_FREE_PACKET 16
-	u_char userStatus;
-	u_char securityIndex;
-	guint16 spare;			/* How clever: even though the AFS */
-	guint16 serviceId;		/* header files indicate that the */
-};					/* serviceId is first, it's really */
-					/* encoded _after_ the spare field */
-					/* I wasted a day figuring that out! */
-#define RX_MAXACKS 255
-struct rx_ack_header {
-     guint16 bufferspace;       /* # of packet buffers available */
-     guint16 maxskew;
-     guint32 firstpacket;        /* First packet in acks below */
-     guint32 prevpacket;
-     guint32 serial;             /* Packet that prompted this one */
-     u_char reason;             /* rx_ack_reason */
-     u_char nAcks;		/* number of acks*/
-     u_char acks[RX_MAXACKS];
-};
 
 #define RX_ACK_TYPE_NACK 0
 #define RX_ACK_TYPE_ACK 1
@@ -93,30 +75,6 @@ struct rx_ack_header {
 #define RX_ACK_PING_RESPONSE 7
 #define RX_ACK_DELAY 8
 
-struct rxkad_challenge {
-	guint32 version;
-	guint32 nonce;
-	guint32 min_level;
-	guint32 unused;
-};
-
 #define RX_MAXCALLS	4
-struct rxkad_response {
-	guint32	version;
-	guint32	unused;
-	struct {
-		guint32	epoch;
-		guint32	cid;
-		guint32	cksum;
-		guint32	security_index;
-		guint32	call_numbers[RX_MAXCALLS];
-		guint32	inc_nonce;
-		guint32	level;
-	} encrypted;
-	guint32	kvno;
-	guint32	ticket_len;
-	u_char	the_ticket[0];
-};
-
 
 #endif