- register QSIG over SIP

- regenerate Q932, Q932-ROS, QSIG from new makefiles

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23215 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/qsig/packet-qsig-template.c b/asn1/qsig/packet-qsig-template.c
index 27070df59f6fe595afcf47c6dfac302f3b4f333c..d0b4c3c98613effa70d5c34671b847cedc4cab32 100644 (file)
--- a/asn1/qsig/packet-qsig-template.c
+++ b/asn1/qsig/packet-qsig-template.c
@@ -313,6 +313,7 @@ static gint ett_qsig_unknown_extension = -1;
 /* Preferences */
 
 /* Subdissectors */
+static dissector_handle_t q931_handle = NULL; 
 static dissector_handle_t data_handle = NULL; 
 
 /* Gloabl variables */
@@ -645,6 +646,7 @@ void proto_reg_handoff_qsig(void) {
   dissector_handle_t qsig_err_handle;
   dissector_handle_t qsig_ie_handle;
 
+  q931_handle = find_dissector("q931");
   data_handle = find_dissector("data");
 
   qsig_arg_handle = new_create_dissector_handle(dissect_qsig_arg, proto_qsig);
@@ -666,6 +668,9 @@ void proto_reg_handoff_qsig(void) {
   /* SSIG-BC - Party category */
   dissector_add("q931.ie", CS5 | QSIG_IE_PARTY_CATEGORY, qsig_ie_handle);
 
+  /* RFC 3204, 3.2 QSIG Media Type */
+  dissector_add_string("media_type", "application/qsig", q931_handle);
+
 }
 
 /*---------------------------------------------------------------------------*/

diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c
index 5e57ce353be4a5dd026963ab0e69482a811712af..79259018d8cc5b5933d96933ac8398318a0e2b67 100644 (file)
--- 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 -X -p q932.ros -I ../ros -c q932-ros.cnf -o q932-ros -s packet-q932-ros-template ../ros/Remote-Operations-Information-Objects.asn Facility-Information-Element-Components.asn */
+/* packet-q932-ros.c                                                          */
+/* ../../tools/asn2wrs.py -b -T -X -p q932.ros -c q932-ros.cnf -s packet-q932-ros-template ../ros/Remote-Operations-Information-Objects.asn Facility-Information-Element-Components.asn */
 
 /* Input file: packet-q932-ros-template.c */
 

diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c
index 26ecd3c09ea9144c06717179a1a56caeacca5727..4ca2363e114d75ab4c6538c11167ab5ac8d00da1 100644 (file)
--- a/epan/dissectors/packet-q932.c
+++ b/epan/dissectors/packet-q932.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
-/* ./packet-q932.c                                                            */
-/* ../../tools/asn2wrs.py -b -T -X -e -p q932 -c q932.cnf -s packet-q932-template Addressing-Data-Elements.asn Network-Facility-Extension.asn Network-Protocol-Profile-component.asn Interpretation-component.asn */
+/* packet-q932.c                                                              */
+/* ../../tools/asn2wrs.py -e -b -T -X -p q932 -c q932.cnf -s packet-q932-template Addressing-Data-Elements.asn Network-Facility-Extension.asn Network-Protocol-Profile-component.asn Interpretation-component.asn */
 
 /* Input file: packet-q932-template.c */
 

diff --git a/epan/dissectors/packet-q932.h b/epan/dissectors/packet-q932.h
index be0b85c8dbebd18b6d7c19c5f603643723c68a00..c6e1a6a298b7c4a09eb15e86490363901c8f6b3a 100644 (file)
--- a/epan/dissectors/packet-q932.h
+++ b/epan/dissectors/packet-q932.h
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
-/* ./packet-q932.h                                                            */
-/* ../../tools/asn2wrs.py -b -T -X -e -p q932 -c q932.cnf -s packet-q932-template Addressing-Data-Elements.asn Network-Facility-Extension.asn Network-Protocol-Profile-component.asn Interpretation-component.asn */
+/* packet-q932.h                                                              */
+/* ../../tools/asn2wrs.py -e -b -T -X -p q932 -c q932.cnf -s packet-q932-template Addressing-Data-Elements.asn Network-Facility-Extension.asn Network-Protocol-Profile-component.asn Interpretation-component.asn */
 
 /* Input file: packet-q932-template.h */
 

diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c
index bf0c5ff76da7f1913c3080bc7d7acf5ed2ccbae6..3534c07439d5ef21048021f5fc03d92b9e67c575 100644 (file)
--- 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 -e -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 QSIG-PR.asn QSIG-CT.asn QSIG-CC.asn QSIG-CO.asn QSIG-DND.asn QSIG-CI.asn QSIG-AOC.asn QSIG-RE.asn SYNC-SIG.asn QSIG-CINT.asn QSIG-CMN.asn QSIG-CPI.asn QSIG-PUMR.asn QSIG-PUMCH.asn QSIG-SSCT.asn QSIG-WTMLR.asn QSIG-WTMCH.asn QSIG-WTMAU.asn QSIG-SD.asn QSIG-CIDL.asn QSIG-SMS.asn QSIG-MCR.asn QSIG-MCM.asn QSIG-MID.asn */
 
 /* Input file: packet-qsig-template.c */
@@ -2024,6 +2024,7 @@ static gint ett_qsig_mid_SEQUENCE_OF_Extension = -1;
 /* Preferences */
 
 /* Subdissectors */
+static dissector_handle_t q931_handle = NULL; 
 static dissector_handle_t data_handle = NULL; 
 
 /* Gloabl variables */
@@ -11899,7 +11900,7 @@ static int dissect_qsig_mid_Extension_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
 
 
 /*--- End of included file: packet-qsig-fn.c ---*/
-#line 325 "packet-qsig-template.c"
+#line 326 "packet-qsig-template.c"
 
 typedef struct _qsig_op_t {
   gint32 opcode;
@@ -12117,7 +12118,7 @@ static const qsig_op_t qsig_op_tab[] = {
   /* mIDMailboxID             */ { 120, dissect_qsig_mid_MIDMailboxIDArg_PDU, dissect_qsig_mid_MIDDummyRes_PDU },
 
 /*--- End of included file: packet-qsig-table11.c ---*/
-#line 334 "packet-qsig-template.c"
+#line 335 "packet-qsig-template.c"
 };                                 
 
 typedef struct _qsig_err_t {
@@ -12298,7 +12299,7 @@ static const qsig_err_t qsig_err_tab[] = {
   /* unspecified              */ { 1008, dissect_qsig_mid_Extension_PDU },
 
 /*--- End of included file: packet-qsig-table21.c ---*/
-#line 343 "packet-qsig-template.c"
+#line 344 "packet-qsig-template.c"
 };                                 
 
 static const qsig_op_t *get_op(gint32 opcode) {
@@ -15811,7 +15812,7 @@ void proto_register_qsig(void) {
         "qsig.Extension", HFILL }},
 
 /*--- End of included file: packet-qsig-hfarr.c ---*/
-#line 618 "packet-qsig-template.c"
+#line 619 "packet-qsig-template.c"
   };
 
   /* List of subtrees */
@@ -16262,7 +16263,7 @@ void proto_register_qsig(void) {
     &ett_qsig_mid_SEQUENCE_OF_Extension,
 
 /*--- End of included file: packet-qsig-ettarr.c ---*/
-#line 626 "packet-qsig-template.c"
+#line 627 "packet-qsig-template.c"
   };
 
   /* Register protocol and dissector */
@@ -16285,6 +16286,7 @@ void proto_reg_handoff_qsig(void) {
   dissector_handle_t qsig_err_handle;
   dissector_handle_t qsig_ie_handle;
 
+  q931_handle = find_dissector("q931");
   data_handle = find_dissector("data");
 
   qsig_arg_handle = new_create_dissector_handle(dissect_qsig_arg, proto_qsig);
@@ -16306,6 +16308,9 @@ void proto_reg_handoff_qsig(void) {
   /* SSIG-BC - Party category */
   dissector_add("q931.ie", CS5 | QSIG_IE_PARTY_CATEGORY, qsig_ie_handle);
 
+  /* RFC 3204, 3.2 QSIG Media Type */
+  dissector_add_string("media_type", "application/qsig", q931_handle);
+
 }
 
 /*---------------------------------------------------------------------------*/

diff --git a/epan/dissectors/packet-qsig.h b/epan/dissectors/packet-qsig.h
index 42a88a554af8c58da8696a4ee0d588c71ae1b197..e6e0d66ef45c8f32f1632b0f17b8d7a8884989f8 100644 (file)
--- a/epan/dissectors/packet-qsig.h
+++ b/epan/dissectors/packet-qsig.h
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
-/* ./packet-qsig.h                                                            */
+/* packet-qsig.h                                                              */
 /* ../../tools/asn2wrs.py -e -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 QSIG-PR.asn QSIG-CT.asn QSIG-CC.asn QSIG-CO.asn QSIG-DND.asn QSIG-CI.asn QSIG-AOC.asn QSIG-RE.asn SYNC-SIG.asn QSIG-CINT.asn QSIG-CMN.asn QSIG-CPI.asn QSIG-PUMR.asn QSIG-PUMCH.asn QSIG-SSCT.asn QSIG-WTMLR.asn QSIG-WTMCH.asn QSIG-WTMAU.asn QSIG-SD.asn QSIG-CIDL.asn QSIG-SMS.asn QSIG-MCR.asn QSIG-MCM.asn QSIG-MID.asn */
 
 /* Input file: packet-qsig-template.h */