-Wmissing-prototypes

svn path=/trunk/; revision=48609

diff --git a/asn1/gnm/packet-gnm-template.c b/asn1/gnm/packet-gnm-template.c
index 91c6a273f684f01ac987eb0b0e6805350410b0bc..7635028f22fb9896be019bea5f383ce669edc876 100644 (file)
--- a/asn1/gnm/packet-gnm-template.c
+++ b/asn1/gnm/packet-gnm-template.c
@@ -41,6 +41,9 @@
 #define PSNAME "GNM"
 #define PFNAME "gnm"
 
+void proto_register_gnm(void);
+void proto_reg_handoff_gnm(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_gnm = -1;
 
@@ -64,7 +67,7 @@ dissect_gnm_attribute_ObjectInstance(tvbuff_t *tvb, packet_info *pinfo, proto_tr
 
 }
 
-void
+static void
 dissect_gnm(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_)
 {
   /* Dymmy function */

diff --git a/asn1/gprscdr/packet-gprscdr-template.c b/asn1/gprscdr/packet-gprscdr-template.c
index cbe01226464af0ffc205469c742a4ef75116bada..10c095d0d3deb30edf523d9a34b0abb4b4b111f7 100644 (file)
--- a/asn1/gprscdr/packet-gprscdr-template.c
+++ b/asn1/gprscdr/packet-gprscdr-template.c
@@ -38,6 +38,8 @@
 #define PSNAME "GPRSCDR"
 #define PFNAME "gprscdr"
 
+void proto_register_gprscdr(void);
+
 /* Define the GPRS CDR proto */
 static int proto_gprscdr = -1;
 

diff --git a/asn1/gsm_map/packet-gsm_map-template.c b/asn1/gsm_map/packet-gsm_map-template.c
index e984a11b16cfbc83005082cff9c06cd200f54f23..12548394157aa4f6652e7dca7b7316d9416fd74b 100644 (file)
--- a/asn1/gsm_map/packet-gsm_map-template.c
+++ b/asn1/gsm_map/packet-gsm_map-template.c
@@ -73,6 +73,9 @@
 #define PSNAME "GSM_MAP"
 #define PFNAME "gsm_map"
 
+void proto_register_gsm_map(void);
+void proto_reg_handoff_gsm_map(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_gsm_map = -1;
 static int proto_gsm_map_dialogue = -1;

diff --git a/asn1/m3ap/packet-m3ap-template.c b/asn1/m3ap/packet-m3ap-template.c
index 74aadac31a037e88b1122cf95ce205b3191564fd..f4659fd4971e8626b3768268d669c261df82e059 100644 (file)
--- a/asn1/m3ap/packet-m3ap-template.c
+++ b/asn1/m3ap/packet-m3ap-template.c
@@ -44,6 +44,9 @@
 #define PSNAME "M3AP"
 #define PFNAME "m3ap"
 
+void proto_register_m3ap(void);
+void proto_reg_handoff_m3ap(void);
+
 /* M3AP uses port 36444 as recommended by IANA. */
 #define M3AP_PORT 36444
 static dissector_handle_t m3ap_handle=NULL;

diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c
index 6bb98a5fb4e584e852964ca530cb340cb1595b07..016021324840fd190c8a32c478499eedfa4c0dbb 100644 (file)
--- a/asn1/pkcs12/packet-pkcs12-template.c
+++ b/asn1/pkcs12/packet-pkcs12-template.c
@@ -57,6 +57,9 @@
 #define PKCS12_PBE_3DES_SHA1_OID       "1.2.840.113549.1.12.1.3"
 #define PKCS12_PBE_RC2_40_SHA1_OID     "1.2.840.113549.1.12.1.6"
 
+void proto_register_pkcs12(void);
+void proto_reg_handoff_pkcs12(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_pkcs12 = -1;
 

diff --git a/asn1/qsig/packet-qsig-template.c b/asn1/qsig/packet-qsig-template.c
index beb5c4fe3a8950081e5ae05a984bdd2623aeb9b6..c4261414c453ceef78e076cc68ef4d2f8fa63de6 100644 (file)
--- a/asn1/qsig/packet-qsig-template.c
+++ b/asn1/qsig/packet-qsig-template.c
@@ -49,6 +49,9 @@
 #define        QSIG_IE_TRANSIT_COUNTER 0x31
 #define        QSIG_IE_PARTY_CATEGORY  0x32
 
+void proto_register_qsig(void);
+void proto_reg_handoff_qsig(void);
+
 static const value_string qsig_str_ie_type_cs4[] = {
   { QSIG_IE_TRANSIT_COUNTER , "Transit counter" },
   { 0, NULL}

diff --git a/asn1/ros/packet-ros-template.c b/asn1/ros/packet-ros-template.c
index 96c1f82d765701956690ea47f80b372e154a30de..5ec12a9f07c629fadd893e858494b8754a6d3c94 100644 (file)
--- a/asn1/ros/packet-ros-template.c
+++ b/asn1/ros/packet-ros-template.c
@@ -40,6 +40,9 @@
 #define PSNAME "ROS"
 #define PFNAME "ros"
 
+void proto_register_ros(void);
+void proto_reg_handoff_ros(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_ros = -1;
 

diff --git a/asn1/rua/packet-rua-template.c b/asn1/rua/packet-rua-template.c
index a72b4e67cdded107096b5a0140d206eeefd5d461..f988d0b67246ffff742c9afe88ed994c27f2d07c 100644 (file)
--- a/asn1/rua/packet-rua-template.c
+++ b/asn1/rua/packet-rua-template.c
@@ -48,6 +48,8 @@
 /* Dissector to use SCTP PPID 19 or a configured SCTP port. IANA assigned port = 29169*/
 #define SCTP_PORT_RUA              29169;
 
+void proto_register_rua(void);
+
 #include "packet-rua-val.h"
 
 /* Initialize the protocol and registered fields */

diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c
index 49be4e24a567cdbdb1ce2c7cb666ce4e8dde0e1e..1e5240baf05b0f0543edf213a9de865eef720ed4 100644 (file)
--- a/asn1/s1ap/packet-s1ap-template.c
+++ b/asn1/s1ap/packet-s1ap-template.c
@@ -59,6 +59,9 @@
 /* Dissector will use SCTP PPID 18 or SCTP port. IANA assigned port = 36412 */
 #define SCTP_PORT_S1AP 36412
 
+void proto_register_s1ap(void);
+void proto_reg_handoff_s1ap(void);
+
 static dissector_handle_t nas_eps_handle;
 static dissector_handle_t lppa_handle;
 static dissector_handle_t bssgp_handle;

diff --git a/asn1/sabp/packet-sabp-template.c b/asn1/sabp/packet-sabp-template.c
index 79e0b62c3a5d5d8c16e0ca353ac038f7ac2ac5d6..0bbfce48b4b529ff6d079f3c3ead63ddcc0946ba 100644 (file)
--- a/asn1/sabp/packet-sabp-template.c
+++ b/asn1/sabp/packet-sabp-template.c
@@ -46,6 +46,9 @@
 
 #include "packet-sabp-val.h"
 
+void proto_register_sabp(void);
+void proto_reg_handoff_sabp(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_sabp = -1;
 

diff --git a/asn1/smrse/packet-smrse-template.c b/asn1/smrse/packet-smrse-template.c
index 934ca69916c69cf948abf05809928956dca17984..51d15312c1b0124a9ab9e3fff905c440e78e1bdc 100644 (file)
--- a/asn1/smrse/packet-smrse-template.c
+++ b/asn1/smrse/packet-smrse-template.c
@@ -38,6 +38,9 @@
 
 #define TCP_PORT_SMRSE 4321
 
+void proto_register_smrse(void);
+void proto_reg_handoff_smrse(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_smrse = -1;
 static int hf_smrse_reserved = -1;

diff --git a/asn1/sv/packet-sv-template.c b/asn1/sv/packet-sv-template.c
index e1de209f294409c937cdc9b16a9784bd92aab9a7..9b3f730b0d61dce288150cab2f49984269879366 100644 (file)
--- a/asn1/sv/packet-sv-template.c
+++ b/asn1/sv/packet-sv-template.c
@@ -71,6 +71,8 @@
 /* see UCA Implementation Guideline for IEC 61850-9-2 */
 #define Q_DERIVED                              (1 << 13)
 
+void proto_register_sv(void);
+void proto_reg_handoff_sv(void);
 
 /* Data for SV tap */
 static int sv_tap = -1;

diff --git a/asn1/t124/packet-t124-template.c b/asn1/t124/packet-t124-template.c
index f0b5418901178afa7d14993690e2b1d60885707c..a3ed6154207d7936c636faddccce1d20f47f6a63 100644 (file)
--- a/asn1/t124/packet-t124-template.c
+++ b/asn1/t124/packet-t124-template.c
@@ -44,6 +44,9 @@
 #define PSNAME "T.124"
 #define PFNAME "t124"
 
+void proto_register_t124(void);
+void proto_reg_handoff_t124(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_t124 = -1;
 static proto_tree *top_tree = NULL;

diff --git a/asn1/t125/packet-t125-template.c b/asn1/t125/packet-t125-template.c
index f89555b22498597558a62bbaf934652282bc5e86..ae512ce9d5aa4d4f0314ecc6ac2ae4536896496f 100644 (file)
--- a/asn1/t125/packet-t125-template.c
+++ b/asn1/t125/packet-t125-template.c
@@ -39,6 +39,8 @@
 #define PSNAME "T.125"
 #define PFNAME "t125"
 
+void proto_register_t125(void);
+void proto_reg_handoff_t125(void);
 
 /* Initialize the protocol and registered fields */
 static int proto_t125 = -1;

diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c
index 312d42180b74b7e5d37621da75592b529d141e75..87966844f5f5cac59403ae2e3c905237cd5dc58d 100644 (file)
--- a/asn1/t38/packet-t38-template.c
+++ b/asn1/t38/packet-t38-template.c
@@ -64,6 +64,9 @@
 #include <epan/emem.h>
 #include <epan/strutil.h>
 
+void proto_register_t38(void);
+void proto_reg_handoff_t38(void);
+
 #define PORT_T38 6004
 static guint global_t38_tcp_port = PORT_T38;
 static guint global_t38_udp_port = PORT_T38;

diff --git a/asn1/ulp/packet-ulp-template.c b/asn1/ulp/packet-ulp-template.c
index 503aaa57575458774580d012b7ee3eba932ad3b6..76e272b2dc552b3fb23417708abb5373e1b9894b 100644 (file)
--- a/asn1/ulp/packet-ulp-template.c
+++ b/asn1/ulp/packet-ulp-template.c
@@ -41,6 +41,8 @@
 #define PSNAME "ULP"
 #define PFNAME "ulp"
 
+void proto_register_ulp(void);
+
 static dissector_handle_t rrlp_handle;
 static dissector_handle_t lpp_handle;
 

diff --git a/asn1/wlancertextn/packet-wlancertextn-template.c b/asn1/wlancertextn/packet-wlancertextn-template.c
index 0b1731882f712e4235e6f6db188ba8869971ca2c..9bb2cc41a9f1d859357ac0643abc06d4b2b2c810 100644 (file)
--- a/asn1/wlancertextn/packet-wlancertextn-template.c
+++ b/asn1/wlancertextn/packet-wlancertextn-template.c
@@ -40,6 +40,9 @@
 #define PSNAME "WLANCERTEXTN"
 #define PFNAME "wlancertextn"
 
+void proto_register_wlancertextn(void);
+void proto_reg_handoff_wlancertextn(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_wlancertextn = -1;
 #include "packet-wlancertextn-hf.c"

diff --git a/asn1/x2ap/packet-x2ap-template.c b/asn1/x2ap/packet-x2ap-template.c
index ce58d5ce97585510e5ff9e2b5548cfbe61e9b9f8..452cfb99c3717df9f75dce3d6c6205970faa9090 100644 (file)
--- a/asn1/x2ap/packet-x2ap-template.c
+++ b/asn1/x2ap/packet-x2ap-template.c
@@ -50,6 +50,8 @@
 #define PSNAME "X2AP"
 #define PFNAME "x2ap"
 
+void proto_register_x2ap(void);
+
 /* Dissector will use SCTP PPID 27 or SCTP port. IANA assigned port = 36422 */
 #define SCTP_PORT_X2AP 36422
 

diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c
index bb0c259acce9deaa9679c8a8093976cf3f0e3624..a91d606798ad3d73c7fd75e32c4fbddc9e6110e1 100644 (file)
--- a/asn1/x509af/packet-x509af-template.c
+++ b/asn1/x509af/packet-x509af-template.c
@@ -41,6 +41,9 @@
 #define PSNAME "X509AF"
 #define PFNAME "x509af"
 
+void proto_register_x509af(void);
+void proto_reg_handoff_x509af(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_x509af = -1;
 static int hf_x509af_algorithm_id = -1;

diff --git a/epan/dissectors/packet-gnm.c b/epan/dissectors/packet-gnm.c
index 9eecd12971ddd652475d1ab67bfba63906efbe50..51b4b9fed0c9e82413893b952e22b5bf46b30d14 100644 (file)
--- a/epan/dissectors/packet-gnm.c
+++ b/epan/dissectors/packet-gnm.c
@@ -49,6 +49,9 @@
 #define PSNAME "GNM"
 #define PFNAME "gnm"
 
+void proto_register_gnm(void);
+void proto_reg_handoff_gnm(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_gnm = -1;
 
@@ -225,7 +228,7 @@ static int hf_gnm_TransmissionCharacteristics_dCME = -1;
 static int hf_gnm_TransmissionCharacteristics_echoControl = -1;
 
 /*--- End of included file: packet-gnm-hf.c ---*/
-#line 48 "../../asn1/gnm/packet-gnm-template.c"
+#line 51 "../../asn1/gnm/packet-gnm-template.c"
 
 /* Initialize the subtree pointers */
 
@@ -299,7 +302,7 @@ static gint ett_gnm_TpsInGtpList = -1;
 static gint ett_gnm_TransmissionCharacteristics = -1;
 
 /*--- End of included file: packet-gnm-ett.c ---*/
-#line 51 "../../asn1/gnm/packet-gnm-template.c"
+#line 54 "../../asn1/gnm/packet-gnm-template.c"
 
 
 /*--- Included file: packet-gnm-fn.c ---*/
@@ -2027,7 +2030,7 @@ static void dissect_Version_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
 
 
 /*--- End of included file: packet-gnm-fn.c ---*/
-#line 53 "../../asn1/gnm/packet-gnm-template.c"
+#line 56 "../../asn1/gnm/packet-gnm-template.c"
 
 
 
@@ -2042,7 +2045,7 @@ dissect_gnm_attribute_ObjectInstance(tvbuff_t *tvb, packet_info *pinfo, proto_tr
 
 }
 
-void
+static void
 dissect_gnm(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *parent_tree _U_)
 {
   /* Dymmy function */
@@ -2727,7 +2730,7 @@ void proto_register_gnm(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-gnm-hfarr.c ---*/
-#line 80 "../../asn1/gnm/packet-gnm-template.c"
+#line 83 "../../asn1/gnm/packet-gnm-template.c"
   };
 
   /* List of subtrees */
@@ -2803,7 +2806,7 @@ void proto_register_gnm(void) {
     &ett_gnm_TransmissionCharacteristics,
 
 /*--- End of included file: packet-gnm-ettarr.c ---*/
-#line 85 "../../asn1/gnm/packet-gnm-template.c"
+#line 88 "../../asn1/gnm/packet-gnm-template.c"
   };
 
   /* Register protocol */
@@ -2892,7 +2895,7 @@ void proto_reg_handoff_gnm(void) {
 
 
 /*--- End of included file: packet-gnm-dis-tab.c ---*/
-#line 100 "../../asn1/gnm/packet-gnm-template.c"
+#line 103 "../../asn1/gnm/packet-gnm-template.c"
        /* Wrapper to call CMIP */
        register_ber_oid_dissector("0.0.13.3100.0.7.9", dissect_gnm_attribute_ObjectInstance, proto_gnm, "clientConnection(9)");
        register_ber_oid_dissector("0.0.13.3100.0.7.10", dissect_gnm_attribute_ObjectInstance, proto_gnm, "clientTrail(10)");

diff --git a/epan/dissectors/packet-gprscdr.c b/epan/dissectors/packet-gprscdr.c
index 5e0e9515516f9c0f81bdbdadd6f8f5dc8c376bb7..7d670f88e5351deb55d296e5abeeab72f9b6ec88 100644 (file)
--- a/epan/dissectors/packet-gprscdr.c
+++ b/epan/dissectors/packet-gprscdr.c
@@ -46,6 +46,8 @@
 #define PSNAME "GPRSCDR"
 #define PFNAME "gprscdr"
 
+void proto_register_gprscdr(void);
+
 /* Define the GPRS CDR proto */
 static int proto_gprscdr = -1;
 
@@ -301,7 +303,7 @@ static int hf_gprscdr_ServiceConditionChange_tAIChange = -1;
 static int hf_gprscdr_ServiceConditionChange_userLocationChange = -1;
 
 /*--- End of included file: packet-gprscdr-hf.c ---*/
-#line 45 "../../asn1/gprscdr/packet-gprscdr-template.c"
+#line 47 "../../asn1/gprscdr/packet-gprscdr-template.c"
 
 static int ett_gprscdr = -1;
 static int ett_gprscdr_timestamp = -1;
@@ -363,7 +365,7 @@ static gint ett_gprscdr_ServiceConditionChange = -1;
 static gint ett_gprscdr_TimeQuotaMechanism = -1;
 
 /*--- End of included file: packet-gprscdr-ett.c ---*/
-#line 50 "../../asn1/gprscdr/packet-gprscdr-template.c"
+#line 52 "../../asn1/gprscdr/packet-gprscdr-template.c"
 
 static const value_string gprscdr_daylight_saving_time_vals[] = {
     {0, "No adjustment"},
@@ -2685,7 +2687,7 @@ int dissect_gprscdr_GPRSRecord_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr
 
 
 /*--- End of included file: packet-gprscdr-fn.c ---*/
-#line 60 "../../asn1/gprscdr/packet-gprscdr-template.c"
+#line 62 "../../asn1/gprscdr/packet-gprscdr-template.c"
 
 
 
@@ -3684,7 +3686,7 @@ proto_register_gprscdr(void)
         NULL, HFILL }},
 
 /*--- End of included file: packet-gprscdr-hfarr.c ---*/
-#line 70 "../../asn1/gprscdr/packet-gprscdr-template.c"
+#line 72 "../../asn1/gprscdr/packet-gprscdr-template.c"
   };
 
   /* List of subtrees */
@@ -3749,7 +3751,7 @@ proto_register_gprscdr(void)
     &ett_gprscdr_TimeQuotaMechanism,
 
 /*--- End of included file: packet-gprscdr-ettarr.c ---*/
-#line 78 "../../asn1/gprscdr/packet-gprscdr-template.c"
+#line 80 "../../asn1/gprscdr/packet-gprscdr-template.c"
         };
 
   proto_gprscdr = proto_register_protocol(PNAME, PSNAME, PFNAME);

diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index 84cb77fb7fadb76f20eb9db4296b7790491aab5d..d0a3fbb037f4493e4188af28506f8c9beb3beb26 100644 (file)
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -81,6 +81,9 @@
 #define PSNAME "GSM_MAP"
 #define PFNAME "gsm_map"
 
+void proto_register_gsm_map(void);
+void proto_reg_handoff_gsm_map(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_gsm_map = -1;
 static int proto_gsm_map_dialogue = -1;
@@ -1732,7 +1735,7 @@ static int hf_gsm_map_ericsson_locationInformation = -1;  /* T_locationInformati
 static int hf_gsm_map_ericsson_extensionContainer = -1;  /* ExtensionContainer */
 
 /*--- End of included file: packet-gsm_map-hf.c ---*/
-#line 153 "../../asn1/gsm_map/packet-gsm_map-template.c"
+#line 156 "../../asn1/gsm_map/packet-gsm_map-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_gsm_map = -1;
@@ -2374,7 +2377,7 @@ static gint ett_gsm_ss_LCS_PeriodicLocationCancellationArg = -1;
 static gint ett_gsm_map_ericsson_EnhancedCheckIMEI_Arg = -1;
 
 /*--- End of included file: packet-gsm_map-ett.c ---*/
-#line 182 "../../asn1/gsm_map/packet-gsm_map-template.c"
+#line 185 "../../asn1/gsm_map/packet-gsm_map-template.c"
 
 static dissector_table_t       sms_dissector_table;    /* SMS TPDU */
 static dissector_handle_t      data_handle;
@@ -18266,7 +18269,7 @@ dissect_gsm_map_ericsson_EnhancedCheckIMEI_Arg(gboolean implicit_tag _U_, tvbuff
 
 
 /*--- End of included file: packet-gsm_map-fn.c ---*/
-#line 838 "../../asn1/gsm_map/packet-gsm_map-template.c"
+#line 841 "../../asn1/gsm_map/packet-gsm_map-template.c"
 
 /* Specific translation for MAP V3 */
 const value_string gsm_map_V1V2_opr_code_strings[] = {
@@ -18484,7 +18487,7 @@ const value_string gsm_map_opr_code_strings[] = {
 /* Unknown or empty loop list OPERATION */
 
 /*--- End of included file: packet-gsm_map-table.c ---*/
-#line 849 "../../asn1/gsm_map/packet-gsm_map-template.c"
+#line 852 "../../asn1/gsm_map/packet-gsm_map-template.c"
   { 0, NULL }
 };
 static const value_string gsm_map_err_code_string_vals[] = {
@@ -18695,7 +18698,7 @@ static const value_string gsm_map_err_code_string_vals[] = {
 /* Unknown or empty loop list OPERATION */
 
 /*--- End of included file: packet-gsm_map-table.c ---*/
-#line 853 "../../asn1/gsm_map/packet-gsm_map-template.c"
+#line 856 "../../asn1/gsm_map/packet-gsm_map-template.c"
     { 0, NULL }
 };
 static const true_false_string gsm_map_extension_value = {
@@ -26590,7 +26593,7 @@ void proto_register_gsm_map(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-gsm_map-hfarr.c ---*/
-#line 2613 "../../asn1/gsm_map/packet-gsm_map-template.c"
+#line 2616 "../../asn1/gsm_map/packet-gsm_map-template.c"
   };
 
   /* List of subtrees */
@@ -27234,7 +27237,7 @@ void proto_register_gsm_map(void) {
     &ett_gsm_map_ericsson_EnhancedCheckIMEI_Arg,
 
 /*--- End of included file: packet-gsm_map-ettarr.c ---*/
-#line 2644 "../../asn1/gsm_map/packet-gsm_map-template.c"
+#line 2647 "../../asn1/gsm_map/packet-gsm_map-template.c"
   };
 
   static const enum_val_t application_context_modes[] = {
@@ -27327,7 +27330,7 @@ void proto_register_gsm_map(void) {
 
 
 /*--- End of included file: packet-gsm_map-dis-tab.c ---*/
-#line 2675 "../../asn1/gsm_map/packet-gsm_map-template.c"
+#line 2678 "../../asn1/gsm_map/packet-gsm_map-template.c"
   oid_add_from_string("ericsson-gsm-Map-Ext","1.2.826.0.1249.58.1.0" );
   oid_add_from_string("accessTypeNotAllowed-id","1.3.12.2.1107.3.66.1.2");
   /*oid_add_from_string("map-ac networkLocUp(1) version3(3)","0.4.0.0.1.0.1.3" );

diff --git a/epan/dissectors/packet-m3ap.c b/epan/dissectors/packet-m3ap.c
index 6669dc96ac8bb38eff28df136e6303762beeb6a5..628bf0491b6e32da2aa1d96482d42354098b751c 100644 (file)
--- a/epan/dissectors/packet-m3ap.c
+++ b/epan/dissectors/packet-m3ap.c
@@ -52,6 +52,9 @@
 #define PSNAME "M3AP"
 #define PFNAME "m3ap"
 
+void proto_register_m3ap(void);
+void proto_reg_handoff_m3ap(void);
+
 /* M3AP uses port 36444 as recommended by IANA. */
 #define M3AP_PORT 36444
 static dissector_handle_t m3ap_handle=NULL;
@@ -104,7 +107,7 @@ typedef enum _ProtocolIE_ID_enum {
 } ProtocolIE_ID_enum;
 
 /*--- End of included file: packet-m3ap-val.h ---*/
-#line 52 "../../asn1/m3ap/packet-m3ap-template.c"
+#line 55 "../../asn1/m3ap/packet-m3ap-template.c"
 
 /* Initialize the protocol and registered fields */
 static int proto_m3ap = -1;
@@ -213,7 +216,7 @@ static int hf_m3ap_successfulOutcome_value = -1;  /* SuccessfulOutcome_value */
 static int hf_m3ap_unsuccessfulOutcome_value = -1;  /* UnsuccessfulOutcome_value */
 
 /*--- End of included file: packet-m3ap-hf.c ---*/
-#line 60 "../../asn1/m3ap/packet-m3ap-template.c"
+#line 63 "../../asn1/m3ap/packet-m3ap-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_m3ap = -1;
@@ -268,7 +271,7 @@ static gint ett_m3ap_SuccessfulOutcome = -1;
 static gint ett_m3ap_UnsuccessfulOutcome = -1;
 
 /*--- End of included file: packet-m3ap-ett.c ---*/
-#line 65 "../../asn1/m3ap/packet-m3ap-template.c"
+#line 68 "../../asn1/m3ap/packet-m3ap-template.c"
 
 enum{
   INITIATING_MESSAGE,
@@ -2024,7 +2027,7 @@ static int dissect_M3AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
 
 
 /*--- End of included file: packet-m3ap-fn.c ---*/
-#line 93 "../../asn1/m3ap/packet-m3ap-template.c"
+#line 96 "../../asn1/m3ap/packet-m3ap-template.c"
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
@@ -2475,7 +2478,7 @@ void proto_register_m3ap(void) {
         "UnsuccessfulOutcome_value", HFILL }},
 
 /*--- End of included file: packet-m3ap-hfarr.c ---*/
-#line 155 "../../asn1/m3ap/packet-m3ap-template.c"
+#line 158 "../../asn1/m3ap/packet-m3ap-template.c"
   };
 
   /* List of subtrees */
@@ -2531,7 +2534,7 @@ void proto_register_m3ap(void) {
     &ett_m3ap_UnsuccessfulOutcome,
 
 /*--- End of included file: packet-m3ap-ettarr.c ---*/
-#line 161 "../../asn1/m3ap/packet-m3ap-template.c"
+#line 164 "../../asn1/m3ap/packet-m3ap-template.c"
   };
 
 
@@ -2606,7 +2609,7 @@ proto_reg_handoff_m3ap(void)
 
 
 /*--- End of included file: packet-m3ap-dis-tab.c ---*/
-#line 191 "../../asn1/m3ap/packet-m3ap-template.c"
+#line 194 "../../asn1/m3ap/packet-m3ap-template.c"
     dissector_add_uint("m3ap.extension", 17, new_create_dissector_handle(dissect_AllocationAndRetentionPriority_PDU, proto_m3ap));
   }
   else {

diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c
index da26ee768bb8f1a394b592eb3c6e74e5f2873d9d..811d5ccbea226a25a328d6ffa4f893edb19f51d5 100644 (file)
--- a/epan/dissectors/packet-pkcs12.c
+++ b/epan/dissectors/packet-pkcs12.c
@@ -65,6 +65,9 @@
 #define PKCS12_PBE_3DES_SHA1_OID       "1.2.840.113549.1.12.1.3"
 #define PKCS12_PBE_RC2_40_SHA1_OID     "1.2.840.113549.1.12.1.6"
 
+void proto_register_pkcs12(void);
+void proto_reg_handoff_pkcs12(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_pkcs12 = -1;
 
@@ -140,7 +143,7 @@ static int hf_pkcs12_encryptionScheme = -1;       /* AlgorithmIdentifier */
 static int hf_pkcs12_messageAuthScheme = -1;      /* AlgorithmIdentifier */
 
 /*--- End of included file: packet-pkcs12-hf.c ---*/
-#line 77 "../../asn1/pkcs12/packet-pkcs12-template.c"
+#line 80 "../../asn1/pkcs12/packet-pkcs12-template.c"
 
 /* Initialize the subtree pointers */
 
@@ -168,7 +171,7 @@ static gint ett_pkcs12_PBES2Params = -1;
 static gint ett_pkcs12_PBMAC1Params = -1;
 
 /*--- End of included file: packet-pkcs12-ett.c ---*/
-#line 80 "../../asn1/pkcs12/packet-pkcs12-template.c"
+#line 83 "../../asn1/pkcs12/packet-pkcs12-template.c"
 
 static void append_oid(proto_tree *tree, const char *oid)
 {
@@ -1124,7 +1127,7 @@ static void dissect_PBMAC1Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
 
 
 /*--- End of included file: packet-pkcs12-fn.c ---*/
-#line 381 "../../asn1/pkcs12/packet-pkcs12-template.c"
+#line 384 "../../asn1/pkcs12/packet-pkcs12-template.c"
 
 static int strip_octet_string(tvbuff_t *tvb)
 {
@@ -1412,7 +1415,7 @@ void proto_register_pkcs12(void) {
         "AlgorithmIdentifier", HFILL }},
 
 /*--- End of included file: packet-pkcs12-hfarr.c ---*/
-#line 448 "../../asn1/pkcs12/packet-pkcs12-template.c"
+#line 451 "../../asn1/pkcs12/packet-pkcs12-template.c"
   };
 
   /* List of subtrees */
@@ -1443,7 +1446,7 @@ void proto_register_pkcs12(void) {
     &ett_pkcs12_PBMAC1Params,
 
 /*--- End of included file: packet-pkcs12-ettarr.c ---*/
-#line 454 "../../asn1/pkcs12/packet-pkcs12-template.c"
+#line 457 "../../asn1/pkcs12/packet-pkcs12-template.c"
   };
   module_t *pkcs12_module;
 
@@ -1504,7 +1507,7 @@ void proto_reg_handoff_pkcs12(void) {
 
 
 /*--- End of included file: packet-pkcs12-dis-tab.c ---*/
-#line 486 "../../asn1/pkcs12/packet-pkcs12-template.c"
+#line 489 "../../asn1/pkcs12/packet-pkcs12-template.c"
 
        register_ber_oid_dissector("1.2.840.113549.1.9.22.1", dissect_X509Certificate_OCTETSTRING_PDU, proto_pkcs12, "x509Certificate");
 

diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c
index 54808c4773eb87800a47b0634bc992505841dbc4..1d741b72075aea981c0a01966e72a0ea215c8b35 100644 (file)
--- a/epan/dissectors/packet-qsig.c
+++ b/epan/dissectors/packet-qsig.c
@@ -57,6 +57,9 @@
 #define        QSIG_IE_TRANSIT_COUNTER 0x31
 #define        QSIG_IE_PARTY_CATEGORY  0x32
 
+void proto_register_qsig(void);
+void proto_reg_handoff_qsig(void);
+
 static const value_string qsig_str_ie_type_cs4[] = {
   { QSIG_IE_TRANSIT_COUNTER , "Transit counter" },
   { 0, NULL}
@@ -487,7 +490,7 @@ static const value_string qsig_str_operation[] = {
   { 120, "mIDMailboxID" },
 
 /*--- End of included file: packet-qsig-table10.c ---*/
-#line 270 "../../asn1/qsig/packet-qsig-template.c"
+#line 273 "../../asn1/qsig/packet-qsig-template.c"
   {   0, NULL}
 };
 
@@ -680,7 +683,7 @@ static const value_string qsig_str_error[] = {
   { 1008, "unspecified" },
 
 /*--- End of included file: packet-qsig-table20.c ---*/
-#line 275 "../../asn1/qsig/packet-qsig-template.c"
+#line 278 "../../asn1/qsig/packet-qsig-template.c"
   {   0, NULL}
 };
 
@@ -1575,7 +1578,7 @@ static int hf_qsig_mid_multipleExtension = -1;    /* SEQUENCE_OF_Extension */
 static int hf_qsig_mid_multipleExtension_item = -1;  /* Extension */
 
 /*--- End of included file: packet-qsig-hf.c ---*/
-#line 291 "../../asn1/qsig/packet-qsig-template.c"
+#line 294 "../../asn1/qsig/packet-qsig-template.c"
 
 static int *hf_qsig_ie_type_arr[] = {
   NULL,
@@ -2035,7 +2038,7 @@ static gint ett_qsig_mid_MIDExtensions = -1;
 static gint ett_qsig_mid_SEQUENCE_OF_Extension = -1;
 
 /*--- End of included file: packet-qsig-ett.c ---*/
-#line 308 "../../asn1/qsig/packet-qsig-template.c"
+#line 311 "../../asn1/qsig/packet-qsig-template.c"
 static gint ett_cnq_PSS1InformationElement = -1;
 
 /* Preferences */
@@ -11927,7 +11930,7 @@ static int dissect_qsig_mid_Extension_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
 
 
 /*--- End of included file: packet-qsig-fn.c ---*/
-#line 324 "../../asn1/qsig/packet-qsig-template.c"
+#line 327 "../../asn1/qsig/packet-qsig-template.c"
 
 typedef struct _qsig_op_t {
   gint32 opcode;
@@ -12149,7 +12152,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 333 "../../asn1/qsig/packet-qsig-template.c"
+#line 336 "../../asn1/qsig/packet-qsig-template.c"
 };
 
 typedef struct _qsig_err_t {
@@ -12346,7 +12349,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 342 "../../asn1/qsig/packet-qsig-template.c"
+#line 345 "../../asn1/qsig/packet-qsig-template.c"
 };
 
 static const qsig_op_t *get_op(gint32 opcode) {
@@ -15892,7 +15895,7 @@ void proto_register_qsig(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-qsig-hfarr.c ---*/
-#line 650 "../../asn1/qsig/packet-qsig-template.c"
+#line 653 "../../asn1/qsig/packet-qsig-template.c"
   };
 
   /* List of subtrees */
@@ -16343,7 +16346,7 @@ void proto_register_qsig(void) {
     &ett_qsig_mid_SEQUENCE_OF_Extension,
 
 /*--- End of included file: packet-qsig-ettarr.c ---*/
-#line 658 "../../asn1/qsig/packet-qsig-template.c"
+#line 661 "../../asn1/qsig/packet-qsig-template.c"
     &ett_cnq_PSS1InformationElement,
   };
 

diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c
index 4782a44f79bb8c5035b814148825fed7a5213094..095203ad6bcc68b9272e8192e3ff92eb462d0e84 100644 (file)
--- a/epan/dissectors/packet-ros.c
+++ b/epan/dissectors/packet-ros.c
@@ -48,6 +48,9 @@
 #define PSNAME "ROS"
 #define PFNAME "ros"
 
+void proto_register_ros(void);
+void proto_reg_handoff_ros(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_ros = -1;
 
@@ -110,7 +113,7 @@ static int hf_ros_local = -1;                     /* INTEGER */
 static int hf_ros_global = -1;                    /* OBJECT_IDENTIFIER */
 
 /*--- End of included file: packet-ros-hf.c ---*/
-#line 74 "../../asn1/ros/packet-ros-template.c"
+#line 77 "../../asn1/ros/packet-ros-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_ros = -1;
@@ -128,7 +131,7 @@ static gint ett_ros_InvokeId = -1;
 static gint ett_ros_Code = -1;
 
 /*--- End of included file: packet-ros-ett.c ---*/
-#line 78 "../../asn1/ros/packet-ros-template.c"
+#line 81 "../../asn1/ros/packet-ros-template.c"
 
 static dissector_table_t ros_oid_dissector_table=NULL;
 
@@ -1010,7 +1013,7 @@ dissect_ros_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a
 
 
 /*--- End of included file: packet-ros-fn.c ---*/
-#line 369 "../../asn1/ros/packet-ros-template.c"
+#line 372 "../../asn1/ros/packet-ros-template.c"
 
 /*
 * Dissect ROS PDUs inside a PPDU.
@@ -1241,7 +1244,7 @@ void proto_register_ros(void) {
         "OBJECT_IDENTIFIER", HFILL }},
 
 /*--- End of included file: packet-ros-hfarr.c ---*/
-#line 487 "../../asn1/ros/packet-ros-template.c"
+#line 490 "../../asn1/ros/packet-ros-template.c"
   };
 
   /* List of subtrees */
@@ -1262,7 +1265,7 @@ void proto_register_ros(void) {
     &ett_ros_Code,
 
 /*--- End of included file: packet-ros-ettarr.c ---*/
-#line 494 "../../asn1/ros/packet-ros-template.c"
+#line 497 "../../asn1/ros/packet-ros-template.c"
   };
 
   /* Register protocol */

diff --git a/epan/dissectors/packet-rua.c b/epan/dissectors/packet-rua.c
index 2cbecdfdf54882b49c85dd12e340a9fd9facff34..2ebd375ae3531c0f16b9091b3764827768ff23cc 100644 (file)
--- a/epan/dissectors/packet-rua.c
+++ b/epan/dissectors/packet-rua.c
@@ -56,6 +56,8 @@
 /* Dissector to use SCTP PPID 19 or a configured SCTP port. IANA assigned port = 29169*/
 #define SCTP_PORT_RUA              29169;
 
+void proto_register_rua(void);
+
 
 /*--- Included file: packet-rua-val.h ---*/
 #line 1 "../../asn1/rua/packet-rua-val.h"
@@ -85,7 +87,7 @@ typedef enum _ProtocolIE_ID_enum {
 } ProtocolIE_ID_enum;
 
 /*--- End of included file: packet-rua-val.h ---*/
-#line 52 "../../asn1/rua/packet-rua-template.c"
+#line 54 "../../asn1/rua/packet-rua-template.c"
 
 /* Initialize the protocol and registered fields */
 static int proto_rua = -1;
@@ -162,7 +164,7 @@ static int hf_rua_successfulOutcome_value = -1;   /* SuccessfulOutcome_value */
 static int hf_rua_unsuccessfulOutcome_value = -1;  /* UnsuccessfulOutcome_value */
 
 /*--- End of included file: packet-rua-hf.c ---*/
-#line 57 "../../asn1/rua/packet-rua-template.c"
+#line 59 "../../asn1/rua/packet-rua-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_rua = -1;
@@ -211,7 +213,7 @@ static gint ett_rua_SuccessfulOutcome = -1;
 static gint ett_rua_UnsuccessfulOutcome = -1;
 
 /*--- End of included file: packet-rua-ett.c ---*/
-#line 65 "../../asn1/rua/packet-rua-template.c"
+#line 67 "../../asn1/rua/packet-rua-template.c"
 
 /* Global variables */
 static guint32 ProcedureCode;
@@ -1357,7 +1359,7 @@ static void dissect_RUA_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
 
 
 /*--- End of included file: packet-rua-fn.c ---*/
-#line 87 "../../asn1/rua/packet-rua-template.c"
+#line 89 "../../asn1/rua/packet-rua-template.c"
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
@@ -1681,7 +1683,7 @@ module_t *rua_module;
         "UnsuccessfulOutcome_value", HFILL }},
 
 /*--- End of included file: packet-rua-hfarr.c ---*/
-#line 138 "../../asn1/rua/packet-rua-template.c"
+#line 140 "../../asn1/rua/packet-rua-template.c"
   };
 
   /* List of subtrees */
@@ -1728,7 +1730,7 @@ module_t *rua_module;
     &ett_rua_UnsuccessfulOutcome,
 
 /*--- End of included file: packet-rua-ettarr.c ---*/
-#line 144 "../../asn1/rua/packet-rua-template.c"
+#line 146 "../../asn1/rua/packet-rua-template.c"
   };
 
 
@@ -1787,7 +1789,7 @@ proto_reg_handoff_rua(void)
 
 
 /*--- End of included file: packet-rua-dis-tab.c ---*/
-#line 183 "../../asn1/rua/packet-rua-template.c"
+#line 185 "../../asn1/rua/packet-rua-template.c"
 
         } else {
                 dissector_delete_uint("sctp.port", sctp_port, rua_handle);

diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c
index 6a1fa3dd13185c1439dc2e91a535de536e4cdc84..ce630f0fe5ba15637f6b61d142fa1201085d19d6 100644 (file)
--- a/epan/dissectors/packet-s1ap.c
+++ b/epan/dissectors/packet-s1ap.c
@@ -67,6 +67,9 @@
 /* Dissector will use SCTP PPID 18 or SCTP port. IANA assigned port = 36412 */
 #define SCTP_PORT_S1AP 36412
 
+void proto_register_s1ap(void);
+void proto_reg_handoff_s1ap(void);
+
 static dissector_handle_t nas_eps_handle;
 static dissector_handle_t lppa_handle;
 static dissector_handle_t bssgp_handle;
@@ -327,7 +330,7 @@ typedef enum _ProtocolIE_ID_enum {
 } ProtocolIE_ID_enum;
 
 /*--- End of included file: packet-s1ap-val.h ---*/
-#line 67 "../../asn1/s1ap/packet-s1ap-template.c"
+#line 70 "../../asn1/s1ap/packet-s1ap-template.c"
 
 /* Initialize the protocol and registered fields */
 static int proto_s1ap = -1;
@@ -806,7 +809,7 @@ static int hf_s1ap_candidateCellList = -1;        /* CandidateCellList */
 static int hf_s1ap_CandidateCellList_item = -1;   /* IRAT_Cell_ID */
 
 /*--- End of included file: packet-s1ap-hf.c ---*/
-#line 74 "../../asn1/s1ap/packet-s1ap-template.c"
+#line 77 "../../asn1/s1ap/packet-s1ap-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_s1ap = -1;
@@ -1061,7 +1064,7 @@ static gint ett_s1ap_HOReport = -1;
 static gint ett_s1ap_CandidateCellList = -1;
 
 /*--- End of included file: packet-s1ap-ett.c ---*/
-#line 85 "../../asn1/s1ap/packet-s1ap-template.c"
+#line 88 "../../asn1/s1ap/packet-s1ap-template.c"
 
 enum{
        INITIATING_MESSAGE,
@@ -9155,7 +9158,7 @@ int dissect_s1ap_SONtransferCause_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
 
 
 /*--- End of included file: packet-s1ap-fn.c ---*/
-#line 130 "../../asn1/s1ap/packet-s1ap-template.c"
+#line 133 "../../asn1/s1ap/packet-s1ap-template.c"
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
@@ -9446,7 +9449,7 @@ proto_reg_handoff_s1ap(void)
 
 
 /*--- End of included file: packet-s1ap-dis-tab.c ---*/
-#line 202 "../../asn1/s1ap/packet-s1ap-template.c"
+#line 205 "../../asn1/s1ap/packet-s1ap-template.c"
        } else {
                if (SctpPort != 0) {
                        dissector_delete_uint("sctp.port", SctpPort, s1ap_handle);
@@ -11347,7 +11350,7 @@ void proto_register_s1ap(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-s1ap-hfarr.c ---*/
-#line 230 "../../asn1/s1ap/packet-s1ap-template.c"
+#line 233 "../../asn1/s1ap/packet-s1ap-template.c"
   };
 
   /* List of subtrees */
@@ -11603,7 +11606,7 @@ void proto_register_s1ap(void) {
     &ett_s1ap_CandidateCellList,
 
 /*--- End of included file: packet-s1ap-ettarr.c ---*/
-#line 242 "../../asn1/s1ap/packet-s1ap-template.c"
+#line 245 "../../asn1/s1ap/packet-s1ap-template.c"
   };
 
   module_t *s1ap_module;

diff --git a/epan/dissectors/packet-sabp.c b/epan/dissectors/packet-sabp.c
index 32fc1b5924bbedd95ad00076ffc7bbb594300629..89aecc2f012b007e5570e177925e1ed5a988f41b 100644 (file)
--- a/epan/dissectors/packet-sabp.c
+++ b/epan/dissectors/packet-sabp.c
@@ -100,6 +100,9 @@ typedef enum _ProtocolIE_ID_enum {
 /*--- End of included file: packet-sabp-val.h ---*/
 #line 48 "../../asn1/sabp/packet-sabp-template.c"
 
+void proto_register_sabp(void);
+void proto_reg_handoff_sabp(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_sabp = -1;
 
@@ -191,7 +194,7 @@ static int hf_sabp_successfulOutcome_value = -1;  /* SuccessfulOutcome_value */
 static int hf_sabp_unsuccessfulOutcome_value = -1;  /* UnsuccessfulOutcome_value */
 
 /*--- End of included file: packet-sabp-hf.c ---*/
-#line 57 "../../asn1/sabp/packet-sabp-template.c"
+#line 60 "../../asn1/sabp/packet-sabp-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_sabp = -1;
@@ -247,7 +250,7 @@ static gint ett_sabp_SuccessfulOutcome = -1;
 static gint ett_sabp_UnsuccessfulOutcome = -1;
 
 /*--- End of included file: packet-sabp-ett.c ---*/
-#line 69 "../../asn1/sabp/packet-sabp-template.c"
+#line 72 "../../asn1/sabp/packet-sabp-template.c"
 
 /* Global variables */
 static guint32 ProcedureCode;
@@ -1727,7 +1730,7 @@ static int dissect_SABP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
 
 
 /*--- End of included file: packet-sabp-fn.c ---*/
-#line 94 "../../asn1/sabp/packet-sabp-template.c"
+#line 97 "../../asn1/sabp/packet-sabp-template.c"
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
@@ -2201,7 +2204,7 @@ void proto_register_sabp(void) {
         "UnsuccessfulOutcome_value", HFILL }},
 
 /*--- End of included file: packet-sabp-hfarr.c ---*/
-#line 247 "../../asn1/sabp/packet-sabp-template.c"
+#line 250 "../../asn1/sabp/packet-sabp-template.c"
   };
 
   /* List of subtrees */
@@ -2258,7 +2261,7 @@ void proto_register_sabp(void) {
     &ett_sabp_UnsuccessfulOutcome,
 
 /*--- End of included file: packet-sabp-ettarr.c ---*/
-#line 260 "../../asn1/sabp/packet-sabp-template.c"
+#line 263 "../../asn1/sabp/packet-sabp-template.c"
   };
 
 
@@ -2341,7 +2344,7 @@ proto_reg_handoff_sabp(void)
 
 
 /*--- End of included file: packet-sabp-dis-tab.c ---*/
-#line 297 "../../asn1/sabp/packet-sabp-template.c"
+#line 300 "../../asn1/sabp/packet-sabp-template.c"
 
 }
 

diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c
index c0e067a7b509447623d0f06cf753ad9632d7dea4..8aa67ea7e005e35a7d1eadb514e4878523419661 100644 (file)
--- a/epan/dissectors/packet-smrse.c
+++ b/epan/dissectors/packet-smrse.c
@@ -46,6 +46,9 @@
 
 #define TCP_PORT_SMRSE 4321
 
+void proto_register_smrse(void);
+void proto_reg_handoff_smrse(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_smrse = -1;
 static int hf_smrse_reserved = -1;
@@ -83,7 +86,7 @@ static int hf_smrse_sm_diag_info = -1;            /* RP_UD */
 static int hf_smrse_ms_address = -1;              /* SMS_Address */
 
 /*--- End of included file: packet-smrse-hf.c ---*/
-#line 48 "../../asn1/smrse/packet-smrse-template.c"
+#line 51 "../../asn1/smrse/packet-smrse-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_smrse = -1;
@@ -103,7 +106,7 @@ static gint ett_smrse_RPError = -1;
 static gint ett_smrse_RPAlertSC = -1;
 
 /*--- End of included file: packet-smrse-ett.c ---*/
-#line 52 "../../asn1/smrse/packet-smrse-template.c"
+#line 55 "../../asn1/smrse/packet-smrse-template.c"
 
 
 
@@ -479,7 +482,7 @@ dissect_smrse_RPAlertSC(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 
 
 /*--- End of included file: packet-smrse-fn.c ---*/
-#line 55 "../../asn1/smrse/packet-smrse-template.c"
+#line 58 "../../asn1/smrse/packet-smrse-template.c"
 
 static const value_string tag_vals[] = {
        {  1,   "AliveTest" },
@@ -692,7 +695,7 @@ void proto_register_smrse(void) {
         "SMS_Address", HFILL }},
 
 /*--- End of included file: packet-smrse-hfarr.c ---*/
-#line 159 "../../asn1/smrse/packet-smrse-template.c"
+#line 162 "../../asn1/smrse/packet-smrse-template.c"
   };
 
   /* List of subtrees */
@@ -714,7 +717,7 @@ void proto_register_smrse(void) {
     &ett_smrse_RPAlertSC,
 
 /*--- End of included file: packet-smrse-ettarr.c ---*/
-#line 165 "../../asn1/smrse/packet-smrse-template.c"
+#line 168 "../../asn1/smrse/packet-smrse-template.c"
   };
 
   /* Register protocol */

diff --git a/epan/dissectors/packet-sv.c b/epan/dissectors/packet-sv.c
index 5800953e6269ba8a28fca969dd78c2e69947eec8..4a6c63446101599b59e75120d88e99ab7894aa32 100644 (file)
--- a/epan/dissectors/packet-sv.c
+++ b/epan/dissectors/packet-sv.c
@@ -79,6 +79,8 @@
 /* see UCA Implementation Guideline for IEC 61850-9-2 */
 #define Q_DERIVED                              (1 << 13)
 
+void proto_register_sv(void);
+void proto_reg_handoff_sv(void);
 
 /* Data for SV tap */
 static int sv_tap = -1;
@@ -125,7 +127,7 @@ static int hf_sv_seqData = -1;                    /* Data */
 static int hf_sv_smpMod = -1;                     /* T_smpMod */
 
 /*--- End of included file: packet-sv-hf.c ---*/
-#line 103 "../../asn1/sv/packet-sv-template.c"
+#line 105 "../../asn1/sv/packet-sv-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_sv = -1;
@@ -141,7 +143,7 @@ static gint ett_sv_SEQUENCE_OF_ASDU = -1;
 static gint ett_sv_ASDU = -1;
 
 /*--- End of included file: packet-sv-ett.c ---*/
-#line 110 "../../asn1/sv/packet-sv-template.c"
+#line 112 "../../asn1/sv/packet-sv-template.c"
 
 #if 0
 static const value_string sv_q_validity_vals[] = {
@@ -446,7 +448,7 @@ dissect_sv_SampledValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
 
 
 /*--- End of included file: packet-sv-fn.c ---*/
-#line 191 "../../asn1/sv/packet-sv-template.c"
+#line 193 "../../asn1/sv/packet-sv-template.c"
 
 /*
 * Dissect SV PDUs inside a PPDU.
@@ -620,7 +622,7 @@ void proto_register_sv(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-sv-hfarr.c ---*/
-#line 308 "../../asn1/sv/packet-sv-template.c"
+#line 310 "../../asn1/sv/packet-sv-template.c"
        };
 
        /* List of subtrees */
@@ -637,7 +639,7 @@ void proto_register_sv(void) {
     &ett_sv_ASDU,
 
 /*--- End of included file: packet-sv-ettarr.c ---*/
-#line 316 "../../asn1/sv/packet-sv-template.c"
+#line 318 "../../asn1/sv/packet-sv-template.c"
        };
 
        /* Register protocol */

diff --git a/epan/dissectors/packet-t124.c b/epan/dissectors/packet-t124.c
index 5df10a6f63425f0371d24f80c66d4ec91343537b..e398141cfc93fec95f293a303cc1376dac053acb 100644 (file)
--- a/epan/dissectors/packet-t124.c
+++ b/epan/dissectors/packet-t124.c
@@ -52,6 +52,9 @@
 #define PSNAME "T.124"
 #define PFNAME "t124"
 
+void proto_register_t124(void);
+void proto_reg_handoff_t124(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_t124 = -1;
 static proto_tree *top_tree = NULL;
@@ -284,7 +287,7 @@ static int hf_t124_Segmentation_begin = -1;
 static int hf_t124_Segmentation_end = -1;
 
 /*--- End of included file: packet-t124-hf.c ---*/
-#line 52 "../../asn1/t124/packet-t124-template.c"
+#line 55 "../../asn1/t124/packet-t124-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_t124 = -1;
@@ -407,7 +410,7 @@ static gint ett_t124_TokenTestConfirm = -1;
 static gint ett_t124_DomainMCSPDU = -1;
 
 /*--- End of included file: packet-t124-ett.c ---*/
-#line 69 "../../asn1/t124/packet-t124-template.c"
+#line 72 "../../asn1/t124/packet-t124-template.c"
 
 
 /*--- Included file: packet-t124-fn.c ---*/
@@ -2877,7 +2880,7 @@ dissect_t124_DomainMCSPDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
 
 
 /*--- End of included file: packet-t124-fn.c ---*/
-#line 71 "../../asn1/t124/packet-t124-template.c"
+#line 74 "../../asn1/t124/packet-t124-template.c"
 
 static const per_sequence_t t124Heur_sequence[] = {
   { &hf_t124_t124Identifier , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_t124_Key },
@@ -3897,7 +3900,7 @@ void proto_register_t124(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-t124-hfarr.c ---*/
-#line 198 "../../asn1/t124/packet-t124-template.c"
+#line 201 "../../asn1/t124/packet-t124-template.c"
   };
 
   /* List of subtrees */
@@ -4010,7 +4013,7 @@ void proto_register_t124(void) {
     &ett_t124_DomainMCSPDU,
 
 /*--- End of included file: packet-t124-ettarr.c ---*/
-#line 205 "../../asn1/t124/packet-t124-template.c"
+#line 208 "../../asn1/t124/packet-t124-template.c"
   };
   
   /* Register protocol */

diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c
index 301a9ae0d175c32be72ddd8da7ca7b8351129d09..ac4bc55f849e4ed99833349770b8e9f08da90ff8 100644 (file)
--- a/epan/dissectors/packet-t125.c
+++ b/epan/dissectors/packet-t125.c
@@ -47,6 +47,8 @@
 #define PSNAME "T.125"
 #define PFNAME "t125"
 
+void proto_register_t125(void);
+void proto_reg_handoff_t125(void);
 
 /* Initialize the protocol and registered fields */
 static int proto_t125 = -1;
@@ -81,7 +83,7 @@ static int hf_t125_connect_additional = -1;       /* Connect_Additional */
 static int hf_t125_connect_result = -1;           /* Connect_Result */
 
 /*--- End of included file: packet-t125-hf.c ---*/
-#line 47 "../../asn1/t125/packet-t125-template.c"
+#line 49 "../../asn1/t125/packet-t125-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_t125 = -1;
@@ -100,7 +102,7 @@ static gint ett_t125_Connect_Result_U = -1;
 static gint ett_t125_ConnectMCSPDU = -1;
 
 /*--- End of included file: packet-t125-ett.c ---*/
-#line 55 "../../asn1/t125/packet-t125-template.c"
+#line 57 "../../asn1/t125/packet-t125-template.c"
 
 static heur_dissector_list_t t125_heur_subdissector_list;
 
@@ -383,7 +385,7 @@ static int dissect_ConnectMCSPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
 
 
 /*--- End of included file: packet-t125-fn.c ---*/
-#line 59 "../../asn1/t125/packet-t125-template.c"
+#line 61 "../../asn1/t125/packet-t125-template.c"
 
 static int
 dissect_t125(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_)
@@ -587,7 +589,7 @@ void proto_register_t125(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-t125-hfarr.c ---*/
-#line 158 "../../asn1/t125/packet-t125-template.c"
+#line 160 "../../asn1/t125/packet-t125-template.c"
   };
 
   /* List of subtrees */
@@ -604,7 +606,7 @@ void proto_register_t125(void) {
     &ett_t125_ConnectMCSPDU,
 
 /*--- End of included file: packet-t125-ettarr.c ---*/
-#line 164 "../../asn1/t125/packet-t125-template.c"
+#line 166 "../../asn1/t125/packet-t125-template.c"
   };
 
   /* Register protocol */

diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c
index 94633d9b331c6ca6100d20155461adbe1596d5ec..150b7bcfda1f25ca96c96afb94697f236d5e3969 100644 (file)
--- a/epan/dissectors/packet-t38.c
+++ b/epan/dissectors/packet-t38.c
@@ -72,6 +72,9 @@
 #include <epan/emem.h>
 #include <epan/strutil.h>
 
+void proto_register_t38(void);
+void proto_reg_handoff_t38(void);
+
 #define PORT_T38 6004
 static guint global_t38_tcp_port = PORT_T38;
 static guint global_t38_udp_port = PORT_T38;
@@ -149,7 +152,7 @@ static int hf_t38_fec_data = -1;                  /* T_fec_data */
 static int hf_t38_fec_data_item = -1;             /* OCTET_STRING */
 
 /*--- End of included file: packet-t38-hf.c ---*/
-#line 122 "../../asn1/t38/packet-t38-template.c"
+#line 125 "../../asn1/t38/packet-t38-template.c"
 
 /* T38 setup fields */
 static int hf_t38_setup        = -1;
@@ -183,7 +186,7 @@ static gint ett_t38_T_fec_info = -1;
 static gint ett_t38_T_fec_data = -1;
 
 /*--- End of included file: packet-t38-ett.c ---*/
-#line 142 "../../asn1/t38/packet-t38-template.c"
+#line 145 "../../asn1/t38/packet-t38-template.c"
 static gint ett_t38_setup = -1;
 
 static gint ett_data_fragment = -1;
@@ -974,7 +977,7 @@ static int dissect_UDPTLPacket_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr
 
 
 /*--- End of included file: packet-t38-fn.c ---*/
-#line 388 "../../asn1/t38/packet-t38-template.c"
+#line 391 "../../asn1/t38/packet-t38-template.c"
 
 /* initialize the tap t38_info and the conversation */
 static void
@@ -1330,7 +1333,7 @@ proto_register_t38(void)
         "OCTET_STRING", HFILL }},
 
 /*--- End of included file: packet-t38-hfarr.c ---*/
-#line 667 "../../asn1/t38/packet-t38-template.c"
+#line 670 "../../asn1/t38/packet-t38-template.c"
                {   &hf_t38_setup,
                    { "Stream setup", "t38.setup", FT_STRING, BASE_NONE,
                    NULL, 0x0, "Stream setup, method and frame number", HFILL }},
@@ -1391,7 +1394,7 @@ proto_register_t38(void)
     &ett_t38_T_fec_data,
 
 /*--- End of included file: packet-t38-ettarr.c ---*/
-#line 714 "../../asn1/t38/packet-t38-template.c"
+#line 717 "../../asn1/t38/packet-t38-template.c"
                &ett_t38_setup,
                &ett_data_fragment,
                &ett_data_fragments

diff --git a/epan/dissectors/packet-ulp.c b/epan/dissectors/packet-ulp.c
index 22b08c1e2e208ad847a144124de7c9fe83364309..04084de8cb1d8f0f9417774c5944645709e84a8f 100644 (file)
--- a/epan/dissectors/packet-ulp.c
+++ b/epan/dissectors/packet-ulp.c
@@ -49,6 +49,8 @@
 #define PSNAME "ULP"
 #define PFNAME "ulp"
 
+void proto_register_ulp(void);
+
 static dissector_handle_t rrlp_handle;
 static dissector_handle_t lpp_handle;
 
@@ -668,7 +670,7 @@ static int hf_ulp_GANSSSignals_signal7 = -1;
 static int hf_ulp_GANSSSignals_signal8 = -1;
 
 /*--- End of included file: packet-ulp-hf.c ---*/
-#line 62 "../../asn1/ulp/packet-ulp-template.c"
+#line 64 "../../asn1/ulp/packet-ulp-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_ulp = -1;
@@ -885,7 +887,7 @@ static gint ett_ulp_PolygonArea = -1;
 static gint ett_ulp_PolygonDescription = -1;
 
 /*--- End of included file: packet-ulp-ett.c ---*/
-#line 66 "../../asn1/ulp/packet-ulp-template.c"
+#line 68 "../../asn1/ulp/packet-ulp-template.c"
 
 /* Include constants */
 
@@ -908,7 +910,7 @@ static gint ett_ulp_PolygonDescription = -1;
 #define maxWimaxBSMeas                 32
 
 /*--- End of included file: packet-ulp-val.h ---*/
-#line 69 "../../asn1/ulp/packet-ulp-template.c"
+#line 71 "../../asn1/ulp/packet-ulp-template.c"
 
 
 
@@ -6269,7 +6271,7 @@ static void dissect_ULP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
 
 
 /*--- End of included file: packet-ulp-fn.c ---*/
-#line 72 "../../asn1/ulp/packet-ulp-template.c"
+#line 74 "../../asn1/ulp/packet-ulp-template.c"
 
 
 static guint
@@ -8683,7 +8685,7 @@ void proto_register_ulp(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-ulp-hfarr.c ---*/
-#line 97 "../../asn1/ulp/packet-ulp-template.c"
+#line 99 "../../asn1/ulp/packet-ulp-template.c"
   };
 
   /* List of subtrees */
@@ -8902,7 +8904,7 @@ void proto_register_ulp(void) {
     &ett_ulp_PolygonDescription,
 
 /*--- End of included file: packet-ulp-ettarr.c ---*/
-#line 103 "../../asn1/ulp/packet-ulp-template.c"
+#line 105 "../../asn1/ulp/packet-ulp-template.c"
   };
 
   module_t *ulp_module;

diff --git a/epan/dissectors/packet-wlancertextn.c b/epan/dissectors/packet-wlancertextn.c
index 7945cf6db2212213a0a22415e006302e2eca041e..25a9239344e171b053814da40aac06cc99ccbf95 100644 (file)
--- a/epan/dissectors/packet-wlancertextn.c
+++ b/epan/dissectors/packet-wlancertextn.c
@@ -48,6 +48,9 @@
 #define PSNAME "WLANCERTEXTN"
 #define PFNAME "wlancertextn"
 
+void proto_register_wlancertextn(void);
+void proto_reg_handoff_wlancertextn(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_wlancertextn = -1;
 
@@ -57,7 +60,7 @@ static int hf_wlancertextn_SSIDList_PDU = -1;     /* SSIDList */
 static int hf_wlancertextn_SSIDList_item = -1;    /* SSID */
 
 /*--- End of included file: packet-wlancertextn-hf.c ---*/
-#line 46 "../../asn1/wlancertextn/packet-wlancertextn-template.c"
+#line 49 "../../asn1/wlancertextn/packet-wlancertextn-template.c"
 
 /* Initialize the subtree pointers */
 
@@ -66,7 +69,7 @@ static int hf_wlancertextn_SSIDList_item = -1;    /* SSID */
 static gint ett_wlancertextn_SSIDList = -1;
 
 /*--- End of included file: packet-wlancertextn-ett.c ---*/
-#line 49 "../../asn1/wlancertextn/packet-wlancertextn-template.c"
+#line 52 "../../asn1/wlancertextn/packet-wlancertextn-template.c"
 
 
 /*--- Included file: packet-wlancertextn-fn.c ---*/
@@ -104,7 +107,7 @@ static void dissect_SSIDList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot
 
 
 /*--- End of included file: packet-wlancertextn-fn.c ---*/
-#line 51 "../../asn1/wlancertextn/packet-wlancertextn-template.c"
+#line 54 "../../asn1/wlancertextn/packet-wlancertextn-template.c"
 
 
 /*--- proto_register_wlancertextn ----------------------------------------------*/
@@ -125,7 +128,7 @@ void proto_register_wlancertextn(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-wlancertextn-hfarr.c ---*/
-#line 59 "../../asn1/wlancertextn/packet-wlancertextn-template.c"
+#line 62 "../../asn1/wlancertextn/packet-wlancertextn-template.c"
   };
 
   /* List of subtrees */
@@ -136,7 +139,7 @@ void proto_register_wlancertextn(void) {
     &ett_wlancertextn_SSIDList,
 
 /*--- End of included file: packet-wlancertextn-ettarr.c ---*/
-#line 64 "../../asn1/wlancertextn/packet-wlancertextn-template.c"
+#line 67 "../../asn1/wlancertextn/packet-wlancertextn-template.c"
   };
 
   /* Register protocol */
@@ -159,7 +162,7 @@ void proto_reg_handoff_wlancertextn(void) {
 
 
 /*--- End of included file: packet-wlancertextn-dis-tab.c ---*/
-#line 79 "../../asn1/wlancertextn/packet-wlancertextn-template.c"
+#line 82 "../../asn1/wlancertextn/packet-wlancertextn-template.c"
   oid_add_from_string("id-kp-eapOverPPP","1.3.6.1.5.5.7.3.13");
   oid_add_from_string("id-kp-eapOverLAN","1.3.6.1.5.5.7.3.14");
 }

diff --git a/epan/dissectors/packet-x224.c b/epan/dissectors/packet-x224.c
index 4c7b35fad363e3910af4c119a0cf83a248ad7005..14ee05cbecc83c605b2ceee8e9c0dcf87d7d1880 100644 (file)
--- a/epan/dissectors/packet-x224.c
+++ b/epan/dissectors/packet-x224.c
@@ -33,6 +33,9 @@
 #include <epan/conversation.h>
 #include <epan/emem.h>
 
+void proto_register_x224(void);
+void proto_reg_handoff_x224(void);
+
 /* X.224 header fields             */
 static int proto_x224                  = -1;
 static int hf_x224_length              = -1;

diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c
index 577d7f161b2b827e32f51dea8091a897a89a2372..87f62b519de5267e37de157f43d9bff8c5798fdc 100644 (file)
--- a/epan/dissectors/packet-x2ap.c
+++ b/epan/dissectors/packet-x2ap.c
@@ -58,6 +58,8 @@
 #define PSNAME "X2AP"
 #define PFNAME "x2ap"
 
+void proto_register_x2ap(void);
+
 /* Dissector will use SCTP PPID 27 or SCTP port. IANA assigned port = 36422 */
 #define SCTP_PORT_X2AP 36422
 
@@ -184,7 +186,7 @@ typedef enum _ProtocolIE_ID_enum {
 } ProtocolIE_ID_enum;
 
 /*--- End of included file: packet-x2ap-val.h ---*/
-#line 57 "../../asn1/x2ap/packet-x2ap-template.c"
+#line 59 "../../asn1/x2ap/packet-x2ap-template.c"
 
 /* Initialize the protocol and registered fields */
 static int proto_x2ap = -1;
@@ -513,7 +515,7 @@ static int hf_x2ap_successfulOutcome_value = -1;  /* SuccessfulOutcome_value */
 static int hf_x2ap_value = -1;                    /* UnsuccessfulOutcome_value */
 
 /*--- End of included file: packet-x2ap-hf.c ---*/
-#line 63 "../../asn1/x2ap/packet-x2ap-template.c"
+#line 65 "../../asn1/x2ap/packet-x2ap-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_x2ap = -1;
@@ -665,7 +667,7 @@ static gint ett_x2ap_SuccessfulOutcome = -1;
 static gint ett_x2ap_UnsuccessfulOutcome = -1;
 
 /*--- End of included file: packet-x2ap-ett.c ---*/
-#line 68 "../../asn1/x2ap/packet-x2ap-template.c"
+#line 70 "../../asn1/x2ap/packet-x2ap-template.c"
 
 /* Global variables */
 static guint32 ProcedureCode;
@@ -5424,7 +5426,7 @@ static void dissect_X2AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot
 
 
 /*--- End of included file: packet-x2ap-fn.c ---*/
-#line 89 "../../asn1/x2ap/packet-x2ap-template.c"
+#line 91 "../../asn1/x2ap/packet-x2ap-template.c"
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
@@ -6759,7 +6761,7 @@ void proto_register_x2ap(void) {
         "UnsuccessfulOutcome_value", HFILL }},
 
 /*--- End of included file: packet-x2ap-hfarr.c ---*/
-#line 147 "../../asn1/x2ap/packet-x2ap-template.c"
+#line 149 "../../asn1/x2ap/packet-x2ap-template.c"
   };
 
   /* List of subtrees */
@@ -6913,7 +6915,7 @@ void proto_register_x2ap(void) {
     &ett_x2ap_UnsuccessfulOutcome,
 
 /*--- End of included file: packet-x2ap-ettarr.c ---*/
-#line 154 "../../asn1/x2ap/packet-x2ap-template.c"
+#line 156 "../../asn1/x2ap/packet-x2ap-template.c"
   };
 
   module_t *x2ap_module;
@@ -7067,7 +7069,7 @@ proto_reg_handoff_x2ap(void)
 
 
 /*--- End of included file: packet-x2ap-dis-tab.c ---*/
-#line 200 "../../asn1/x2ap/packet-x2ap-template.c"
+#line 202 "../../asn1/x2ap/packet-x2ap-template.c"
        } else {
                if (SctpPort != 0) {
                        dissector_delete_uint("sctp.port", SctpPort, x2ap_handle);

diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c
index 0e512b679a723cd455914a8c6b18de4bf2c8ffc9..676c417aa6b8cf82c3e45c5e56be292374df1a7d 100644 (file)
--- a/epan/dissectors/packet-x509af.c
+++ b/epan/dissectors/packet-x509af.c
@@ -49,6 +49,9 @@
 #define PSNAME "X509AF"
 #define PFNAME "x509af"
 
+void proto_register_x509af(void);
+void proto_reg_handoff_x509af(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_x509af = -1;
 static int hf_x509af_algorithm_id = -1;
@@ -132,7 +135,7 @@ static int hf_x509af_q = -1;                      /* INTEGER */
 static int hf_x509af_g = -1;                      /* INTEGER */
 
 /*--- End of included file: packet-x509af-hf.c ---*/
-#line 49 "../../asn1/x509af/packet-x509af-template.c"
+#line 52 "../../asn1/x509af/packet-x509af-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_pkix_crl = -1;
@@ -173,7 +176,7 @@ static gint ett_x509af_SET_OF_AttributeType = -1;
 static gint ett_x509af_DSS_Params = -1;
 
 /*--- End of included file: packet-x509af-ett.c ---*/
-#line 53 "../../asn1/x509af/packet-x509af-template.c"
+#line 56 "../../asn1/x509af/packet-x509af-template.c"
 
 static const char *algorithm_id;
 static const char *extension_id;
@@ -887,7 +890,7 @@ static void dissect_DSS_Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr
 
 
 /*--- End of included file: packet-x509af-fn.c ---*/
-#line 58 "../../asn1/x509af/packet-x509af-template.c"
+#line 61 "../../asn1/x509af/packet-x509af-template.c"
 
 const char *x509af_get_last_algorithm_id(void) {
   return algorithm_id;
@@ -1229,7 +1232,7 @@ void proto_register_x509af(void) {
         "INTEGER", HFILL }},
 
 /*--- End of included file: packet-x509af-hfarr.c ---*/
-#line 99 "../../asn1/x509af/packet-x509af-template.c"
+#line 102 "../../asn1/x509af/packet-x509af-template.c"
   };
 
   /* List of subtrees */
@@ -1272,7 +1275,7 @@ void proto_register_x509af(void) {
     &ett_x509af_DSS_Params,
 
 /*--- End of included file: packet-x509af-ettarr.c ---*/
-#line 105 "../../asn1/x509af/packet-x509af-template.c"
+#line 108 "../../asn1/x509af/packet-x509af-template.c"
   };
 
   /* Register protocol */
@@ -1315,7 +1318,7 @@ void proto_reg_handoff_x509af(void) {
 
 
 /*--- End of included file: packet-x509af-dis-tab.c ---*/
-#line 133 "../../asn1/x509af/packet-x509af-template.c"
+#line 136 "../../asn1/x509af/packet-x509af-template.c"
 
        /*XXX these should really go to a better place but since that
          I have not that ITU standard, ill put it here for the time

diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c
index 6a9291c222ec39beae30091ba584ed80a5c73565..6f55926e6ca7fbac35df20e56ca00c8c67cc390a 100644 (file)
--- a/ui/cli/tap-comparestat.c
+++ b/ui/cli/tap-comparestat.c
@@ -128,7 +128,7 @@ comparestat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const
        cksum_vec[1].ptr=&ci->ip_p;
        cksum_vec[1].len=1;
        /* skip header checksum and ip's (because of NAT)*/
-       cksum_vec[2].ptr=(guint8 *)ci->ip_dst.data;
+       cksum_vec[2].ptr=(const guint8 *)ci->ip_dst.data;
        cksum_vec[2].ptr=cksum_vec[2].ptr+ci->ip_dst.len;
        /* dynamic computation */
        cksum_vec[2].len=pinfo->iphdrlen-20;