CRLDP support, and assorted byg fixes, from Michael Rozhavsky.

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

diff --git a/packet-rsh.c b/packet-rsh.c
index 94910013858fccc9f9cf3192a16f64eb904bd2d6..f604edf81b9821d0ee228d2d16aa8bbf2c097ab9 100644 (file)
--- a/packet-rsh.c
+++ b/packet-rsh.c
@@ -4,12 +4,11 @@
  * Robert Tsai <rtsai@netapp.com>
  * Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu>
  *
- * $Id: packet-rsh.c,v 1.2 2000/08/12 12:56:23 deniel Exp $
+ * $Id: packet-rsh.c,v 1.17 2002/04/14 23:04:04 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
- *
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,8 +23,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- *
  */
 
 #ifdef HAVE_CONFIG_H
@@ -37,7 +34,8 @@
 #endif
 
 #include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
+#include <epan/strutil.h>
 
 static int proto_rsh = -1;
 static int hf_rsh_response = -1;
@@ -46,56 +44,61 @@ static gint ett_rsh = -1;
 
 #define TCP_PORT_RSH                   514
 
-void
-dissect_rsh(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
+static void
+dissect_rsh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-       proto_item      *ti;
        proto_tree      *rsh_tree;
-       const u_char    *data, *dataend;
-       const u_char    *lineend, *eol;
+       proto_item      *ti;
+       gint            offset = 0;
+       gint            next_offset;
        int             linelen;
 
-       data = &pd[offset];
-       dataend = data + END_OF_FRAME;
-
-       if (check_col(fd, COL_PROTOCOL))
-               col_add_str(fd, COL_PROTOCOL, "RSH");
-       if (check_col(fd, COL_INFO)) {
+       if (check_col(pinfo->cinfo, COL_PROTOCOL))
+               col_set_str(pinfo->cinfo, COL_PROTOCOL, "RSH");
+       if (check_col(pinfo->cinfo, COL_INFO)) {
                /* Put the first line from the buffer into the summary. */
-               lineend = find_line_end(data, dataend, &eol);
-               linelen = lineend - data;
-               col_add_str(fd, COL_INFO, format_text(data, linelen));
+               tvb_find_line_end(tvb, offset, -1, &next_offset);
+               linelen = next_offset - offset; /* include the line terminator */
+
+               /*
+                * Make sure the line terminator isn't past the end of
+                * the captured data in the packet, so we don't throw
+                * an exception in the "tvb_get_ptr()" call.
+                */
+               if (linelen > (int) tvb_length(tvb))
+                       linelen = tvb_length(tvb);
+               col_add_str(pinfo->cinfo, COL_INFO,
+                   tvb_format_text(tvb, offset, linelen));
        }
        if (tree) {
-               ti = proto_tree_add_item(tree, proto_rsh, NullTVB, offset,
-                       END_OF_FRAME, FALSE);
+               ti = proto_tree_add_item(tree, proto_rsh, tvb, offset, -1,
+                   FALSE);
                rsh_tree = proto_item_add_subtree(ti, ett_rsh);
 
-               while (data < dataend) {
+               /*
+                * Process the packet data, a line at a time.
+                */
+               while (tvb_offset_exists(tvb, offset)) {
                        /*
                         * Find the end of the line.
                         */
-                       lineend = find_line_end(data, dataend, &eol);
-                       linelen = lineend - data;
+                       tvb_find_line_end(tvb, offset, -1, &next_offset);
 
                        /*
                         * Put this line.
                         */
-                       proto_tree_add_text(rsh_tree, NullTVB, offset,
-                               linelen, "%s", format_text(data, linelen));
-                       offset += linelen;
-                       data = lineend;
+                       proto_tree_add_text(rsh_tree, tvb, offset,
+                           next_offset - offset, "%s",
+                           tvb_format_text(tvb, offset, next_offset - offset));
+                       offset = next_offset;
                }
 
-               if (pi.match_port == pi.destport) 
+               if (pinfo->match_port == pinfo->destport) 
                        proto_tree_add_boolean_hidden(rsh_tree, 
-                                                     hf_rsh_request, NullTVB, 0, 0, 1);
+                           hf_rsh_request, tvb, 0, 0, 1);
                else
                        proto_tree_add_boolean_hidden(rsh_tree, 
-                                                     hf_rsh_response, NullTVB, 0, 0, 1);
-
-               if (data < dataend)
-                       old_dissect_data(&pd[offset], offset, fd, rsh_tree);
+                           hf_rsh_response, tvb, 0, 0, 1);
        }
 }
 
@@ -107,18 +110,18 @@ proto_register_rsh(void)
                { &hf_rsh_response,
                { "Response",           "rsh.response",  
                FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-               "TRUE if rsh response" }},
+               "TRUE if rsh response", HFILL }},
                { &hf_rsh_request,
                { "Request",            "rsh.request",
                FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-               "TRUE if rsh request" }},
+               "TRUE if rsh request", HFILL }},
        };
 
        static gint *ett[] = {
                &ett_rsh,
        };
 
-       proto_rsh = proto_register_protocol("Remote Shell", "rsh");
+       proto_rsh = proto_register_protocol("Remote Shell", "RSH", "rsh");
        proto_register_field_array(proto_rsh, hf, array_length(hf));
        proto_register_subtree_array(ett, array_length(ett));
 }
@@ -126,5 +129,8 @@ proto_register_rsh(void)
 void
 proto_reg_handoff_rsh(void)
 {
-       old_dissector_add("tcp.port", TCP_PORT_RSH, dissect_rsh);
+       dissector_handle_t rsh_handle;
+
+       rsh_handle = create_dissector_handle(dissect_rsh, proto_rsh);
+       dissector_add("tcp.port", TCP_PORT_RSH, rsh_handle);
 }