Guy suggested that the dcerpc opnum value_string code could be simplified

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

diff --git a/packet-rsh.c b/packet-rsh.c
index cb3e917693f4e8005fb83eea5cadd7bc68a9b6dd..ca5b6329c01de9a0c505d9b513c15ebefd87f4be 100644 (file)
--- a/packet-rsh.c
+++ b/packet-rsh.c
@@ -4,22 +4,22 @@
  * Robert Tsai <rtsai@netapp.com>
  * Liberally copied from packet-http.c, by Guy Harris <guy@alum.mit.edu>
  *
- * $Id: packet-rsh.c,v 1.15 2002/01/21 07:36:41 guy Exp $
+ * $Id: packet-rsh.c,v 1.20 2002/08/28 21:00:29 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * 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
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * 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.
@@ -29,10 +29,6 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/strutil.h>
@@ -44,7 +40,7 @@ static gint ett_rsh = -1;
 
 #define TCP_PORT_RSH                   514
 
-void
+static void
 dissect_rsh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
        proto_tree      *rsh_tree;
@@ -57,7 +53,7 @@ dissect_rsh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                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. */
-               tvb_find_line_end(tvb, offset, -1, &next_offset);
+               tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
                linelen = next_offset - offset; /* include the line terminator */
 
                /*
@@ -71,8 +67,8 @@ dissect_rsh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                    tvb_format_text(tvb, offset, linelen));
        }
        if (tree) {
-               ti = proto_tree_add_item(tree, proto_rsh, tvb, offset,
-                   tvb_length_remaining(tvb, offset), FALSE);
+               ti = proto_tree_add_item(tree, proto_rsh, tvb, offset, -1,
+                   FALSE);
                rsh_tree = proto_item_add_subtree(ti, ett_rsh);
 
                /*
@@ -82,7 +78,8 @@ dissect_rsh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                        /*
                         * Find the end of the line.
                         */
-                       tvb_find_line_end(tvb, offset, -1, &next_offset);
+                       tvb_find_line_end(tvb, offset, -1, &next_offset,
+                           FALSE);
 
                        /*
                         * Put this line.
@@ -93,11 +90,11 @@ dissect_rsh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                        offset = next_offset;
                }
 
-               if (pinfo->match_port == pinfo->destport) 
-                       proto_tree_add_boolean_hidden(rsh_tree, 
+               if (pinfo->match_port == pinfo->destport)
+                       proto_tree_add_boolean_hidden(rsh_tree,
                            hf_rsh_request, tvb, 0, 0, 1);
                else
-                       proto_tree_add_boolean_hidden(rsh_tree, 
+                       proto_tree_add_boolean_hidden(rsh_tree,
                            hf_rsh_response, tvb, 0, 0, 1);
        }
 }
@@ -108,7 +105,7 @@ proto_register_rsh(void)
 
        static hf_register_info hf[] = {
                { &hf_rsh_response,
-               { "Response",           "rsh.response",  
+               { "Response",           "rsh.response",
                FT_BOOLEAN, BASE_NONE, NULL, 0x0,
                "TRUE if rsh response", HFILL }},
                { &hf_rsh_request,