style improvements in ARP dissector proto tree, added todo items

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

diff --git a/TODO b/TODO
index bd85d400904147da4daf68d7308ed47c1245a966..691452f6d4642ccb107680f66af9da0dad0010a1 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-$Id: TODO,v 1.2 1999/12/04 06:15:31 gram Exp $
+$Id: TODO,v 1.3 1999/12/07 15:38:19 nneul Exp $
 
 Things to do:
 =============
@@ -47,3 +47,10 @@ it under?)
 
 15. Display filters: add regexes to strings and byte ranges
 
+16. Atalk NBP dissector - see netatalk sources for structure defs (nneul)
+
+17. Krb dissector - standard krb4 - from tcpdump (nneul)
+
+18. Krb5 dissector - from scratch, need to use ASN.1 code (nneul)
+
+19. IRC dissector

diff --git a/packet-arp.c b/packet-arp.c
index 1bd9545e74cf0d68372f42d80e0405295ae70a79..9bc9cceef572396909384d8d2c40b5bcd276f224 100644 (file)
--- a/packet-arp.c
+++ b/packet-arp.c
@@ -1,7 +1,7 @@
 /* packet-arp.c
  * Routines for ARP packet disassembly
  *
- * $Id: packet-arp.c,v 1.24 1999/11/27 04:48:12 guy Exp $
+ * $Id: packet-arp.c,v 1.25 1999/12/07 15:38:20 nneul Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -123,20 +123,20 @@ static gint ett_atmarp_nsap = -1;
 #endif
 
 static const value_string op_vals[] = {
-  {ARPOP_REQUEST,  "ARP request" },
-  {ARPOP_REPLY,    "ARP reply"   },
-  {ARPOP_RREQUEST, "RARP request"},
-  {ARPOP_RREPLY,   "RARP reply"  },
-  {ARPOP_IREQUEST, "Inverse ARP request"},
-  {ARPOP_IREPLY,   "Inverse ARP reply"  },
+  {ARPOP_REQUEST,  "request" },
+  {ARPOP_REPLY,    "reply"   },
+  {ARPOP_RREQUEST, "reverse request"},
+  {ARPOP_RREPLY,   "reverse reply"  },
+  {ARPOP_IREQUEST, "inverse request"},
+  {ARPOP_IREPLY,   "inverse reply"  },
   {0,              NULL          } };
 
 static const value_string atmop_vals[] = {
-  {ARPOP_REQUEST,  "ATMARP request" },
-  {ARPOP_REPLY,    "ATMARP reply"   },
-  {ARPOP_IREQUEST, "Inverse ATMARP request"},
-  {ARPOP_IREPLY,   "Inverse ATMARP reply"  },
-  {ATMARPOP_NAK,   "ATMARP NAK"  },
+  {ARPOP_REQUEST,  "request" },
+  {ARPOP_REPLY,    "reply"   },
+  {ARPOP_IREQUEST, "inverse request"},
+  {ARPOP_IREPLY,   "inverse reply"  },
+  {ATMARPOP_NAK,   "nak"  },
   {0,              NULL          } };
 
 #define        ATMARP_IS_E164  0x40    /* bit in shtl/thtl for E.164 format */
@@ -497,11 +497,13 @@ dissect_atmarp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
   if (tree) {
     if ((op_str = match_strval(ar_op, atmop_vals)))
       ti = proto_tree_add_item_format(tree, proto_arp, offset, tot_len,
-                                     NULL, op_str);
+                                     NULL, 
+                                       "ATM Address Resolution Protocol (%s)", 
+                                       op_str);
     else
       ti = proto_tree_add_item_format(tree, proto_arp, offset, tot_len,
                                      NULL,
-                                     "Unknown ATMARP (opcode 0x%04x)", ar_op);
+                                     "ATM Address Resolution Protocol (opcode 0x%04x)", ar_op);
     arp_tree = proto_item_add_subtree(ti, ett_arp);
     proto_tree_add_item(arp_tree, hf_arp_hard_type, offset + ATM_AR_HRD, 2,
                               ar_hrd);
@@ -640,11 +642,12 @@ dissect_arp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
   if (tree) {
     if ((op_str = match_strval(ar_op, op_vals)))
       ti = proto_tree_add_item_format(tree, proto_arp, offset, tot_len,
-                                     NULL, op_str);
+                                     NULL, 
+                                       "Address Resolution Protocol (%s)", op_str);
     else
       ti = proto_tree_add_item_format(tree, proto_arp, offset, tot_len,
                                      NULL,
-                                     "Unknown ARP (opcode 0x%04x)", ar_op);
+                                     "Address Resolution Protocol (opcode 0x%04x)", ar_op);
     arp_tree = proto_item_add_subtree(ti, ett_arp);
     proto_tree_add_item(arp_tree, hf_arp_hard_type, offset + AR_HRD, 2,
                               ar_hrd);