GSM A DTAP: add UMTS EVS to supported codecs list IE

[metze/wireshark/wip.git] / epan / dissectors / packet-rstat.c

diff --git a/epan/dissectors/packet-rstat.c b/epan/dissectors/packet-rstat.c
index d5351db83f0bfa07dfaa4d3e7240ebe143080d55..159f5653379fedb08186e4d17b973a828833505d 100644 (file)
--- a/epan/dissectors/packet-rstat.c
+++ b/epan/dissectors/packet-rstat.c
@@ -3,31 +3,15 @@
  *
  * Guy Harris <guy@alum.mit.edu>
  *
- * $Id$
- *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
 
-
-
 #include "packet-rpc.h"
 
 void proto_register_rstat(void);
@@ -48,14 +32,13 @@ static gint ett_rstat = -1;
 #define RSTATPROC_HAVEDISK     2
 
 /* proc number, "proc name", dissect_request, dissect_reply */
-/* NULL as function pointer means: type of arguments is "void". */
 static const vsff rstat1_proc[] = {
        { RSTATPROC_NULL,       "NULL",
-               NULL,   NULL },
+               dissect_rpc_void,       dissect_rpc_void },
        { RSTATPROC_STATS,      "STATS",
-               NULL,   NULL },
+               dissect_rpc_unknown,    dissect_rpc_unknown },
        { RSTATPROC_HAVEDISK,   "HAVEDISK",
-               NULL,   NULL },
+               dissect_rpc_unknown,    dissect_rpc_unknown },
        { 0,    NULL,   NULL,   NULL }
 };
 static const value_string rstat1_proc_vals[] = {
@@ -67,11 +50,11 @@ static const value_string rstat1_proc_vals[] = {
 
 static const vsff rstat2_proc[] = {
        { RSTATPROC_NULL,       "NULL",
-               NULL,   NULL },
+               dissect_rpc_void,       dissect_rpc_void },
        { RSTATPROC_STATS,      "STATS",
-               NULL,   NULL },
+               dissect_rpc_unknown,    dissect_rpc_unknown },
        { RSTATPROC_HAVEDISK,   "HAVEDISK",
-               NULL,   NULL },
+               dissect_rpc_unknown,    dissect_rpc_unknown },
        { 0,    NULL,   NULL,   NULL }
 };
 static const value_string rstat2_proc_vals[] = {
@@ -83,11 +66,11 @@ static const value_string rstat2_proc_vals[] = {
 
 static const vsff rstat3_proc[] = {
        { RSTATPROC_NULL,       "NULL",
-               NULL,   NULL },
+               dissect_rpc_void,       dissect_rpc_void },
        { RSTATPROC_STATS,      "STATS",
-               NULL,   NULL },
+               dissect_rpc_unknown,    dissect_rpc_unknown },
        { RSTATPROC_HAVEDISK,   "HAVEDISK",
-               NULL,   NULL },
+               dissect_rpc_unknown,    dissect_rpc_unknown },
        { 0,    NULL,   NULL,   NULL }
 };
 static const value_string rstat3_proc_vals[] = {
@@ -99,11 +82,11 @@ static const value_string rstat3_proc_vals[] = {
 
 static const vsff rstat4_proc[] = {
        { RSTATPROC_NULL,       "NULL",
-               NULL,   NULL },
+               dissect_rpc_void,       dissect_rpc_void },
        { RSTATPROC_STATS,      "STATS",
-               NULL,   NULL },
+               dissect_rpc_unknown,    dissect_rpc_unknown },
        { RSTATPROC_HAVEDISK,   "HAVEDISK",
-               NULL,   NULL },
+               dissect_rpc_unknown,    dissect_rpc_unknown },
        { 0,    NULL,   NULL,   NULL }
 };
 static const value_string rstat4_proc_vals[] = {
@@ -113,6 +96,13 @@ static const value_string rstat4_proc_vals[] = {
        { 0,    NULL }
 };
 
+static const rpc_prog_vers_info rstat_vers_info[] = {
+       { 1, rstat1_proc, &hf_rstat_procedure_v1 },
+       { 2, rstat2_proc, &hf_rstat_procedure_v2 },
+       { 3, rstat3_proc, &hf_rstat_procedure_v3 },
+       { 4, rstat4_proc, &hf_rstat_procedure_v4 },
+};
+
 void
 proto_register_rstat(void)
 {
@@ -144,10 +134,19 @@ void
 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, 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, rstat4_proc, hf_rstat_procedure_v4);
+       rpc_init_prog(proto_rstat, RSTAT_PROGRAM, ett_rstat,
+           G_N_ELEMENTS(rstat_vers_info), rstat_vers_info);
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */