Require dissectors for all ONC RPC calls and replies.

Either there's a known body for the call or reply, in which case we
already have a dissector for it, or the body is empty, in which case we
now have dissect_rpc_void() to dissect it, or the body is unknown or
nobody's bothered writing it, in which case we use dissect_rpc_unknown()
for now.

This means that an attempt to look up the dissector for a known
procedure will always succeed, so we can label it with the name rather
than with "proc-N".

It also means that we distinguish between "it's void" and "it's
unknown", so that unknown values will get flagged as such.

Change-Id: I748580c1dca61d1f0972396db1a3b0885fc0a541
Reviewed-on: https://code.wireshark.org/review/9699
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 35 insertions, 35 deletions

diff --git a/epan/dissectors/packet-gluster_cli.c b/epan/dissectors/packet-gluster_cli.c
index 2ae565d135..178aed57e8 100644
--- a/epan/dissectors/packet-gluster_cli.c
+++ b/epan/dissectors/packet-gluster_cli.c
@@ -209,41 +209,41 @@ gluster_cli_dissect_common_reply(tvbuff_t *tvb,
 
 /* procedures for GLUSTER_CLI_PROGRAM */
 static const vsff gluster_cli_proc[] = {
-	{ GLUSTER_CLI_NULL,             "NULL",             NULL, NULL },
-	{ GLUSTER_CLI_PROBE,            "PROBE",            NULL, NULL },
-	{ GLUSTER_CLI_DEPROBE,          "DEPROBE",          NULL, NULL },
-	{ GLUSTER_CLI_LIST_FRIENDS,     "LIST_FRIENDS",     NULL, NULL },
-	{ GLUSTER_CLI_CREATE_VOLUME,    "CREATE_VOLUME",    NULL, NULL },
-	{ GLUSTER_CLI_GET_VOLUME,       "GET_VOLUME",       NULL, NULL },
-	{ GLUSTER_CLI_GET_NEXT_VOLUME,  "GET_NEXT_VOLUME",  NULL, NULL },
-	{ GLUSTER_CLI_DELETE_VOLUME,    "DELETE_VOLUME",    NULL, NULL },
-	{ GLUSTER_CLI_START_VOLUME,     "START_VOLUME",     NULL, NULL },
-	{ GLUSTER_CLI_STOP_VOLUME,      "STOP_VOLUME",      NULL, NULL },
-	{ GLUSTER_CLI_RENAME_VOLUME,    "RENAME_VOLUME",    NULL, NULL },
-	{ GLUSTER_CLI_DEFRAG_VOLUME,    "DEFRAG_VOLUME",    NULL, NULL },
-	{ GLUSTER_CLI_SET_VOLUME,       "SET_VOLUME",       NULL, NULL },
-	{ GLUSTER_CLI_ADD_BRICK,        "ADD_BRICK",        NULL, NULL },
-	{ GLUSTER_CLI_REMOVE_BRICK,     "REMOVE_BRICK",     NULL, NULL },
-	{ GLUSTER_CLI_REPLACE_BRICK,    "REPLACE_BRICK",    NULL, NULL },
-	{ GLUSTER_CLI_LOG_FILENAME,     "LOG_FILENAME",     NULL, NULL },
-	{ GLUSTER_CLI_LOG_LOCATE,       "LOG_LOCATE",       NULL, NULL },
-	{ GLUSTER_CLI_LOG_ROTATE,       "LOG_ROTATE",       NULL, NULL },
-	{ GLUSTER_CLI_GETSPEC,          "GETSPEC",          NULL, NULL },
-	{ GLUSTER_CLI_PMAP_PORTBYBRICK, "PMAP_PORTBYBRICK", NULL, NULL },
-	{ GLUSTER_CLI_SYNC_VOLUME,      "SYNC_VOLUME",      NULL, NULL },
-	{ GLUSTER_CLI_RESET_VOLUME,     "RESET_VOLUME",     NULL, NULL },
-	{ GLUSTER_CLI_FSM_LOG,          "FSM_LOG",          NULL, NULL },
-	{ GLUSTER_CLI_GSYNC_SET,        "GSYNC_SET",        NULL, NULL },
-	{ GLUSTER_CLI_PROFILE_VOLUME,   "PROFILE_VOLUME",   NULL, NULL },
-	{ GLUSTER_CLI_QUOTA,            "QUOTA",            NULL, NULL },
-	{ GLUSTER_CLI_TOP_VOLUME,       "TOP_VOLUME",       NULL, NULL },
-	{ GLUSTER_CLI_GETWD,            "GETWD",            NULL, NULL },
-	{ GLUSTER_CLI_LOG_LEVEL,        "LOG_LEVEL",        NULL, NULL },
-	{ GLUSTER_CLI_STATUS_VOLUME,    "STATUS_VOLUME",    NULL, NULL },
-	{ GLUSTER_CLI_MOUNT,            "MOUNT",            NULL, NULL },
-	{ GLUSTER_CLI_UMOUNT,           "UMOUNT",           NULL, NULL },
-	{ GLUSTER_CLI_HEAL_VOLUME,      "HEAL_VOLUME",      NULL, NULL },
-	{ GLUSTER_CLI_STATEDUMP_VOLUME, "STATEDUMP_VOLUME", NULL, NULL },
+	{ GLUSTER_CLI_NULL,             "NULL",             dissect_rpc_void, dissect_rpc_void },
+	{ GLUSTER_CLI_PROBE,            "PROBE",            dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_DEPROBE,          "DEPROBE",          dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_LIST_FRIENDS,     "LIST_FRIENDS",     dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_CREATE_VOLUME,    "CREATE_VOLUME",    dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_GET_VOLUME,       "GET_VOLUME",       dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_GET_NEXT_VOLUME,  "GET_NEXT_VOLUME",  dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_DELETE_VOLUME,    "DELETE_VOLUME",    dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_START_VOLUME,     "START_VOLUME",     dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_STOP_VOLUME,      "STOP_VOLUME",      dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_RENAME_VOLUME,    "RENAME_VOLUME",    dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_DEFRAG_VOLUME,    "DEFRAG_VOLUME",    dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_SET_VOLUME,       "SET_VOLUME",       dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_ADD_BRICK,        "ADD_BRICK",        dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_REMOVE_BRICK,     "REMOVE_BRICK",     dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_REPLACE_BRICK,    "REPLACE_BRICK",    dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_LOG_FILENAME,     "LOG_FILENAME",     dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_LOG_LOCATE,       "LOG_LOCATE",       dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_LOG_ROTATE,       "LOG_ROTATE",       dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_GETSPEC,          "GETSPEC",          dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_PMAP_PORTBYBRICK, "PMAP_PORTBYBRICK", dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_SYNC_VOLUME,      "SYNC_VOLUME",      dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_RESET_VOLUME,     "RESET_VOLUME",     dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_FSM_LOG,          "FSM_LOG",          dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_GSYNC_SET,        "GSYNC_SET",        dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_PROFILE_VOLUME,   "PROFILE_VOLUME",   dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_QUOTA,            "QUOTA",            dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_TOP_VOLUME,       "TOP_VOLUME",       dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_GETWD,            "GETWD",            dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_LOG_LEVEL,        "LOG_LEVEL",        dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_STATUS_VOLUME,    "STATUS_VOLUME",    dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_MOUNT,            "MOUNT",            dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_UMOUNT,           "UMOUNT",           dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_HEAL_VOLUME,      "HEAL_VOLUME",      dissect_rpc_unknown, dissect_rpc_unknown },
+	{ GLUSTER_CLI_STATEDUMP_VOLUME, "STATEDUMP_VOLUME", dissect_rpc_unknown, dissect_rpc_unknown },
 	{ 0, NULL, NULL, NULL }
 };