From Ronnie Sahlberg: display the SAMR "Account Control" field in hex.

[obnox/wireshark/wip.git] / packet-imap.c

diff --git a/packet-imap.c b/packet-imap.c
index 4daf79cb182cad8e5cc5d426986d9b05f329d92a..b1d7d2be53fec958019272531db7e325a5f2ad8f 100644 (file)
--- a/packet-imap.c
+++ b/packet-imap.c
@@ -2,10 +2,10 @@
  * Routines for imap packet dissection
  * Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
  *
- * $Id: packet-imap.c,v 1.11 2000/12/29 02:19:14 guy Exp $
+ * $Id: packet-imap.c,v 1.19 2002/01/24 09:20:48 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
  *
  * Copied from packet-tftp.c
@@ -41,8 +41,8 @@
 
 #include <string.h>
 #include <glib.h>
-#include "packet.h"
-#include "strutil.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
 
 static int proto_imap = -1;
 static int hf_imap_response = -1;
@@ -64,15 +64,15 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        int             tokenlen;
        const u_char    *next_token;
 
-       CHECK_DISPLAY_AS_DATA(proto_imap, tvb, pinfo, tree);
-
-       pinfo->current_proto = "IMAP";
-
-       if (check_col(pinfo->fd, COL_PROTOCOL))
-               col_set_str(pinfo->fd, COL_PROTOCOL, "IMAP");
+       if (check_col(pinfo->cinfo, COL_PROTOCOL))
+               col_set_str(pinfo->cinfo, COL_PROTOCOL, "IMAP");
 
        /*
         * Find the end of the first line.
+        *
+        * Note that "tvb_find_line_end()" will return a value that is
+        * not longer than what's in the buffer, so the "tvb_get_ptr()"
+        * call won't throw an exception.
         */
        linelen = tvb_find_line_end(tvb, offset, -1, &next_offset);
        line = tvb_get_ptr(tvb, offset, linelen);
@@ -82,19 +82,19 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        else
                is_request = FALSE;
 
-       if (check_col(pinfo->fd, COL_INFO)) {
+       if (check_col(pinfo->cinfo, COL_INFO)) {
                /*
                 * Put the first line from the buffer into the summary
                 * (but leave out the line terminator).
                 */
-               col_add_fstr(pinfo->fd, COL_INFO, "%s: %s",
+               col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s",
                    is_request ? "Request" : "Response",
                    format_text(line, linelen));
        }
 
        if (tree) {
-               ti = proto_tree_add_item(tree, proto_imap, tvb, offset,
-                   tvb_length_remaining(tvb, offset), FALSE);
+               ti = proto_tree_add_item(tree, proto_imap, tvb, offset, -1,
+                   FALSE);
                imap_tree = proto_item_add_subtree(ti, ett_imap);
 
                if (is_request) {
@@ -162,19 +162,19 @@ proto_register_imap(void)
     { &hf_imap_response,
       { "Response",           "imap.response",
        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-       "TRUE if IMAP response" }},
+       "TRUE if IMAP response", HFILL }},
 
     { &hf_imap_request,
       { "Request",            "imap.request",
        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-       "TRUE if IMAP request" }}
+       "TRUE if IMAP request", HFILL }}
   };
   static gint *ett[] = {
     &ett_imap,
   };
 
   proto_imap = proto_register_protocol("Internet Message Access Protocol", 
-                                      "imap");
+                                      "IMAP", "imap");
   proto_register_field_array(proto_imap, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
@@ -182,5 +182,8 @@ proto_register_imap(void)
 void
 proto_reg_handoff_imap(void)
 {
-  dissector_add("tcp.port", TCP_PORT_IMAP, dissect_imap);
+  dissector_handle_t imap_handle;
+
+  imap_handle = create_dissector_handle(dissect_imap, proto_imap);
+  dissector_add("tcp.port", TCP_PORT_IMAP, imap_handle);
 }