aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packet-bootparams.c14
-rw-r--r--packet-hclnfsd.c30
-rw-r--r--packet-klm.c15
-rw-r--r--packet-mount.c50
-rw-r--r--packet-nfsacl.c44
-rw-r--r--packet-nfsauth.c18
-rw-r--r--packet-nisplus.c53
-rw-r--r--packet-nlm.c111
-rw-r--r--packet-pcnfsd.c40
-rw-r--r--packet-portmap.c72
-rw-r--r--packet-rquota.c14
-rw-r--r--packet-rstat.c54
-rw-r--r--packet-rwall.c16
-rw-r--r--packet-sadmind.c36
-rw-r--r--packet-spray.c17
-rw-r--r--packet-stat-notify.c15
-rw-r--r--packet-stat.c20
-rw-r--r--packet-ypbind.c26
-rw-r--r--packet-yppasswd.c15
-rw-r--r--packet-yppasswd.h3
-rw-r--r--packet-ypxfr.c17
21 files changed, 594 insertions, 86 deletions
diff --git a/packet-bootparams.c b/packet-bootparams.c
index 6dc983cffd..22f63a650e 100644
--- a/packet-bootparams.c
+++ b/packet-bootparams.c
@@ -1,7 +1,7 @@
/* packet-bootparams.c
* Routines for bootparams dissection
*
- * $Id: packet-bootparams.c,v 1.23 2002/10/23 21:17:01 guy Exp $
+ * $Id: packet-bootparams.c,v 1.24 2002/11/01 00:48:38 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,6 +35,7 @@
#include "packet-bootparams.h"
static int proto_bootparams = -1;
+static int hf_bootparams_procedure_v1 = -1;
static int hf_bootparams_host = -1;
static int hf_bootparams_domain = -1;
static int hf_bootparams_fileid = -1;
@@ -144,11 +145,20 @@ static const vsff bootparams1_proc[] = {
};
/* end of Bootparams version 1 */
+static const value_string bootparams1_proc_vals[] = {
+ { BOOTPARAMSPROC_NULL, "NULL" },
+ { BOOTPARAMSPROC_WHOAMI, "WHOAMI" },
+ { BOOTPARAMSPROC_GETFILE, "GETFILE" },
+ { 0, NULL }
+};
void
proto_register_bootparams(void)
{
static hf_register_info hf[] = {
+ { &hf_bootparams_procedure_v1, {
+ "V1 Procedure", "bootparams.procedure_v1", FT_UINT32, BASE_DEC,
+ VALS(bootparams1_proc_vals), 0, "V1 Procedure", HFILL }},
{ &hf_bootparams_host, {
"Client Host", "bootparams.host", FT_STRING, BASE_DEC,
NULL, 0, "Client Host", HFILL }},
@@ -187,5 +197,5 @@ proto_reg_handoff_bootparams(void)
/* Register the protocol as RPC */
rpc_init_prog(proto_bootparams, BOOTPARAMS_PROGRAM, ett_bootparams);
/* Register the procedure tables */
- rpc_init_proc_table(BOOTPARAMS_PROGRAM, 1, bootparams1_proc, -1);
+ rpc_init_proc_table(BOOTPARAMS_PROGRAM, 1, bootparams1_proc, hf_bootparams_procedure_v1);
}
diff --git a/packet-hclnfsd.c b/packet-hclnfsd.c
index d6b1a22a97..ff662c3f42 100644
--- a/packet-hclnfsd.c
+++ b/packet-hclnfsd.c
@@ -2,7 +2,7 @@
* Routines for hclnfsd (Hummingbird NFS Daemon) dissection
* Copyright 2001, Mike Frisch <frisch@hummingbird.com>
*
- * $Id: packet-hclnfsd.c,v 1.18 2002/10/23 21:17:01 guy Exp $
+ * $Id: packet-hclnfsd.c,v 1.19 2002/11/01 00:48:38 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -36,7 +36,7 @@
#include "packet-hclnfsd.h"
static int proto_hclnfsd = -1;
-
+static int hf_hclnfsd_procedure_v1 = -1;
static int hf_hclnfsd_request_type = -1;
static int hf_hclnfsd_device = -1;
static int hf_hclnfsd_login = -1;
@@ -680,6 +680,27 @@ static const vsff hclnfsd1_proc[] = {
NULL, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string hclnfsd1_proc_vals[] = {
+ { HCLNFSDPROC_NULL, "NULL" },
+ { HCLNFSDPROC_SPOOL_INQUIRE, "SPOOL_INQUIRE" },
+ { HCLNFSDPROC_SPOOL_FILE, "SPOOL_FILE" },
+ { HCLNFSDPROC_AUTHORIZE, "AUTHORIZE" },
+ { HCLNFSDPROC_GRP_NAME_TO_NUMB, "GRP_NAME_TO_NUMB" },
+ { HCLNFSDPROC_GRP_TO_NUMBER, "GRP_TO_NUMBER" },
+ { HCLNFSDPROC_RETURN_HOST, "RETURN_HOST" },
+ { HCLNFSDPROC_UID_TO_NAME, "UID_TO_NAME" },
+ { HCLNFSDPROC_NAME_TO_UID, "NAME_TO_UID" },
+ { HCLNFSDPROC_SHARE, "SHARE" },
+ { HCLNFSDPROC_UNSHARE, "UNSHARE" },
+ { HCLNFSDPROC_LOCK, "LOCK" },
+ { HCLNFSDPROC_REMOVE, "REMOVE" },
+ { HCLNFSDPROC_UNLOCK, "UNLOCK" },
+ { HCLNFSDPROC_GET_PRINTERS, "GET_PRINTERS" },
+ { HCLNFSDPROC_GET_PRINTQ, "GET_PRINTQ" },
+ { HCLNFSDPROC_CANCEL_PRJOB, "CANCEL_PRJOB" },
+ { HCLNFSDPROC_ZAP_LOCKS, "ZAP_LOCKS" },
+ { 0, NULL }
+};
/* end of hclnfsd version 1 */
@@ -687,6 +708,9 @@ void
proto_register_hclnfsd(void)
{
static hf_register_info hf[] = {
+ { &hf_hclnfsd_procedure_v1, {
+ "V1 Procedure", "hclnfsd.procedure_v1", FT_UINT32, BASE_DEC,
+ VALS(hclnfsd1_proc_vals), 0, "V1 Procedure", HFILL }},
{ &hf_hclnfsd_request_type, {
"Request Type", "hclnfsd.request_type", FT_UINT32, BASE_DEC,
VALS(names_request_type), 0, "Request Type", HFILL }},
@@ -851,5 +875,5 @@ proto_reg_handoff_hclnfsd(void)
rpc_init_prog(proto_hclnfsd, HCLNFSD_PROGRAM, ett_hclnfsd);
/* Register the procedure tables */
- rpc_init_proc_table(HCLNFSD_PROGRAM, 1, hclnfsd1_proc, -1);
+ rpc_init_proc_table(HCLNFSD_PROGRAM, 1, hclnfsd1_proc, hf_hclnfsd_procedure_v1);
}
diff --git a/packet-klm.c b/packet-klm.c
index edd71e0a23..482661640d 100644
--- a/packet-klm.c
+++ b/packet-klm.c
@@ -1,7 +1,7 @@
/* packet-klm.c 2001 Ronnie Sahlberg <See AUTHORS for email>
* Routines for klm dissection
*
- * $Id: packet-klm.c,v 1.11 2002/10/23 21:17:01 guy Exp $
+ * $Id: packet-klm.c,v 1.12 2002/11/01 00:48:38 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -33,6 +33,7 @@
#include "packet-klm.h"
static int proto_klm = -1;
+static int hf_klm_procedure_v1 = -1;
static int hf_klm_exclusive = -1;
static int hf_klm_lock = -1;
static int hf_klm_servername = -1;
@@ -188,6 +189,13 @@ static const vsff klm1_proc[] = {
dissect_klm_unlock_call, dissect_klm_stat_reply },
{ 0, NULL, NULL, NULL }
};
+static const value_string klm1_proc_vals[] = {
+ { KLMPROC_TEST, "TEST" },
+ { KLMPROC_LOCK, "LOCK" },
+ { KLMPROC_CANCEL, "CANCEL" },
+ { KLMPROC_UNLOCK, "UNLOCK" },
+ { 0, NULL}
+};
void
proto_register_klm(void)
@@ -196,6 +204,9 @@ proto_register_klm(void)
static struct true_false_string tfs_block = { "Block", "Do not block" };
static hf_register_info hf[] = {
+ { &hf_klm_procedure_v1, {
+ "V1 Procedure", "klm.procedure_v1", FT_UINT32, BASE_DEC,
+ VALS(klm1_proc_vals), 0, "V1 Procedure", HFILL }},
{ &hf_klm_exclusive, {
"exclusive", "klm.exclusive", FT_BOOLEAN, BASE_NONE,
&tfs_exclusive, 0, "Exclusive lock", HFILL }},
@@ -252,5 +263,5 @@ proto_reg_handoff_klm(void)
/* Register the protocol as RPC */
rpc_init_prog(proto_klm, KLM_PROGRAM, ett_klm);
/* Register the procedure tables */
- rpc_init_proc_table(KLM_PROGRAM, 1, klm1_proc, -1);
+ rpc_init_proc_table(KLM_PROGRAM, 1, klm1_proc, hf_klm_procedure_v1);
}
diff --git a/packet-mount.c b/packet-mount.c
index 2049ac8bbf..30c33310da 100644
--- a/packet-mount.c
+++ b/packet-mount.c
@@ -1,7 +1,7 @@
/* packet-mount.c
* Routines for mount dissection
*
- * $Id: packet-mount.c,v 1.34 2002/10/23 21:17:02 guy Exp $
+ * $Id: packet-mount.c,v 1.35 2002/11/01 00:48:38 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -37,6 +37,9 @@
static int proto_mount = -1;
+static int hf_mount_procedure_v1 = -1;
+static int hf_mount_procedure_v2 = -1;
+static int hf_mount_procedure_v3 = -1;
static int hf_mount_path = -1;
static int hf_mount3_status = -1;
static int hf_mount_mountlist_hostname = -1;
@@ -558,6 +561,16 @@ static const vsff mount1_proc[] = {
NULL, dissect_mount_export_reply },
{ 0, NULL, NULL, NULL }
};
+static const value_string mount1_proc_vals[] = {
+ { 0, "NULL" },
+ { MOUNTPROC_MNT, "MNT" },
+ { MOUNTPROC_DUMP, "DUMP" },
+ { MOUNTPROC_UMNT, "UMNT" },
+ { MOUNTPROC_UMNTALL, "UMNTALL" },
+ { MOUNTPROC_EXPORT, "EXPORT" },
+ { MOUNTPROC_EXPORTALL, "EXPORTALL" },
+ { 0, NULL }
+};
/* end of mount version 1 */
@@ -582,6 +595,17 @@ static const vsff mount2_proc[] = {
dissect_mount_dirpath_call, dissect_mount_pathconf_reply },
{ 0, NULL, NULL, NULL }
};
+static const value_string mount2_proc_vals[] = {
+ { 0, "NULL" },
+ { MOUNTPROC_MNT, "MNT" },
+ { MOUNTPROC_DUMP, "DUMP" },
+ { MOUNTPROC_UMNT, "UMNT" },
+ { MOUNTPROC_UMNTALL, "UMNTALL" },
+ { MOUNTPROC_EXPORT, "EXPORT" },
+ { MOUNTPROC_EXPORTALL, "EXPORTALL" },
+ { MOUNTPROC_PATHCONF, "PATHCONF" },
+ { 0, NULL }
+};
/* end of mount version 2 */
@@ -600,6 +624,15 @@ static const vsff mount3_proc[] = {
NULL, dissect_mount_export_reply },
{ 0, NULL, NULL, NULL }
};
+static const value_string mount3_proc_vals[] = {
+ { 0, "NULL" },
+ { MOUNTPROC_MNT, "MNT" },
+ { MOUNTPROC_DUMP, "DUMP" },
+ { MOUNTPROC_UMNT, "UMNT" },
+ { MOUNTPROC_UMNTALL, "UMNTALL" },
+ { MOUNTPROC_EXPORT, "EXPORT" },
+ { 0, NULL }
+};
/* end of Mount protocol version 3 */
@@ -607,6 +640,15 @@ void
proto_register_mount(void)
{
static hf_register_info hf[] = {
+ { &hf_mount_procedure_v1, {
+ "V1 Procedure", "mount.procedure_v1", FT_UINT32, BASE_DEC,
+ VALS(mount1_proc_vals), 0, "V1 Procedure", HFILL }},
+ { &hf_mount_procedure_v2, {
+ "V2 Procedure", "mount.procedure_v2", FT_UINT32, BASE_DEC,
+ VALS(mount2_proc_vals), 0, "V2 Procedure", HFILL }},
+ { &hf_mount_procedure_v3, {
+ "V3 Procedure", "mount.procedure_v3", FT_UINT32, BASE_DEC,
+ VALS(mount3_proc_vals), 0, "V3 Procedure", HFILL }},
{ &hf_mount_path, {
"Path", "mount.path", FT_STRING, BASE_DEC,
NULL, 0, "Path", HFILL }},
@@ -732,7 +774,7 @@ proto_reg_handoff_mount(void)
/* Register the protocol as RPC */
rpc_init_prog(proto_mount, MOUNT_PROGRAM, ett_mount);
/* Register the procedure tables */
- rpc_init_proc_table(MOUNT_PROGRAM, 1, mount1_proc, -1);
- rpc_init_proc_table(MOUNT_PROGRAM, 2, mount2_proc, -1);
- rpc_init_proc_table(MOUNT_PROGRAM, 3, mount3_proc, -1);
+ rpc_init_proc_table(MOUNT_PROGRAM, 1, mount1_proc, hf_mount_procedure_v1);
+ rpc_init_proc_table(MOUNT_PROGRAM, 2, mount2_proc, hf_mount_procedure_v2);
+ rpc_init_proc_table(MOUNT_PROGRAM, 3, mount3_proc, hf_mount_procedure_v3);
}
diff --git a/packet-nfsacl.c b/packet-nfsacl.c
index dc445ed7e6..73ebe68036 100644
--- a/packet-nfsacl.c
+++ b/packet-nfsacl.c
@@ -4,7 +4,7 @@
*
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-nfsacl.c,v 1.4 2002/10/23 21:17:02 guy Exp $
+ * $Id: packet-nfsacl.c,v 1.5 2002/11/01 00:48:38 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,6 +34,9 @@
#include "packet-rpc.h"
static int proto_nfsacl = -1;
+static int hf_nfsacl_procedure_v1 = -1;
+static int hf_nfsacl_procedure_v2 = -1;
+static int hf_nfsacl_procedure_v3 = -1;
static gint ett_nfsacl = -1;
@@ -56,6 +59,11 @@ static const vsff nfsacl1_proc[] = {
NULL, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string nfsacl1_proc_vals[] = {
+ { NFSACLPROC_NULL, "NULL" },
+ { 0, NULL }
+};
+
static const vsff nfsacl2_proc[] = {
{ NFSACLPROC_NULL, "NULL",
@@ -70,6 +78,15 @@ static const vsff nfsacl2_proc[] = {
NULL, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string nfsacl2_proc_vals[] = {
+ { NFSACLPROC_NULL, "NULL" },
+ { NFSACLPROC2_GETACL, "GETACL" },
+ { NFSACLPROC2_SETACL, "SETACL" },
+ { NFSACLPROC2_GETATTR, "GETATTR" },
+ { NFSACLPROC2_ACCESS, "ACCESS" },
+ { 0, NULL }
+};
+
static const vsff nfsacl3_proc[] = {
{ NFSACLPROC_NULL, "NULL",
@@ -80,23 +97,34 @@ static const vsff nfsacl3_proc[] = {
NULL, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string nfsacl3_proc_vals[] = {
+ { NFSACLPROC_NULL, "NULL" },
+ { NFSACLPROC3_GETACL, "GETACL" },
+ { NFSACLPROC3_SETACL, "SETACL" },
+ { 0, NULL }
+};
void
proto_register_nfsacl(void)
{
-#if 0
static hf_register_info hf[] = {
+ { &hf_nfsacl_procedure_v1, {
+ "V1 Procedure", "nfsacl.procedure_v1", FT_UINT32, BASE_DEC,
+ VALS(nfsacl1_proc_vals), 0, "V1 Procedure", HFILL }},
+ { &hf_nfsacl_procedure_v2, {
+ "V2 Procedure", "nfsacl.procedure_v2", FT_UINT32, BASE_DEC,
+ VALS(nfsacl2_proc_vals), 0, "V2 Procedure", HFILL }},
+ { &hf_nfsacl_procedure_v3, {
+ "V3 Procedure", "nfsacl.procedure_v3", FT_UINT32, BASE_DEC,
+ VALS(nfsacl3_proc_vals), 0, "V3 Procedure", HFILL }}
};
-#endif
static gint *ett[] = {
&ett_nfsacl,
};
proto_nfsacl = proto_register_protocol("NFSACL", "NFSACL", "nfsacl");
-#if 0
proto_register_field_array(proto_nfsacl, hf, array_length(hf));
-#endif
proto_register_subtree_array(ett, array_length(ett));
}
@@ -106,7 +134,7 @@ proto_reg_handoff_nfsacl(void)
/* Register the protocol as RPC */
rpc_init_prog(proto_nfsacl, NFSACL_PROGRAM, ett_nfsacl);
/* Register the procedure tables */
- rpc_init_proc_table(NFSACL_PROGRAM, 1, nfsacl1_proc, -1);
- rpc_init_proc_table(NFSACL_PROGRAM, 2, nfsacl2_proc, -1);
- rpc_init_proc_table(NFSACL_PROGRAM, 3, nfsacl3_proc, -1);
+ rpc_init_proc_table(NFSACL_PROGRAM, 1, nfsacl1_proc, hf_nfsacl_procedure_v1);
+ rpc_init_proc_table(NFSACL_PROGRAM, 2, nfsacl2_proc, hf_nfsacl_procedure_v2);
+ rpc_init_proc_table(NFSACL_PROGRAM, 3, nfsacl3_proc, hf_nfsacl_procedure_v3);
}
diff --git a/packet-nfsauth.c b/packet-nfsauth.c
index 593739c6b0..28d7c78e04 100644
--- a/packet-nfsauth.c
+++ b/packet-nfsauth.c
@@ -3,7 +3,7 @@
*
* Ronnie Sahlberg
*
- * $Id: packet-nfsauth.c,v 1.3 2002/10/23 21:17:02 guy Exp $
+ * $Id: packet-nfsauth.c,v 1.4 2002/11/01 00:48:38 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -33,6 +33,7 @@
#include "packet-rpc.h"
static int proto_nfsauth = -1;
+static int hf_nfsauth_procedure_v1 = -1;
static gint ett_nfsauth = -1;
@@ -49,23 +50,28 @@ static const vsff nfsauth1_proc[] = {
NULL, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string nfsauth1_proc_vals[] = {
+ { NFSAUTHPROC_NULL, "NULL" },
+ { NFSAUTH1_ACCESS, "ACCESS" },
+ { 0, NULL }
+};
+
void
proto_register_nfsauth(void)
{
-#if 0
static hf_register_info hf[] = {
+ { &hf_nfsauth_procedure_v1, {
+ "V1 Procedure", "nfsauth.procedure_v1", FT_UINT32, BASE_DEC,
+ VALS(nfsauth1_proc_vals), 0, "V1 Procedure", HFILL }},
};
-#endif
static gint *ett[] = {
&ett_nfsauth,
};
proto_nfsauth = proto_register_protocol("NFSAUTH", "NFSAUTH", "nfsauth");
-#if 0
proto_register_field_array(proto_nfsauth, hf, array_length(hf));
-#endif
proto_register_subtree_array(ett, array_length(ett));
}
@@ -75,5 +81,5 @@ proto_reg_handoff_nfsauth(void)
/* Register the protocol as RPC */
rpc_init_prog(proto_nfsauth, NFSAUTH_PROGRAM, ett_nfsauth);
/* Register the procedure tables */
- rpc_init_proc_table(NFSAUTH_PROGRAM, 1, nfsauth1_proc, -1);
+ rpc_init_proc_table(NFSAUTH_PROGRAM, 1, nfsauth1_proc, hf_nfsauth_procedure_v1);
}
diff --git a/packet-nisplus.c b/packet-nisplus.c
index 13579369cf..f1ab3f06e8 100644
--- a/packet-nisplus.c
+++ b/packet-nisplus.c
@@ -1,7 +1,7 @@
/* packet-nisplus.c
* 2001 Ronnie Sahlberg <See AUTHORS for email>
*
- * $Id: packet-nisplus.c,v 1.14 2002/10/23 21:17:02 guy Exp $
+ * $Id: packet-nisplus.c,v 1.15 2002/11/01 00:48:38 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -32,6 +32,7 @@
#include "packet-nisplus.h"
static int proto_nisplus = -1;
+static int hf_nisplus_procedure_v3 = -1;
static int hf_nisplus_object = -1;
static int hf_nisplus_oid = -1;
static int hf_nisplus_object_ctime = -1;
@@ -1160,6 +1161,32 @@ static const vsff nisplus3_proc[] = {
dissect_nisname, dissect_nisplus_error },
{ 0, NULL, NULL, NULL }
};
+static const value_string nisplus3_proc_vals[] = {
+ { NISPROC_NULL, "NULL" },
+ { NISPROC_LOOKUP, "LOOKUP" },
+ { NISPROC_ADD, "ADD" },
+ { NISPROC_MODIFY, "MODIFY" },
+ { NISPROC_REMOVE, "REMOVE" },
+ { NISPROC_IBLIST, "IBLIST" },
+ { NISPROC_IBADD, "IBADD" },
+ { NISPROC_IBMODIFY, "IBMODIFY" },
+ { NISPROC_IBREMOVE, "IBREMOVE" },
+ { NISPROC_IBFIRST, "IBFIRST" },
+ { NISPROC_IBNEXT, "IBNEXT" },
+ { NISPROC_FINDDIRECTORY, "FINDDIRECTORY" },
+ { NISPROC_STATUS, "STATUS" },
+ { NISPROC_DUMPLOG, "DUMPLOG" },
+ { NISPROC_DUMP, "DUMP" },
+ { NISPROC_CALLBACK, "CALLBACK" },
+ { NISPROC_CPTIME, "CPTIME" },
+ { NISPROC_CHECKPOINT, "CHECKPOINT" },
+ { NISPROC_PING, "PING" },
+ { NISPROC_SERVSTATE, "SERVSTATE" },
+ { NISPROC_MKDIR, "MKDIR" },
+ { NISPROC_RMDIR, "RMDIR" },
+ { NISPROC_UPDKEYS, "UPDKEYS" },
+ { 0, NULL }
+};
@@ -1309,6 +1336,9 @@ proto_register_nis(void)
static hf_register_info hf[] = {
+ { &hf_nisplus_procedure_v3, {
+ "V3 Procedure", "nisplus.procedure_v3", FT_UINT32, BASE_DEC,
+ VALS(nisplus3_proc_vals), 0, "V3 Procedure", HFILL }},
{ &hf_nisplus_object, {
"NIS Object", "nisplus.object", FT_NONE, BASE_NONE,
NULL, 0, "NIS Object", HFILL }},
@@ -1823,7 +1853,7 @@ proto_reg_handoff_nis(void)
/* Register the protocol as RPC */
rpc_init_prog(proto_nisplus, NIS_PROGRAM, ett_nisplus);
/* Register the procedure tables */
- rpc_init_proc_table(NIS_PROGRAM, 3, nisplus3_proc, -1);
+ rpc_init_proc_table(NIS_PROGRAM, 3, nisplus3_proc, hf_nisplus_procedure_v3);
}
@@ -1836,6 +1866,7 @@ proto_reg_handoff_nis(void)
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx */
static int proto_nispluscb = -1;
+static int hf_nispluscb_procedure_v1 = -1;
static int hf_nispluscb_entries = -1;
static int hf_nispluscb_entry = -1;
@@ -1874,19 +1905,29 @@ dissect_cback_data(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
static const vsff cb1_proc[] = {
{ CBPROC_NULL, "NULL",
NULL, NULL },
- { CBPROC_RECEIVE, "NULL",
+ { CBPROC_RECEIVE, "RECEIVE",
dissect_cback_data, dissect_callback_result },
- { CBPROC_FINISH, "NULL",
+ { CBPROC_FINISH, "FINISH",
NULL, NULL },
- { CBPROC_ERROR, "NULL",
+ { CBPROC_ERROR, "ERROR",
dissect_nisplus_error, NULL },
{ 0, NULL, NULL, NULL },
};
+static const value_string nispluscb1_proc_vals[] = {
+ { CBPROC_NULL, "NULL" },
+ { CBPROC_RECEIVE, "RECEIVE" },
+ { CBPROC_FINISH, "FINISH" },
+ { CBPROC_ERROR, "ERROR" },
+ { 0, NULL }
+};
void
proto_register_niscb(void)
{
static hf_register_info hf[] = {
+ { &hf_nispluscb_procedure_v1, {
+ "V1 Procedure", "nispluscb.procedure_v1", FT_UINT32, BASE_DEC,
+ VALS(nispluscb1_proc_vals), 0, "V1 Procedure", HFILL }},
{ &hf_nispluscb_entries, {
"entries", "nispluscb.entries", FT_NONE, BASE_NONE,
NULL, 0, "NIS Callback Entries", HFILL }},
@@ -1914,5 +1955,5 @@ proto_reg_handoff_niscb(void)
/* Register the protocol as RPC */
rpc_init_prog(proto_nispluscb, CB_PROGRAM, ett_nispluscb);
/* Register the procedure tables */
- rpc_init_proc_table(CB_PROGRAM, 1, cb1_proc, -1);
+ rpc_init_proc_table(CB_PROGRAM, 1, cb1_proc, hf_nispluscb_procedure_v1);
}
diff --git a/packet-nlm.c b/packet-nlm.c
index 6201aa0c3c..f597dd44a9 100644
--- a/packet-nlm.c
+++ b/packet-nlm.c
@@ -1,7 +1,7 @@
/* packet-nlm.c
* Routines for nlm dissection
*
- * $Id: packet-nlm.c,v 1.30 2002/10/23 21:17:02 guy Exp $
+ * $Id: packet-nlm.c,v 1.31 2002/11/01 00:48:38 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -57,7 +57,10 @@
*/
static int proto_nlm = -1;
-
+static int hf_nlm_procedure_v1 = -1;
+static int hf_nlm_procedure_v2 = -1;
+static int hf_nlm_procedure_v3 = -1;
+static int hf_nlm_procedure_v4 = -1;
static int hf_nlm_cookie = -1;
static int hf_nlm_block = -1;
static int hf_nlm_exclusive = -1;
@@ -885,6 +888,25 @@ static const vsff nlm1_proc[] = {
{ 0, NULL,
NULL, NULL }
};
+static const value_string nlm1_proc_vals[] = {
+ { NLM_NULL, "NULL" },
+ { NLM_TEST, "TEST" },
+ { NLM_LOCK, "LOCK" },
+ { NLM_CANCEL, "CANCEL" },
+ { NLM_UNLOCK, "UNLOCK" },
+ { NLM_GRANTED, "GRANTED" },
+ { NLM_TEST_MSG, "TEST_MSG" },
+ { NLM_LOCK_MSG, "LOCK_MSG" },
+ { NLM_CANCEL_MSG, "CANCEL_MSG" },
+ { NLM_UNLOCK_MSG, "UNLOCK_MSG" },
+ { NLM_GRANTED_MSG, "GRANTED_MSG" },
+ { NLM_TEST_RES, "TEST_RES" },
+ { NLM_LOCK_RES, "LOCK_RES" },
+ { NLM_CANCEL_RES, "CANCEL_RES" },
+ { NLM_UNLOCK_RES, "UNLOCK_RES" },
+ { NLM_GRANTED_RES, "GRANTED_RES" },
+ { 0, NULL }
+};
/* end of NLM protocol version 1 */
/* NLM protocol version 2 */
@@ -924,6 +946,25 @@ static const vsff nlm2_proc[] = {
{ 0, NULL,
NULL, NULL }
};
+static const value_string nlm2_proc_vals[] = {
+ { NLM_NULL, "NULL" },
+ { NLM_TEST, "TEST" },
+ { NLM_LOCK, "LOCK" },
+ { NLM_CANCEL, "CANCEL" },
+ { NLM_UNLOCK, "UNLOCK" },
+ { NLM_GRANTED, "GRANTED" },
+ { NLM_TEST_MSG, "TEST_MSG" },
+ { NLM_LOCK_MSG, "LOCK_MSG" },
+ { NLM_CANCEL_MSG, "CANCEL_MSG" },
+ { NLM_UNLOCK_MSG, "UNLOCK_MSG" },
+ { NLM_GRANTED_MSG, "GRANTED_MSG" },
+ { NLM_TEST_RES, "TEST_RES" },
+ { NLM_LOCK_RES, "LOCK_RES" },
+ { NLM_CANCEL_RES, "CANCEL_RES" },
+ { NLM_UNLOCK_RES, "UNLOCK_RES" },
+ { NLM_GRANTED_RES, "GRANTED_RES" },
+ { 0, NULL }
+};
/* end of NLM protocol version 2 */
/* NLM protocol version 3 */
@@ -971,6 +1012,29 @@ static const vsff nlm3_proc[] = {
{ 0, NULL,
NULL, NULL }
};
+static const value_string nlm3_proc_vals[] = {
+ { NLM_NULL, "NULL" },
+ { NLM_TEST, "TEST" },
+ { NLM_LOCK, "LOCK" },
+ { NLM_CANCEL, "CANCEL" },
+ { NLM_UNLOCK, "UNLOCK" },
+ { NLM_GRANTED, "GRANTED" },
+ { NLM_TEST_MSG, "TEST_MSG" },
+ { NLM_LOCK_MSG, "LOCK_MSG" },
+ { NLM_CANCEL_MSG, "CANCEL_MSG" },
+ { NLM_UNLOCK_MSG, "UNLOCK_MSG" },
+ { NLM_GRANTED_MSG, "GRANTED_MSG" },
+ { NLM_TEST_RES, "TEST_RES" },
+ { NLM_LOCK_RES, "LOCK_RES" },
+ { NLM_CANCEL_RES, "CANCEL_RES" },
+ { NLM_UNLOCK_RES, "UNLOCK_RES" },
+ { NLM_GRANTED_RES, "GRANTED_RES" },
+ { NLM_SHARE, "SHARE" },
+ { NLM_UNSHARE, "UNSHARE" },
+ { NLM_NM_LOCK, "NM_LOCK" },
+ { NLM_FREE_ALL, "FREE_ALL" },
+ { 0, NULL }
+};
/* end of NLM protocol version 3 */
@@ -1019,6 +1083,29 @@ static const vsff nlm4_proc[] = {
{ 0, NULL,
NULL, NULL }
};
+static const value_string nlm4_proc_vals[] = {
+ { NLM_NULL, "NULL" },
+ { NLM_TEST, "TEST" },
+ { NLM_LOCK, "LOCK" },
+ { NLM_CANCEL, "CANCEL" },
+ { NLM_UNLOCK, "UNLOCK" },
+ { NLM_GRANTED, "GRANTED" },
+ { NLM_TEST_MSG, "TEST_MSG" },
+ { NLM_LOCK_MSG, "LOCK_MSG" },
+ { NLM_CANCEL_MSG, "CANCEL_MSG" },
+ { NLM_UNLOCK_MSG, "UNLOCK_MSG" },
+ { NLM_GRANTED_MSG, "GRANTED_MSG" },
+ { NLM_TEST_RES, "TEST_RES" },
+ { NLM_LOCK_RES, "LOCK_RES" },
+ { NLM_CANCEL_RES, "CANCEL_RES" },
+ { NLM_UNLOCK_RES, "UNLOCK_RES" },
+ { NLM_GRANTED_RES, "GRANTED_RES" },
+ { NLM_SHARE, "SHARE" },
+ { NLM_UNSHARE, "UNSHARE" },
+ { NLM_NM_LOCK, "NM_LOCK" },
+ { NLM_FREE_ALL, "FREE_ALL" },
+ { 0, NULL }
+};
/* end of NLM protocol version 4 */
@@ -1029,6 +1116,18 @@ void
proto_register_nlm(void)
{
static hf_register_info hf[] = {
+ { &hf_nlm_procedure_v1, {
+ "V1 Procedure", "nlm.procedure_v1", FT_UINT32, BASE_DEC,
+ VALS(nlm1_proc_vals), 0, "V1 Procedure", HFILL }},
+ { &hf_nlm_procedure_v2, {
+ "V2 Procedure", "nlm.procedure_v2", FT_UINT32, BASE_DEC,
+ VALS(nlm2_proc_vals), 0, "V2 Procedure", HFILL }},
+ { &hf_nlm_procedure_v3, {
+ "V3 Procedure", "nlm.procedure_v3", FT_UINT32, BASE_DEC,
+ VALS(nlm3_proc_vals), 0, "V3 Procedure", HFILL }},
+ { &hf_nlm_procedure_v4, {
+ "V4 Procedure", "nlm.procedure_v4", FT_UINT32, BASE_DEC,
+ VALS(nlm4_proc_vals), 0, "V4 Procedure", HFILL }},
{ &hf_nlm_cookie, {
"cookie", "nlm.cookie", FT_BYTES, BASE_DEC,
NULL, 0, "cookie", HFILL }},
@@ -1132,8 +1231,8 @@ proto_reg_handoff_nlm(void)
/* Register the protocol as RPC */
rpc_init_prog(proto_nlm, NLM_PROGRAM, ett_nlm);
/* Register the procedure tables */
- rpc_init_proc_table(NLM_PROGRAM, 1, nlm1_proc, -1);
- rpc_init_proc_table(NLM_PROGRAM, 2, nlm2_proc, -1);
- rpc_init_proc_table(NLM_PROGRAM, 3, nlm3_proc, -1);
- rpc_init_proc_table(NLM_PROGRAM, 4, nlm4_proc, -1);
+ rpc_init_proc_table(NLM_PROGRAM, 1, nlm1_proc, hf_nlm_procedure_v1);
+ rpc_init_proc_table(NLM_PROGRAM, 2, nlm2_proc, hf_nlm_procedure_v2);
+ rpc_init_proc_table(NLM_PROGRAM, 3, nlm3_proc, hf_nlm_procedure_v3);
+ rpc_init_proc_table(NLM_PROGRAM, 4, nlm4_proc, hf_nlm_procedure_v4);
}
diff --git a/packet-pcnfsd.c b/packet-pcnfsd.c
index 9f943e061b..1d63c7e798 100644
--- a/packet-pcnfsd.c
+++ b/packet-pcnfsd.c
@@ -1,7 +1,7 @@
/* packet-pcnfsd.c
* Routines for PCNFSD dissection
*
- * $Id: packet-pcnfsd.c,v 1.11 2002/10/23 21:17:02 guy Exp $
+ * $Id: packet-pcnfsd.c,v 1.12 2002/11/01 00:48:38 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -41,7 +41,8 @@ Protocol information comes from the book
#include "packet-pcnfsd.h"
static int proto_pcnfsd = -1;
-
+static int hf_pcnfsd_procedure_v1 = -1;
+static int hf_pcnfsd_procedure_v2 = -1;
static int hf_pcnfsd_auth_client = -1;
static int hf_pcnfsd_auth_ident_obscure = -1;
static int hf_pcnfsd_auth_ident_clear = -1;
@@ -313,6 +314,13 @@ static const vsff pcnfsd1_proc[] = {
{ 3, "PR_START", NULL, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string pcnfsd1_proc_vals[] = {
+ { 0, "NULL" },
+ { 1, "AUTH" },
+ { 2, "PR_INIT" },
+ { 3, "PR_START" },
+ { 0, NULL }
+};
/* end of PCNFS version 1 */
@@ -337,6 +345,24 @@ static const vsff pcnfsd2_proc[] = {
{ 14, "ALERT", NULL, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string pcnfsd2_proc_vals[] = {
+ { 0, "NULL" },
+ { 1, "INFO" },
+ { 2, "PR_INIT" },
+ { 3, "PR_START" },
+ { 4, "PR_LIST" },
+ { 5, "PR_QUEUE" },
+ { 6, "PR_STATUS" },
+ { 7, "PR_CANCEL" },
+ { 8, "PR_ADMIN" },
+ { 9, "PR_REQUEUE" },
+ { 10, "PR_HOLD" },
+ { 11, "PR_RELEASE" },
+ { 12, "MAPID" },
+ { 13, "AUTH" },
+ { 14, "ALERT" },
+ { 0, NULL }
+};
/* end of PCNFS version 2 */
@@ -344,6 +370,12 @@ void
proto_register_pcnfsd(void)
{
static hf_register_info hf[] = {
+ { &hf_pcnfsd_procedure_v1, {
+ "V1 Procedure", "pcnfsd.procedure_v1", FT_UINT32, BASE_DEC,
+ VALS(pcnfsd1_proc_vals), 0, "V1 Procedure", HFILL }},
+ { &hf_pcnfsd_procedure_v2, {
+ "V2 Procedure", "pcnfsd.procedure_v2", FT_UINT32, BASE_DEC,
+ VALS(pcnfsd2_proc_vals), 0, "V2 Procedure", HFILL }},
{ &hf_pcnfsd_auth_client, {
"Authentication Client", "pcnfsd.auth.client", FT_STRING, BASE_DEC,
NULL, 0, "Authentication Client", HFILL }},
@@ -404,7 +436,7 @@ proto_reg_handoff_pcnfsd(void)
/* Register the protocol as RPC */
rpc_init_prog(proto_pcnfsd, PCNFSD_PROGRAM, ett_pcnfsd);
/* Register the procedure tables */
- rpc_init_proc_table(PCNFSD_PROGRAM, 1, pcnfsd1_proc, -1);
- rpc_init_proc_table(PCNFSD_PROGRAM, 2, pcnfsd2_proc, -1);
+ rpc_init_proc_table(PCNFSD_PROGRAM, 1, pcnfsd1_proc, hf_pcnfsd_procedure_v1);
+ rpc_init_proc_table(PCNFSD_PROGRAM, 2, pcnfsd2_proc, hf_pcnfsd_procedure_v2);
}
diff --git a/packet-portmap.c b/packet-portmap.c
index d09f48e952..4463acf12b 100644
--- a/packet-portmap.c
+++ b/packet-portmap.c
@@ -1,7 +1,7 @@
/* packet-portmap.c
* Routines for portmap dissection
*
- * $Id: packet-portmap.c,v 1.40 2002/10/23 21:17:02 guy Exp $
+ * $Id: packet-portmap.c,v 1.41 2002/11/01 00:48:38 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -43,6 +43,10 @@
*/
static int proto_portmap = -1;
+static int hf_portmap_procedure_v1 = -1;
+static int hf_portmap_procedure_v2 = -1;
+static int hf_portmap_procedure_v3 = -1;
+static int hf_portmap_procedure_v4 = -1;
static int hf_portmap_proto = -1;
static int hf_portmap_prog = -1;
static int hf_portmap_proc = -1;
@@ -316,6 +320,15 @@ static const vsff portmap1_proc[] = {
{ PORTMAPPROC_CALLIT, "CALLIT", NULL, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string portmap1_proc_vals[] = {
+ { PORTMAPPROC_NULL, "NULL" },
+ { PORTMAPPROC_SET, "SET" },
+ { PORTMAPPROC_UNSET, "UNSET" },
+ { PORTMAPPROC_GETPORT, "GETPORT" },
+ { PORTMAPPROC_DUMP, "DUMP" },
+ { PORTMAPPROC_CALLIT, "CALLIT" },
+ { 0, NULL }
+};
/* end of Portmap version 1 */
static const vsff portmap2_proc[] = {
@@ -333,6 +346,15 @@ static const vsff portmap2_proc[] = {
dissect_callit_call, dissect_callit_reply },
{ 0, NULL, NULL, NULL }
};
+static const value_string portmap2_proc_vals[] = {
+ { PORTMAPPROC_NULL, "NULL" },
+ { PORTMAPPROC_SET, "SET" },
+ { PORTMAPPROC_UNSET, "UNSET" },
+ { PORTMAPPROC_GETPORT, "GETPORT" },
+ { PORTMAPPROC_DUMP, "DUMP" },
+ { PORTMAPPROC_CALLIT, "CALLIT" },
+ { 0, NULL }
+};
/* end of Portmap version 2 */
@@ -453,6 +475,18 @@ static const vsff portmap3_proc[] = {
NULL, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string portmap3_proc_vals[] = {
+ { RPCBPROC_NULL, "NULL" },
+ { RPCBPROC_SET, "SET" },
+ { RPCBPROC_UNSET, "UNSET" },
+ { RPCBPROC_GETADDR, "GETADDR" },
+ { RPCBPROC_DUMP, "DUMP" },
+ { RPCBPROC_CALLIT, "CALLIT" },
+ { RPCBPROC_GETTIME, "GETTIME" },
+ { RPCBPROC_UADDR2TADDR, "UADDR2TADDR" },
+ { RPCBPROC_TADDR2UADDR, "TADDR2UADDR" },
+ { 0, NULL }
+};
/* end of Portmap version 3 */
@@ -486,12 +520,40 @@ static const vsff portmap4_proc[] = {
NULL, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string portmap4_proc_vals[] = {
+ { RPCBPROC_NULL, "NULL" },
+ { RPCBPROC_SET, "SET" },
+ { RPCBPROC_UNSET, "UNSET" },
+ { RPCBPROC_GETADDR, "GETADDR" },
+ { RPCBPROC_DUMP, "DUMP" },
+ { RPCBPROC_BCAST, "BCAST" },
+ { RPCBPROC_GETTIME, "GETTIME" },
+ { RPCBPROC_UADDR2TADDR, "UADDR2TADDR" },
+ { RPCBPROC_TADDR2UADDR, "TADDR2UADDR" },
+ { RPCBPROC_GETVERSADDR, "GETVERSADDR" },
+ { RPCBPROC_INDIRECT, "INDIRECT" },
+ { RPCBPROC_GETADDRLIST, "GETADDRLIST" },
+ { RPCBPROC_GETSTAT, "GETSTAT" },
+ { 0, NULL }
+};
/* end of Portmap version 4 */
void
proto_register_portmap(void)
{
static hf_register_info hf[] = {
+ { &hf_portmap_procedure_v1, {
+ "V1 Procedure", "portmap.procedure_v1", FT_UINT32, BASE_DEC,
+ VALS(portmap1_proc_vals), 0, "V1 Procedure", HFILL }},
+ { &hf_portmap_procedure_v2, {
+ "V2 Procedure", "portmap.procedure_v2", FT_UINT32, BASE_DEC,
+ VALS(portmap2_proc_vals), 0, "V2 Procedure", HFILL }},
+ { &hf_portmap_procedure_v3, {
+ "V3 Procedure", "portmap.procedure_v3", FT_UINT32, BASE_DEC,
+ VALS(portmap3_proc_vals), 0, "V3 Procedure", HFILL }},
+ { &hf_portmap_procedure_v4, {
+ "V4 Procedure", "portmap.procedure_v4", FT_UINT32, BASE_DEC,
+ VALS(portmap4_proc_vals), 0, "V4 Procedure", HFILL }},
{ &hf_portmap_prog, {
"Program", "portmap.prog", FT_UINT32, BASE_DEC,
NULL, 0, "Program", HFILL }},
@@ -555,10 +617,10 @@ proto_reg_handoff_portmap(void)
/* Register the protocol as RPC */
rpc_init_prog(proto_portmap, PORTMAP_PROGRAM, ett_portmap);
/* Register the procedure tables */
- rpc_init_proc_table(PORTMAP_PROGRAM, 1, portmap1_proc, -1);
- rpc_init_proc_table(PORTMAP_PROGRAM, 2, portmap2_proc, -1);
- rpc_init_proc_table(PORTMAP_PROGRAM, 3, portmap3_proc, -1);
- rpc_init_proc_table(PORTMAP_PROGRAM, 4, portmap4_proc, -1);
+ rpc_init_proc_table(PORTMAP_PROGRAM, 1, portmap1_proc, hf_portmap_procedure_v1);
+ rpc_init_proc_table(PORTMAP_PROGRAM, 2, portmap2_proc, hf_portmap_procedure_v2);
+ rpc_init_proc_table(PORTMAP_PROGRAM, 3, portmap3_proc, hf_portmap_procedure_v3);
+ rpc_init_proc_table(PORTMAP_PROGRAM, 4, portmap4_proc, hf_portmap_procedure_v4);
rpc_handle = find_dissector("rpc");
rpc_tcp_handle = find_dissector("rpc-tcp");
}
diff --git a/packet-rquota.c b/packet-rquota.c
index 4e984c79c4..482c287a2e 100644
--- a/packet-rquota.c
+++ b/packet-rquota.c
@@ -2,7 +2,7 @@
* Routines for rquota dissection
* Copyright 2001, Mike Frisch <frisch@hummingbird.com>
*
- * $Id: packet-rquota.c,v 1.10 2002/10/23 21:17:03 guy Exp $
+ * $Id: packet-rquota.c,v 1.11 2002/11/01 00:48:38 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -35,6 +35,7 @@
#include "packet-rquota.h"
static int proto_rquota = -1;
+static int hf_rquota_procedure_v1 = -1;
static int hf_rquota_pathp = -1;
static int hf_rquota_uid = -1;
static int hf_rquota_status = -1;
@@ -151,6 +152,12 @@ static const vsff rquota1_proc[] = {
{ 0, NULL,
NULL, NULL }
};
+static const value_string rquota1_proc_vals[] = {
+ { RQUOTAPROC_NULL, "NULL" },
+ { RQUOTAPROC_GETQUOTA, "GETQUOTA" },
+ { RQUOTAPROC_GETACTIVEQUOTA, "GETACTIVEQUOTA" },
+ { 0, NULL }
+};
/* end of RQUOTA version 1 */
void
@@ -159,6 +166,9 @@ proto_register_rquota(void)
static struct true_false_string tfs_active = { "Quota is ACTIVE", "Quota is NOT active" };
static hf_register_info hf[] = {
+ { &hf_rquota_procedure_v1, {
+ "V1 Procedure", "rquota.procedure_v1", FT_UINT32, BASE_DEC,
+ VALS(rquota1_proc_vals), 0, "V1 Procedure", HFILL }},
{ &hf_rquota_uid, {
"uid", "rquota.uid", FT_UINT32, BASE_DEC,
NULL, 0, "User ID", HFILL }},
@@ -236,7 +246,7 @@ proto_reg_handoff_rquota(void)
/* Register the protocol as RPC */
rpc_init_prog(proto_rquota, RQUOTA_PROGRAM, ett_rquota);
/* Register the procedure tables */
- rpc_init_proc_table(RQUOTA_PROGRAM, 1, rquota1_proc, -1);
+ rpc_init_proc_table(RQUOTA_PROGRAM, 1, rquota1_proc, hf_rquota_procedure_v1);
}
diff --git a/packet-rstat.c b/packet-rstat.c
index 37851e7126..6fc37d0071 100644
--- a/packet-rstat.c
+++ b/packet-rstat.c
@@ -3,7 +3,7 @@
*
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-rstat.c,v 1.3 2002/10/23 21:17:03 guy Exp $
+ * $Id: packet-rstat.c,v 1.4 2002/11/01 00:48:38 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -33,6 +33,10 @@
#include "packet-rpc.h"
static int proto_rstat = -1;
+static int hf_rstat_procedure_v1 = -1;
+static int hf_rstat_procedure_v2 = -1;
+static int hf_rstat_procedure_v3 = -1;
+static int hf_rstat_procedure_v4 = -1;
static gint ett_rstat = -1;
@@ -53,6 +57,12 @@ static const vsff rstat1_proc[] = {
NULL, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string rstat1_proc_vals[] = {
+ { RSTATPROC_NULL, "NULL" },
+ { RSTATPROC_STATS, "STATS" },
+ { RSTATPROC_HAVEDISK, "HAVEDISK" },
+ { 0, NULL }
+};
static const vsff rstat2_proc[] = {
{ RSTATPROC_NULL, "NULL",
@@ -63,6 +73,12 @@ static const vsff rstat2_proc[] = {
NULL, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string rstat2_proc_vals[] = {
+ { RSTATPROC_NULL, "NULL" },
+ { RSTATPROC_STATS, "STATS" },
+ { RSTATPROC_HAVEDISK, "HAVEDISK" },
+ { 0, NULL }
+};
static const vsff rstat3_proc[] = {
{ RSTATPROC_NULL, "NULL",
@@ -73,6 +89,12 @@ static const vsff rstat3_proc[] = {
NULL, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string rstat3_proc_vals[] = {
+ { RSTATPROC_NULL, "NULL" },
+ { RSTATPROC_STATS, "STATS" },
+ { RSTATPROC_HAVEDISK, "HAVEDISK" },
+ { 0, NULL }
+};
static const vsff rstat4_proc[] = {
{ RSTATPROC_NULL, "NULL",
@@ -83,23 +105,37 @@ static const vsff rstat4_proc[] = {
NULL, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string rstat4_proc_vals[] = {
+ { RSTATPROC_NULL, "NULL" },
+ { RSTATPROC_STATS, "STATS" },
+ { RSTATPROC_HAVEDISK, "HAVEDISK" },
+ { 0, NULL }
+};
void
proto_register_rstat(void)
{
-#if 0
static hf_register_info hf[] = {
+ { &hf_rstat_procedure_v1, {
+ "V1 Procedure", "rstat.procedure_v1", FT_UINT32, BASE_DEC,
+ VALS(rstat1_proc_vals), 0, "V1 Procedure", HFILL }},
+ { &hf_rstat_procedure_v2, {
+ "V2 Procedure", "rstat.procedure_v2", FT_UINT32, BASE_DEC,
+ VALS(rstat2_proc_vals), 0, "V2 Procedure", HFILL }},
+ { &hf_rstat_procedure_v3, {
+ "V3 Procedure", "rstat.procedure_v3", FT_UINT32, BASE_DEC,
+ VALS(rstat3_proc_vals), 0, "V3 Procedure", HFILL }},
+ { &hf_rstat_procedure_v4, {
+ "V4 Procedure", "rstat.procedure_v4", FT_UINT32, BASE_DEC,
+ VALS(rstat4_proc_vals), 0, "V4 Procedure", HFILL }}
};
-#endif
static gint *ett[] = {
&ett_rstat,
};
proto_rstat = proto_register_protocol("RSTAT", "RSTAT", "rstat");
-#if 0
proto_register_field_array(proto_rstat, hf, array_length(hf));
-#endif
proto_register_subtree_array(ett, array_length(ett));
}
@@ -109,8 +145,8 @@ proto_reg_handoff_rstat(void)
/* Register the protocol as RPC */
rpc_init_prog(proto_rstat, RSTAT_PROGRAM, ett_rstat);
/* Register the procedure tables */
- rpc_init_proc_table(RSTAT_PROGRAM, 1, rstat1_proc, -1);
- rpc_init_proc_table(RSTAT_PROGRAM, 2, rstat2_proc, -1);
- rpc_init_proc_table(RSTAT_PROGRAM, 3, rstat3_proc, -1);
- rpc_init_proc_table(RSTAT_PROGRAM, 4, rstat3_proc, -1);
+ rpc_init_proc_table(RSTAT_PROGRAM, 1, rstat1_proc, hf_rstat_procedure_v1);
+ rpc_init_proc_table(RSTAT_PROGRAM, 2, rstat2_proc, hf_rstat_procedure_v2);
+ rpc_init_proc_table(RSTAT_PROGRAM, 3, rstat3_proc, hf_rstat_procedure_v3);
+ rpc_init_proc_table(RSTAT_PROGRAM, 4, rstat3_proc, hf_rstat_procedure_v4);
}
diff --git a/packet-rwall.c b/packet-rwall.c
index 7f29d61871..cf8c2be718 100644
--- a/packet-rwall.c
+++ b/packet-rwall.c
@@ -1,6 +1,6 @@
/* packet-rwall.c
*
- * $Id: packet-rwall.c,v 1.8 2002/10/23 21:17:03 guy Exp $
+ * $Id: packet-rwall.c,v 1.9 2002/11/01 00:48:38 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -31,6 +31,7 @@
#include "packet-rwall.h"
static int proto_rwall = -1;
+static int hf_rwall_procedure_v1 = -1;
static int hf_rwall_message = -1;
static gint ett_rwall = -1;
@@ -43,20 +44,27 @@ dissect_rwall_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree
return offset;
}
-static const vsff rwall_proc[] = {
+static const vsff rwall1_proc[] = {
{ RWALL_WALL, "RWALL",
dissect_rwall_call, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string rwall1_proc_vals[] = {
+ { RWALL_WALL, "RWALL" },
+ { 0, NULL }
+};
void
proto_register_rwall(void)
{
static hf_register_info hf[] = {
+ { &hf_rwall_procedure_v1, {
+ "V1 Procedure", "rwall.procedure_v1", FT_UINT32, BASE_DEC,
+ VALS(rwall1_proc_vals), 0, "V1 Procedure", HFILL }},
{ &hf_rwall_message, {
"Message", "rwall.message", FT_STRING, BASE_DEC,
- NULL, 0, "Message", HFILL }},
+ NULL, 0, "Message", HFILL }}
};
static gint *ett[] = {
@@ -75,7 +83,7 @@ proto_reg_handoff_rwall(void)
/* Register the protocol as RPC */
rpc_init_prog(proto_rwall, RWALL_PROGRAM, ett_rwall);
/* Register the procedure tables */
- rpc_init_proc_table(RWALL_PROGRAM, 1, rwall_proc, -1);
+ rpc_init_proc_table(RWALL_PROGRAM, 1, rwall1_proc, hf_rwall_procedure_v1);
}
diff --git a/packet-sadmind.c b/packet-sadmind.c
index cebcf76ca5..b05bbf23db 100644
--- a/packet-sadmind.c
+++ b/packet-sadmind.c
@@ -3,7 +3,7 @@
*
* Guy Harris <guy@alum.mit.edu>
*
- * $Id: packet-sadmind.c,v 1.3 2002/10/23 21:17:03 guy Exp $
+ * $Id: packet-sadmind.c,v 1.4 2002/11/01 00:48:39 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -33,6 +33,9 @@
#include "packet-rpc.h"
static int proto_sadmind = -1;
+static int hf_sadmind_procedure_v1 = -1;
+static int hf_sadmind_procedure_v2 = -1;
+static int hf_sadmind_procedure_v3 = -1;
static gint ett_sadmind = -1;
@@ -47,35 +50,52 @@ static const vsff sadmind1_proc[] = {
NULL, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string sadmind1_proc_vals[] = {
+ { SADMINDPROC_NULL, "NULL" },
+ { 0, NULL }
+};
static const vsff sadmind2_proc[] = {
{ SADMINDPROC_NULL, "NULL",
NULL, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string sadmind2_proc_vals[] = {
+ { SADMINDPROC_NULL, "NULL" },
+ { 0, NULL }
+};
static const vsff sadmind3_proc[] = {
{ SADMINDPROC_NULL, "NULL",
NULL, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string sadmind3_proc_vals[] = {
+ { SADMINDPROC_NULL, "NULL" },
+ { 0, NULL }
+};
void
proto_register_sadmind(void)
{
-#if 0
static hf_register_info hf[] = {
+ { &hf_sadmind_procedure_v1, {
+ "V1 Procedure", "sadmind.procedure_v1", FT_UINT32, BASE_DEC,
+ VALS(sadmind1_proc_vals), 0, "V1 Procedure", HFILL }},
+ { &hf_sadmind_procedure_v2, {
+ "V2 Procedure", "sadmind.procedure_v2", FT_UINT32, BASE_DEC,
+ VALS(sadmind2_proc_vals), 0, "V2 Procedure", HFILL }},
+ { &hf_sadmind_procedure_v3, {
+ "V3 Procedure", "sadmind.procedure_v3", FT_UINT32, BASE_DEC,
+ VALS(sadmind3_proc_vals), 0, "V3 Procedure", HFILL }}
};
-#endif
static gint *ett[] = {
&ett_sadmind,
};
proto_sadmind = proto_register_protocol("SADMIND", "SADMIND", "sadmind");
-#if 0
proto_register_field_array(proto_sadmind, hf, array_length(hf));
-#endif
proto_register_subtree_array(ett, array_length(ett));
}
@@ -85,7 +105,7 @@ proto_reg_handoff_sadmind(void)
/* Register the protocol as RPC */
rpc_init_prog(proto_sadmind, SADMIND_PROGRAM, ett_sadmind);
/* Register the procedure tables */
- rpc_init_proc_table(SADMIND_PROGRAM, 1, sadmind1_proc, -1);
- rpc_init_proc_table(SADMIND_PROGRAM, 2, sadmind2_proc, -1);
- rpc_init_proc_table(SADMIND_PROGRAM, 3, sadmind3_proc, -1);
+ rpc_init_proc_table(SADMIND_PROGRAM, 1, sadmind1_proc, hf_sadmind_procedure_v1);
+ rpc_init_proc_table(SADMIND_PROGRAM, 2, sadmind2_proc, hf_sadmind_procedure_v2);
+ rpc_init_proc_table(SADMIND_PROGRAM, 3, sadmind3_proc, hf_sadmind_procedure_v3);
}
diff --git a/packet-spray.c b/packet-spray.c
index a1d0975f1c..26f9a9c35d 100644
--- a/packet-spray.c
+++ b/packet-spray.c
@@ -1,7 +1,7 @@
/* packet-spray.c
* 2001 Ronnie Sahlberg <See AUTHORS for email>
*
- * $Id: packet-spray.c,v 1.11 2002/10/23 21:17:03 guy Exp $
+ * $Id: packet-spray.c,v 1.12 2002/11/01 00:48:39 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -32,6 +32,7 @@
#include "packet-spray.h"
static int proto_spray = -1;
+static int hf_spray_procedure_v1 = -1;
static int hf_spray_sprayarr = -1;
static int hf_spray_counter = -1;
static int hf_spray_clock = -1;
@@ -87,11 +88,21 @@ static const vsff spray1_proc[] = {
NULL, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string spray1_proc_vals[] = {
+ { SPRAYPROC_NULL, "NULL" },
+ { SPRAYPROC_SPRAY, "SPRAY" },
+ { SPRAYPROC_GET, "GET" },
+ { SPRAYPROC_CLEAR, "CLEAR" },
+ { 0, NULL }
+};
void
proto_register_spray(void)
{
static hf_register_info hf[] = {
+ { &hf_spray_procedure_v1, {
+ "V1 Procedure", "spray.procedure_v1", FT_UINT32, BASE_DEC,
+ VALS(spray1_proc_vals), 0, "V1 Procedure", HFILL }},
{ &hf_spray_sprayarr, {
"Data", "spray.sprayarr", FT_BYTES, BASE_DEC,
NULL, 0, "Sprayarr data", HFILL }},
@@ -110,7 +121,7 @@ proto_register_spray(void)
{ &hf_spray_usec, {
"usec", "spray.usec", FT_UINT32, BASE_DEC,
- NULL, 0, "Microseconds", HFILL }},
+ NULL, 0, "Microseconds", HFILL }}
};
@@ -131,6 +142,6 @@ proto_reg_handoff_spray(void)
/* Register the protocol as RPC */
rpc_init_prog(proto_spray, SPRAY_PROGRAM, ett_spray);
/* Register the procedure tables */
- rpc_init_proc_table(SPRAY_PROGRAM, 1, spray1_proc, -1);
+ rpc_init_proc_table(SPRAY_PROGRAM, 1, spray1_proc, hf_spray_procedure_v1);
}
diff --git a/packet-stat-notify.c b/packet-stat-notify.c
index 08948153b9..dd0978c78f 100644
--- a/packet-stat-notify.c
+++ b/packet-stat-notify.c
@@ -2,7 +2,7 @@
* Routines for async NSM stat callback dissection
* 2001 Ronnie Sahlberg <See AUTHORS for email>
*
- * $Id: packet-stat-notify.c,v 1.12 2002/10/23 21:17:03 guy Exp $
+ * $Id: packet-stat-notify.c,v 1.13 2002/11/01 00:48:39 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -32,6 +32,7 @@
#include "packet-stat-notify.h"
static int proto_statnotify = -1;
+static int hf_statnotify_procedure_v1 = -1;
static int hf_statnotify_name = -1;
static int hf_statnotify_state = -1;
static int hf_statnotify_priv = -1;
@@ -56,12 +57,17 @@ dissect_statnotify_mon(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_
/* proc number, "proc name", dissect_request, dissect_reply */
/* NULL as function pointer means: type of arguments is "void". */
-static const vsff statnotify_proc[] = {
+static const vsff statnotify1_proc[] = {
{ 0, "NULL", NULL, NULL },
{ STATNOTIFYPROC_MON, "MON-CALLBACK",
dissect_statnotify_mon, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string statnotify1_proc_vals[] = {
+ { 0, "NULL" },
+ { STATNOTIFYPROC_MON, "MON-CALLBACK" },
+ { 0, NULL }
+};
/* end of stat-notify version 1 */
@@ -69,6 +75,9 @@ void
proto_register_statnotify(void)
{
static hf_register_info hf[] = {
+ { &hf_statnotify_procedure_v1, {
+ "V1 Procedure", "statnotify.procedure_v1", FT_UINT32, BASE_DEC,
+ VALS(statnotify1_proc_vals), 0, "V1 Procedure", HFILL }},
{ &hf_statnotify_name, {
"Name", "statnotify.name", FT_STRING, BASE_DEC,
NULL, 0, "Name of client that changed", HFILL }},
@@ -95,5 +104,5 @@ proto_reg_handoff_statnotify(void)
/* Register the protocol as RPC */
rpc_init_prog(proto_statnotify, STATNOTIFY_PROGRAM, ett_statnotify);
/* Register the procedure tables */
- rpc_init_proc_table(STATNOTIFY_PROGRAM, 1, statnotify_proc, -1);
+ rpc_init_proc_table(STATNOTIFY_PROGRAM, 1, statnotify1_proc, hf_statnotify_procedure_v1);
}
diff --git a/packet-stat.c b/packet-stat.c
index 0eb02a262a..c8616e5fdf 100644
--- a/packet-stat.c
+++ b/packet-stat.c
@@ -1,7 +1,7 @@
/* packet-stat.c
* Routines for stat dissection
*
- * $Id: packet-stat.c,v 1.18 2002/10/23 21:17:03 guy Exp $
+ * $Id: packet-stat.c,v 1.19 2002/11/01 00:48:39 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -36,6 +36,7 @@
#include "packet-stat.h"
static int proto_stat = -1;
+static int hf_stat_procedure_v1 = -1;
static int hf_stat_mon_name = -1;
static int hf_stat_stat_res = -1;
static int hf_stat_stat_res_res = -1;
@@ -247,7 +248,7 @@ dissect_stat_umon_all(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t
/* proc number, "proc name", dissect_request, dissect_reply */
/* NULL as function pointer means: type of arguments is "void". */
-static const vsff stat_proc[] = {
+static const vsff stat1_proc[] = {
{ 0, "NULL", NULL, NULL },
{ STATPROC_STAT, "STAT",
dissect_stat_stat, dissect_stat_stat_res },
@@ -263,6 +264,16 @@ static const vsff stat_proc[] = {
dissect_stat_notify, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string stat1_proc_vals[] = {
+ { 0, "NULL" },
+ { STATPROC_STAT, "STAT" },
+ { STATPROC_MON, "MON" },
+ { STATPROC_UNMON, "UNMON" },
+ { STATPROC_UNMON_ALL, "UNMON_ALL" },
+ { STATPROC_SIMU_CRASH, "SIMU_CRASH" },
+ { STATPROC_NOTIFY, "NOTIFY" },
+ { 0, NULL }
+};
/* end of stat version 1 */
@@ -270,6 +281,9 @@ void
proto_register_stat(void)
{
static hf_register_info hf[] = {
+ { &hf_stat_procedure_v1, {
+ "V1 Procedure", "stat.procedure_v1", FT_UINT32, BASE_DEC,
+ VALS(stat1_proc_vals), 0, "V1 Procedure", HFILL }},
{ &hf_stat_mon_name, {
"Name", "stat.name", FT_STRING, BASE_DEC,
NULL, 0, "Name", HFILL }},
@@ -333,5 +347,5 @@ proto_reg_handoff_stat(void)
/* Register the protocol as RPC */
rpc_init_prog(proto_stat, STAT_PROGRAM, ett_stat);
/* Register the procedure tables */
- rpc_init_proc_table(STAT_PROGRAM, 1, stat_proc, -1);
+ rpc_init_proc_table(STAT_PROGRAM, 1, stat1_proc, hf_stat_procedure_v1);
}
diff --git a/packet-ypbind.c b/packet-ypbind.c
index f815d5bba1..320eaf6d95 100644
--- a/packet-ypbind.c
+++ b/packet-ypbind.c
@@ -1,7 +1,7 @@
/* packet-ypbind.c
* Routines for ypbind dissection
*
- * $Id: packet-ypbind.c,v 1.14 2002/10/23 21:17:03 guy Exp $
+ * $Id: packet-ypbind.c,v 1.15 2002/11/01 00:48:39 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -36,6 +36,8 @@
#include "packet-ypbind.h"
static int proto_ypbind = -1;
+static int hf_ypbind_procedure_v1 = -1;
+static int hf_ypbind_procedure_v2 = -1;
static int hf_ypbind_domain = -1;
static int hf_ypbind_resp_type = -1;
static int hf_ypbind_error = -1;
@@ -138,6 +140,12 @@ static const vsff ypbind1_proc[] = {
{ YPBINDPROC_SETDOM, "SETDOMAIN", NULL, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string ypbind1_proc_vals[] = {
+ { YPBINDPROC_NULL, "NULL" },
+ { YPBINDPROC_DOMAIN, "DOMAIN" },
+ { YPBINDPROC_SETDOM, "SETDOMAIN" },
+ { 0, NULL }
+};
/* end of YPBind version 1 */
static const vsff ypbind2_proc[] = {
@@ -148,6 +156,12 @@ static const vsff ypbind2_proc[] = {
dissect_ypbind_setdomain_v2_request, NULL},
{ 0, NULL, NULL, NULL }
};
+static const value_string ypbind2_proc_vals[] = {
+ { YPBINDPROC_NULL, "NULL" },
+ { YPBINDPROC_DOMAIN, "DOMAIN" },
+ { YPBINDPROC_SETDOM, "SETDOMAIN" },
+ { 0, NULL }
+};
/* end of YPBind version 2 */
@@ -155,6 +169,12 @@ void
proto_register_ypbind(void)
{
static hf_register_info hf[] = {
+ { &hf_ypbind_procedure_v1, {
+ "V1 Procedure", "ypbind.procedure_v1", FT_UINT32, BASE_DEC,
+ VALS(ypbind1_proc_vals), 0, "V1 Procedure", HFILL }},
+ { &hf_ypbind_procedure_v2, {
+ "V2 Procedure", "ypbind.procedure_v2", FT_UINT32, BASE_DEC,
+ VALS(ypbind2_proc_vals), 0, "V2 Procedure", HFILL }},
{ &hf_ypbind_domain, {
"Domain", "ypbind.domain", FT_STRING, BASE_DEC,
NULL, 0, "Name of the NIS/YP Domain", HFILL }},
@@ -197,6 +217,6 @@ proto_reg_handoff_ypbind(void)
/* Register the protocol as RPC */
rpc_init_prog(proto_ypbind, YPBIND_PROGRAM, ett_ypbind);
/* Register the procedure tables */
- rpc_init_proc_table(YPBIND_PROGRAM, 1, ypbind1_proc, -1);
- rpc_init_proc_table(YPBIND_PROGRAM, 2, ypbind2_proc, -1);
+ rpc_init_proc_table(YPBIND_PROGRAM, 1, ypbind1_proc, hf_ypbind_procedure_v1);
+ rpc_init_proc_table(YPBIND_PROGRAM, 2, ypbind2_proc, hf_ypbind_procedure_v2);
}
diff --git a/packet-yppasswd.c b/packet-yppasswd.c
index c2f5884aa1..832cf35cb7 100644
--- 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.9 2002/10/23 21:17:03 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>
@@ -32,6 +32,7 @@
#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;
@@ -89,15 +90,25 @@ dissect_yppasswd_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_
/* 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 }},
@@ -157,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, -1);
+ rpc_init_proc_table(YPPASSWD_PROGRAM, 1, yppasswd1_proc, hf_yppasswd_procedure_v1);
}
diff --git a/packet-yppasswd.h b/packet-yppasswd.h
index ce8b26332c..7246a8dfb3 100644
--- a/packet-yppasswd.h
+++ b/packet-yppasswd.h
@@ -1,6 +1,6 @@
/* packet-yppasswd.h
*
- * $Id: packet-yppasswd.h,v 1.3 2002/08/28 21:00:40 jmayer Exp $
+ * $Id: packet-yppasswd.h,v 1.4 2002/11/01 00:48:39 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -24,6 +24,7 @@
#ifndef PACKET_YPPASSWD_H
#define PACKET_YPPASSWD_H
+#define YPPASSWDPROC_NULL 0
#define YPPASSWDPROC_UPDATE 1
#define YPPASSWD_PROGRAM 100009
diff --git a/packet-ypxfr.c b/packet-ypxfr.c
index deb20a37c9..b478f82f3e 100644
--- a/packet-ypxfr.c
+++ b/packet-ypxfr.c
@@ -1,7 +1,7 @@
/* packet-ypxfr.c
* Routines for ypxfr dissection
*
- * $Id: packet-ypxfr.c,v 1.8 2002/10/23 21:17:03 guy Exp $
+ * $Id: packet-ypxfr.c,v 1.9 2002/11/01 00:48:39 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -34,6 +34,7 @@
#include "packet-ypxfr.h"
static int proto_ypxfr = -1;
+static int hf_ypxfr_procedure_v1 = -1;
static gint ett_ypxfr = -1;
@@ -44,17 +45,29 @@ static const vsff ypxfr1_proc[] = {
{ YPXFRPROC_GETMAP, "GETMAP", NULL, NULL },
{ 0, NULL, NULL, NULL }
};
+static const value_string ypxfr1_proc_vals[] = {
+ { YPXFRPROC_NULL, "NULL" },
+ { YPXFRPROC_GETMAP, "GETMAP" },
+ { 0, NULL }
+};
/* end of YPXFR version 1 */
void
proto_register_ypxfr(void)
{
+ static hf_register_info hf[] = {
+ { &hf_ypxfr_procedure_v1, {
+ "V1 Procedure", "ypxfr.procedure_v1", FT_UINT32, BASE_DEC,
+ VALS(ypxfr1_proc_vals), 0, "V1 Procedure", HFILL }}
+ };
+
static gint *ett[] = {
&ett_ypxfr
};
proto_ypxfr = proto_register_protocol("Yellow Pages Transfer",
"YPXFR", "ypxfr");
+ proto_register_field_array(proto_ypxfr, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
@@ -64,5 +77,5 @@ proto_reg_handoff_ypxfr(void)
/* Register the protocol as RPC */
rpc_init_prog(proto_ypxfr, YPXFR_PROGRAM, ett_ypxfr);
/* Register the procedure tables */
- rpc_init_proc_table(YPXFR_PROGRAM, 1, ypxfr1_proc, -1);
+ rpc_init_proc_table(YPXFR_PROGRAM, 1, ypxfr1_proc, hf_ypxfr_procedure_v1);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 05:44:24 +0000