Include <string.h> to get "strcmp()" declared.

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

diff --git a/packet-yppasswd.c b/packet-yppasswd.c
index 8bc8428235b0fff0cc669c569c3351d248aafea7..832cf35cb784454b9d396caac49e81a927d209c0 100644 (file)
--- a/packet-yppasswd.c
+++ b/packet-yppasswd.c
@@ -1,7 +1,7 @@
 /* packet-yppasswd.c
  * Routines for yppasswd dissection
  *
- * $Id: packet-yppasswd.c,v 1.4 2001/06/18 02:17:58 guy Exp $
+ * $Id: packet-yppasswd.c,v 1.10 2002/11/01 00:48:39 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -27,15 +27,12 @@
 #endif
 
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
 
 #include "packet-rpc.h"
 #include "packet-yppasswd.h"
 
 static int proto_yppasswd = -1;
+static int hf_yppasswd_procedure_v1 = -1;
 static int hf_yppasswd_status = -1;
 static int hf_yppasswd_oldpass = -1;
 static int hf_yppasswd_newpw = -1;
@@ -51,41 +48,41 @@ static gint ett_yppasswd = -1;
 static gint ett_yppasswd_newpw = -1;
 
 static int
-dissect_yppasswd_call(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_yppasswd_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
        proto_item *lock_item = NULL;
        proto_tree *lock_tree = NULL;
 
-       offset = dissect_rpc_string(tvb, pinfo, tree, hf_yppasswd_oldpass, 
+       offset = dissect_rpc_string(tvb, tree, hf_yppasswd_oldpass,
                        offset, NULL);
 
        lock_item = proto_tree_add_item(tree, hf_yppasswd_newpw, tvb,
-                       offset, tvb_length_remaining(tvb, offset), FALSE);
+                       offset, -1, FALSE);
 
        lock_tree = proto_item_add_subtree(lock_item, ett_yppasswd_newpw);
 
-       offset = dissect_rpc_string(tvb, pinfo, lock_tree, 
+       offset = dissect_rpc_string(tvb, lock_tree,
                        hf_yppasswd_newpw_name, offset, NULL);
-       offset = dissect_rpc_string(tvb, pinfo, lock_tree, 
+       offset = dissect_rpc_string(tvb, lock_tree,
                        hf_yppasswd_newpw_passwd, offset, NULL);
-       offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, 
+       offset = dissect_rpc_uint32(tvb, lock_tree,
                        hf_yppasswd_newpw_uid, offset);
-       offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, 
+       offset = dissect_rpc_uint32(tvb, lock_tree,
                        hf_yppasswd_newpw_gid, offset);
-       offset = dissect_rpc_string(tvb, pinfo, lock_tree, 
+       offset = dissect_rpc_string(tvb, lock_tree,
                        hf_yppasswd_newpw_gecos, offset, NULL);
-       offset = dissect_rpc_string(tvb, pinfo, lock_tree, 
+       offset = dissect_rpc_string(tvb, lock_tree,
                        hf_yppasswd_newpw_dir, offset, NULL);
-       offset = dissect_rpc_string(tvb, pinfo, lock_tree, 
+       offset = dissect_rpc_string(tvb, lock_tree,
                        hf_yppasswd_newpw_shell, offset, NULL);
 
        return offset;
 }
 
 static int
-dissect_yppasswd_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_yppasswd_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
-       offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_yppasswd_status, offset);
+       offset = dissect_rpc_uint32(tvb, tree, hf_yppasswd_status, offset);
 
        return offset;
 }
@@ -93,15 +90,25 @@ dissect_yppasswd_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 /* proc number, "proc name", dissect_request, dissect_reply */
 /* NULL as function pointer means: type of arguments is "void". */
 static const vsff yppasswd1_proc[] = {
+       { YPPASSWDPROC_NULL,    "NULL",
+               NULL,           NULL },
        { YPPASSWDPROC_UPDATE,  "UPDATE",
                dissect_yppasswd_call,  dissect_yppasswd_reply },
        { 0,    NULL,           NULL,                           NULL }
 };
+static const value_string yppasswd1_proc_vals[] = {
+       { YPPASSWDPROC_NULL,    "NULL" },
+       { YPPASSWDPROC_UPDATE,  "UPDATE" },
+       { 0,    NULL }
+};
 
 void
 proto_register_yppasswd(void)
 {
        static hf_register_info hf[] = {
+               { &hf_yppasswd_procedure_v1, {
+                       "V1 Procedure", "yppasswd.procedure_v1", FT_UINT32, BASE_DEC,
+                       VALS(yppasswd1_proc_vals), 0, "V1 Procedure", HFILL }},
                { &hf_yppasswd_status, {
                        "status", "yppasswd.status", FT_UINT32, BASE_DEC,
                        NULL, 0, "YPPasswd update status", HFILL }},
@@ -161,6 +168,6 @@ proto_reg_handoff_yppasswd(void)
        /* Register the protocol as RPC */
        rpc_init_prog(proto_yppasswd, YPPASSWD_PROGRAM, ett_yppasswd);
        /* Register the procedure tables */
-       rpc_init_proc_table(YPPASSWD_PROGRAM, 1, yppasswd1_proc);
+       rpc_init_proc_table(YPPASSWD_PROGRAM, 1, yppasswd1_proc, hf_yppasswd_procedure_v1);
 }