The Q.932 dissector doesn't need to include <string.h>; the Q.932 ROS

dissector does.

The fix to the Makefile to generate packet-q932-ros.c changed the
protocol name in some cases; change it uniformly.

svn path=/trunk/; revision=21622

4 files changed, 51 insertions, 51 deletions

diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c
index c0b70256da..e25745952b 100644
--- a/epan/dissectors/packet-q932-ros.c
+++ b/epan/dissectors/packet-q932-ros.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
-/* .\packet-q932-ros.c                                                        */
-/* ../../tools/asn2wrs.py -b -T -p q932.ros -c q932-ros.cnf -o q932-ros -s packet-q932-ros-template q932-ros.asn */
+/* ./packet-q932-ros.c                                                        */
+/* ../../tools/asn2wrs.py -b -T -e -p q932-ros -c q932-ros.cnf -s packet-q932-ros-template q932-ros.asn */
 
 /* Input file: packet-q932-ros-template.c */
 
@@ -35,6 +35,8 @@
 # include "config.h"
 #endif
 
+#include <string.h>
+
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/strutil.h>
@@ -44,8 +46,8 @@
 #include "packet-q932-ros.h"
 
 #define PNAME  "Q.932 Operations Service Element"
-#define PSNAME "Q932.ROS"
-#define PFNAME "q932.ros"
+#define PSNAME "Q932-ROS"
+#define PFNAME "q932-ros"
 
 /* Initialize the protocol and registered fields */
 int proto_rose = -1;
@@ -77,7 +79,7 @@ static int hf_q932_ros_returnErrorProblem = -1;   /* ReturnErrorProblem */
 static int hf_q932_ros_present = -1;              /* INTEGER */
 
 /*--- End of included file: packet-q932-ros-hf.c ---*/
-#line 45 "packet-q932-ros-template.c"
+#line 47 "packet-q932-ros-template.c"
 
 /* Initialize the subtree pointers */
 
@@ -95,7 +97,7 @@ static gint ett_q932_ros_T_problem = -1;
 static gint ett_q932_ros_InvokeId = -1;
 
 /*--- End of included file: packet-q932-ros-ett.c ---*/
-#line 48 "packet-q932-ros-template.c"
+#line 50 "packet-q932-ros-template.c"
 
 /* Preferences */
 
@@ -706,7 +708,7 @@ static int dissect_RoseAPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
 
 
 /*--- End of included file: packet-q932-ros-fn.c ---*/
-#line 66 "packet-q932-ros-template.c"
+#line 68 "packet-q932-ros-template.c"
 
 /*--- dissect_rose_apdu -----------------------------------------------------*/
 int dissect_rose_apdu(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, rose_context *rctx) {
@@ -724,100 +726,100 @@ void proto_register_rose(void) {
 /*--- Included file: packet-q932-ros-hfarr.c ---*/
 #line 1 "packet-q932-ros-hfarr.c"
     { &hf_q932_ros_RoseAPDU_PDU,
-      { "RoseAPDU", "q932.ros.RoseAPDU",
+      { "RoseAPDU", "q932-ros.RoseAPDU",
         FT_UINT32, BASE_DEC, VALS(q932_ros_RoseAPDU_vals), 0,
         "q932_ros.RoseAPDU", HFILL }},
     { &hf_q932_ros_local,
-      { "local", "q932.ros.local",
+      { "local", "q932-ros.local",
         FT_INT32, BASE_DEC, NULL, 0,
         "q932_ros.T_local", HFILL }},
     { &hf_q932_ros_global,
-      { "global", "q932.ros.global",
+      { "global", "q932-ros.global",
         FT_OID, BASE_NONE, NULL, 0,
         "q932_ros.T_global", HFILL }},
     { &hf_q932_ros_invoke,
-      { "invoke", "q932.ros.invoke",
+      { "invoke", "q932-ros.invoke",
         FT_NONE, BASE_NONE, NULL, 0,
         "q932_ros.Invoke", HFILL }},
     { &hf_q932_ros_returnResult,
-      { "returnResult", "q932.ros.returnResult",
+      { "returnResult", "q932-ros.returnResult",
         FT_NONE, BASE_NONE, NULL, 0,
         "q932_ros.ReturnResult", HFILL }},
     { &hf_q932_ros_returnError,
-      { "returnError", "q932.ros.returnError",
+      { "returnError", "q932-ros.returnError",
         FT_NONE, BASE_NONE, NULL, 0,
         "q932_ros.ReturnError", HFILL }},
     { &hf_q932_ros_reject,
-      { "reject", "q932.ros.reject",
+      { "reject", "q932-ros.reject",
         FT_NONE, BASE_NONE, NULL, 0,
         "q932_ros.Reject", HFILL }},
     { &hf_q932_ros_invokeId,
-      { "invokeId", "q932.ros.invokeId",
+      { "invokeId", "q932-ros.invokeId",
         FT_UINT32, BASE_DEC, VALS(q932_ros_InvokeId_vals), 0,
         "q932_ros.InvokeId", HFILL }},
     { &hf_q932_ros_linkedId,
-      { "linkedId", "q932.ros.linkedId",
+      { "linkedId", "q932-ros.linkedId",
         FT_UINT32, BASE_DEC, VALS(q932_ros_T_linkedId_vals), 0,
         "q932_ros.T_linkedId", HFILL }},
     { &hf_q932_ros_linkedIdPresent,
-      { "present", "q932.ros.present",
+      { "present", "q932-ros.present",
         FT_UINT32, BASE_DEC, VALS(q932_ros_InvokeId_vals), 0,
         "q932_ros.InvokeId", HFILL }},
     { &hf_q932_ros_absent,
-      { "absent", "q932.ros.absent",
+      { "absent", "q932-ros.absent",
         FT_NONE, BASE_NONE, NULL, 0,
         "q932_ros.NULL", HFILL }},
     { &hf_q932_ros_opcode,
-      { "opcode", "q932.ros.opcode",
+      { "opcode", "q932-ros.opcode",
         FT_UINT32, BASE_DEC, VALS(q932_ros_Code_vals), 0,
         "q932_ros.Code", HFILL }},
     { &hf_q932_ros_argument,
-      { "argument", "q932.ros.argument",
+      { "argument", "q932-ros.argument",
         FT_BYTES, BASE_HEX, NULL, 0,
         "q932_ros.InvokeArgument", HFILL }},
     { &hf_q932_ros_result,
-      { "result", "q932.ros.result",
+      { "result", "q932-ros.result",
         FT_NONE, BASE_NONE, NULL, 0,
         "q932_ros.T_result", HFILL }},
     { &hf_q932_ros_resultArgument,
-      { "result", "q932.ros.result",
+      { "result", "q932-ros.result",
         FT_BYTES, BASE_HEX, NULL, 0,
         "q932_ros.ResultArgument", HFILL }},
     { &hf_q932_ros_errcode,
-      { "errcode", "q932.ros.errcode",
+      { "errcode", "q932-ros.errcode",
         FT_UINT32, BASE_DEC, VALS(q932_ros_Code_vals), 0,
         "q932_ros.Code", HFILL }},
     { &hf_q932_ros_parameter,
-      { "parameter", "q932.ros.parameter",
+      { "parameter", "q932-ros.parameter",
         FT_BYTES, BASE_HEX, NULL, 0,
         "q932_ros.T_parameter", HFILL }},
     { &hf_q932_ros_problem,
-      { "problem", "q932.ros.problem",
+      { "problem", "q932-ros.problem",
         FT_UINT32, BASE_DEC, VALS(q932_ros_T_problem_vals), 0,
         "q932_ros.T_problem", HFILL }},
     { &hf_q932_ros_general,
-      { "general", "q932.ros.general",
+      { "general", "q932-ros.general",
         FT_INT32, BASE_DEC, VALS(q932_ros_GeneralProblem_vals), 0,
         "q932_ros.GeneralProblem", HFILL }},
     { &hf_q932_ros_invokeProblem,
-      { "invoke", "q932.ros.invoke",
+      { "invoke", "q932-ros.invoke",
         FT_INT32, BASE_DEC, VALS(q932_ros_InvokeProblem_vals), 0,
         "q932_ros.InvokeProblem", HFILL }},
     { &hf_q932_ros_returnResultProblem,
-      { "returnResult", "q932.ros.returnResult",
+      { "returnResult", "q932-ros.returnResult",
         FT_INT32, BASE_DEC, VALS(q932_ros_ReturnResultProblem_vals), 0,
         "q932_ros.ReturnResultProblem", HFILL }},
     { &hf_q932_ros_returnErrorProblem,
-      { "returnError", "q932.ros.returnError",
+      { "returnError", "q932-ros.returnError",
         FT_INT32, BASE_DEC, VALS(q932_ros_ReturnErrorProblem_vals), 0,
         "q932_ros.ReturnErrorProblem", HFILL }},
     { &hf_q932_ros_present,
-      { "present", "q932.ros.present",
+      { "present", "q932-ros.present",
         FT_INT32, BASE_DEC, NULL, 0,
         "q932_ros.INTEGER", HFILL }},
 
 /*--- End of included file: packet-q932-ros-hfarr.c ---*/
-#line 80 "packet-q932-ros-template.c"
+#line 82 "packet-q932-ros-template.c"
   };
 
   /* List of subtrees */
@@ -837,7 +839,7 @@ void proto_register_rose(void) {
     &ett_q932_ros_InvokeId,
 
 /*--- End of included file: packet-q932-ros-ettarr.c ---*/
-#line 85 "packet-q932-ros-template.c"
+#line 87 "packet-q932-ros-template.c"
   };
 
   /* Register protocol and dissector */
@@ -855,4 +857,4 @@ void proto_reg_handoff_rose(void) {
   data_handle = find_dissector("data");
 }
 
-/*---------------------------------------------------------------------------*/
\ No newline at end of file
+/*---------------------------------------------------------------------------*/
diff --git a/epan/dissectors/packet-q932-ros.h b/epan/dissectors/packet-q932-ros.h
index a5e45c93ba..32a90c3191 100644
--- a/epan/dissectors/packet-q932-ros.h
+++ b/epan/dissectors/packet-q932-ros.h
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
-/* .\packet-q932-ros.h                                                        */
-/* ../../tools/asn2wrs.py -b -T -p q932.ros -c q932-ros.cnf -o q932-ros -s packet-q932-ros-template q932-ros.asn */
+/* ./packet-q932-ros.h                                                        */
+/* ../../tools/asn2wrs.py -b -T -e -p q932-ros -c q932-ros.cnf -s packet-q932-ros-template q932-ros.asn */
 
 /* Input file: packet-q932-ros-template.h */
 
diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c
index 55857687e7..1204f64c90 100644
--- a/epan/dissectors/packet-q932.c
+++ b/epan/dissectors/packet-q932.c
@@ -35,8 +35,6 @@
 # include "config.h"
 #endif
 
-#include <string.h>
-
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/strutil.h>
@@ -99,7 +97,7 @@ static int hf_q932_destinationEntity = -1;        /* EntityType */
 static int hf_q932_destinationEntityAddress = -1;  /* AddressInformation */
 
 /*--- End of included file: packet-q932-hf.c ---*/
-#line 53 "packet-q932-template.c"
+#line 51 "packet-q932-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_q932 = -1;
@@ -122,7 +120,7 @@ static gint ett_q932_UserSpecifiedSubaddress = -1;
 static gint ett_q932_NetworkFacilityExtension_U = -1;
 
 /*--- End of included file: packet-q932-ett.c ---*/
-#line 58 "packet-q932-template.c"
+#line 56 "packet-q932-template.c"
 
 /* Preferences */
 
@@ -740,7 +738,7 @@ static void dissect_InterpretationComponent_PDU(tvbuff_t *tvb _U_, packet_info *
 
 
 /*--- End of included file: packet-q932-fn.c ---*/
-#line 131 "packet-q932-template.c"
+#line 129 "packet-q932-template.c"
 
 /*--- dissect_q932_facility_ie -------------------------------------------------------*/
 /*static*/ void
@@ -1060,7 +1058,7 @@ void proto_register_q932(void) {
         "q932.AddressInformation", HFILL }},
 
 /*--- End of included file: packet-q932-hfarr.c ---*/
-#line 298 "packet-q932-template.c"
+#line 296 "packet-q932-template.c"
   };
 
   /* List of subtrees */
@@ -1085,7 +1083,7 @@ void proto_register_q932(void) {
     &ett_q932_NetworkFacilityExtension_U,
 
 /*--- End of included file: packet-q932-ettarr.c ---*/
-#line 305 "packet-q932-template.c"
+#line 303 "packet-q932-template.c"
   };
 
   /* Register protocol and dissector */
@@ -1097,10 +1095,10 @@ void proto_register_q932(void) {
   proto_register_subtree_array(ett, array_length(ett));
 
   /* Register dissector tables */
-  q932_rose_ctx.arg_global_dissector_table = register_dissector_table("q932.ros.global.arg", "Q.932 Operation Argument (global opcode)", FT_STRING, BASE_NONE);
-  q932_rose_ctx.res_global_dissector_table = register_dissector_table("q932.ros.global.res", "Q.932 Operation Result (global opcode)", FT_STRING, BASE_NONE);
-  q932_rose_ctx.arg_local_dissector_table = register_dissector_table("q932.ros.local.arg", "Q.932 Operation Argument (local opcode)", FT_UINT32, BASE_HEX); 
-  q932_rose_ctx.res_local_dissector_table = register_dissector_table("q932.ros.local.res", "Q.932 Operation Result (local opcode)", FT_UINT32, BASE_HEX); 
+  q932_rose_ctx.arg_global_dissector_table = register_dissector_table("q932-ros.global.arg", "Q.932 Operation Argument (global opcode)", FT_STRING, BASE_NONE);
+  q932_rose_ctx.res_global_dissector_table = register_dissector_table("q932-ros.global.res", "Q.932 Operation Result (global opcode)", FT_STRING, BASE_NONE);
+  q932_rose_ctx.arg_local_dissector_table = register_dissector_table("q932-ros.local.arg", "Q.932 Operation Argument (local opcode)", FT_UINT32, BASE_HEX); 
+  q932_rose_ctx.res_local_dissector_table = register_dissector_table("q932-ros.local.res", "Q.932 Operation Result (local opcode)", FT_UINT32, BASE_HEX); 
 }
 
 /*--- proto_reg_handoff_q932 ------------------------------------------------*/
diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c
index a6610fc9ad..a3849cbb87 100644
--- a/epan/dissectors/packet-qsig.c
+++ b/epan/dissectors/packet-qsig.c
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
-/* .\packet-qsig.c                                                            */
+/* ./packet-qsig.c                                                            */
 /* ../../tools/asn2wrs.py -b -T -e -p qsig -c qsig.cnf -s packet-qsig-template qsig-gf-ext.asn qsig-gf-gp.asn qsig-gf-ade.asn qsig-na.asn qsig-cf.asn */
 
 /* Input file: packet-qsig-template.c */
@@ -2912,15 +2912,15 @@ void proto_reg_handoff_qsig(void) {
 
   data_handle = find_dissector("data");
 
-  if (find_dissector_table("q932.ros.local.arg")) {
+  if (find_dissector_table("q932-ros.local.arg")) {
     for (op=0; op<array_length(qsig_tab); op++) {
       if (qsig_tab[op].arg_dissector) {
         qsig_op_handle = create_dissector_handle(qsig_tab[op].arg_dissector, proto_qsig);
-        dissector_add("q932.ros.local.arg", op, qsig_op_handle);
+        dissector_add("q932-ros.local.arg", op, qsig_op_handle);
       }
       if (qsig_tab[op].res_dissector) {
         qsig_op_handle = create_dissector_handle(qsig_tab[op].res_dissector, proto_qsig);
-        dissector_add("q932.ros.local.res", op, qsig_op_handle);
+        dissector_add("q932-ros.local.res", op, qsig_op_handle);
       }
     }
   }
@@ -2935,4 +2935,4 @@ void proto_reg_handoff_qsig(void) {
 
 }
 
-/*---------------------------------------------------------------------------*/
\ No newline at end of file
+/*---------------------------------------------------------------------------*/