diff options
author | Anders Broman <anders.broman@ericsson.com> | 2013-12-07 11:37:58 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2013-12-07 11:37:58 +0000 |
commit | eb252d2d3471d5b80af847cd536048fc05c4ae5f (patch) | |
tree | 776d04fbeb6cbfb1c42b28a1a6518b18fd846d26 /epan/dissectors | |
parent | c67d38cf15be33536de6da517221cf7ce7285f8e (diff) |
- Make local functions static.
- Forward declaration of register functions.
svn path=/trunk/; revision=53821
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-p772.c | 18 | ||||
-rw-r--r-- | epan/dissectors/packet-pkcs1.c | 15 | ||||
-rw-r--r-- | epan/dissectors/packet-pkixproxy.c | 14 | ||||
-rw-r--r-- | epan/dissectors/packet-pkixqualified.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-pkixtsp.c | 15 | ||||
-rw-r--r-- | epan/dissectors/packet-q932-ros.c | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-rrlp.c | 14 | ||||
-rw-r--r-- | epan/dissectors/packet-sbc-ap.c | 17 | ||||
-rw-r--r-- | epan/dissectors/packet-spnego.c | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-t38.c | 13 | ||||
-rw-r--r-- | epan/dissectors/packet-umts_fp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-umts_mac.c | 5 | ||||
-rw-r--r-- | epan/dissectors/packet-uts.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-v120.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-v150fw.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-v52.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-v5dl.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-v5ua.c | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-x509ce.c | 15 | ||||
-rw-r--r-- | epan/dissectors/packet-x509if.c | 15 | ||||
-rw-r--r-- | epan/dissectors/packet-x509sat.c | 17 |
21 files changed, 136 insertions, 81 deletions
diff --git a/epan/dissectors/packet-p772.c b/epan/dissectors/packet-p772.c index e2dae421b8..697ec3b36c 100644 --- a/epan/dissectors/packet-p772.c +++ b/epan/dissectors/packet-p772.c @@ -49,6 +49,10 @@ #define PSNAME "P772" #define PFNAME "p772" +void proto_register_p772(void); +void proto_reg_handoff_p772(void); + + /* Initialize the protocol and registered fields */ static int proto_p772 = -1; @@ -162,7 +166,7 @@ static int proto_p772 = -1; #define ub_data_size 65535 /*--- End of included file: packet-p772-val.h ---*/ -#line 48 "../../asn1/p772/packet-p772-template.c" +#line 52 "../../asn1/p772/packet-p772-template.c" /*--- Included file: packet-p772-hf.c ---*/ @@ -248,7 +252,7 @@ static int hf_p772_Acp127NotificationType_acp127_pn = -1; static int hf_p772_Acp127NotificationType_acp127_tn = -1; /*--- End of included file: packet-p772-hf.c ---*/ -#line 50 "../../asn1/p772/packet-p772-template.c" +#line 54 "../../asn1/p772/packet-p772-template.c" /* Initialize the subtree pointers */ static gint ett_p772 = -1; @@ -284,7 +288,7 @@ static gint ett_p772_MMMessageParameters = -1; static gint ett_p772_Acp127NotificationType = -1; /*--- End of included file: packet-p772-ett.c ---*/ -#line 54 "../../asn1/p772/packet-p772-template.c" +#line 58 "../../asn1/p772/packet-p772-template.c" /*--- Included file: packet-p772-fn.c ---*/ @@ -1235,7 +1239,7 @@ static void dissect_Acp127NotificationType_PDU(tvbuff_t *tvb _U_, packet_info *p /*--- End of included file: packet-p772-fn.c ---*/ -#line 56 "../../asn1/p772/packet-p772-template.c" +#line 60 "../../asn1/p772/packet-p772-template.c" /* @@ -1586,7 +1590,7 @@ void proto_register_p772(void) { NULL, HFILL }}, /*--- End of included file: packet-p772-hfarr.c ---*/ -#line 90 "../../asn1/p772/packet-p772-template.c" +#line 94 "../../asn1/p772/packet-p772-template.c" }; /* List of subtrees */ @@ -1624,7 +1628,7 @@ void proto_register_p772(void) { &ett_p772_Acp127NotificationType, /*--- End of included file: packet-p772-ettarr.c ---*/ -#line 96 "../../asn1/p772/packet-p772-template.c" +#line 100 "../../asn1/p772/packet-p772-template.c" }; /* Register protocol */ @@ -1678,7 +1682,7 @@ void proto_reg_handoff_p772(void) { /*--- End of included file: packet-p772-dis-tab.c ---*/ -#line 114 "../../asn1/p772/packet-p772-template.c" +#line 118 "../../asn1/p772/packet-p772-template.c" register_ber_oid_dissector("1.3.26.0.4406.0.4.1", dissect_p772, proto_p772, "STANAG 4406"); } diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c index 192f70985a..cdda10158f 100644 --- a/epan/dissectors/packet-pkcs1.c +++ b/epan/dissectors/packet-pkcs1.c @@ -47,6 +47,9 @@ #define PSNAME "PKCS-1" #define PFNAME "pkcs-1" +void proto_register_pkcs1(void); +void proto_reg_handoff_pkcs1(void); + /* Initialize the protocol and registered fields */ static int proto_pkcs1 = -1; @@ -85,7 +88,7 @@ static int hf_pkcs1_r = -1; /* INTEGER */ static int hf_pkcs1_s = -1; /* INTEGER */ /*--- End of included file: packet-pkcs1-hf.c ---*/ -#line 45 "../../asn1/pkcs1/packet-pkcs1-template.c" +#line 48 "../../asn1/pkcs1/packet-pkcs1-template.c" /* Initialize the subtree pointers */ @@ -103,7 +106,7 @@ static gint ett_pkcs1_DSA_Sig_Value = -1; static gint ett_pkcs1_ECDSA_Sig_Value = -1; /*--- End of included file: packet-pkcs1-ett.c ---*/ -#line 48 "../../asn1/pkcs1/packet-pkcs1-template.c" +#line 51 "../../asn1/pkcs1/packet-pkcs1-template.c" /*--- Included file: packet-pkcs1-fn.c ---*/ @@ -373,7 +376,7 @@ static void dissect_ECParameters_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-pkcs1-fn.c ---*/ -#line 50 "../../asn1/pkcs1/packet-pkcs1-template.c" +#line 53 "../../asn1/pkcs1/packet-pkcs1-template.c" /*--- proto_register_pkcs1 ----------------------------------------------*/ void proto_register_pkcs1(void) { @@ -509,7 +512,7 @@ void proto_register_pkcs1(void) { "INTEGER", HFILL }}, /*--- End of included file: packet-pkcs1-hfarr.c ---*/ -#line 57 "../../asn1/pkcs1/packet-pkcs1-template.c" +#line 60 "../../asn1/pkcs1/packet-pkcs1-template.c" }; /* List of subtrees */ @@ -529,7 +532,7 @@ void proto_register_pkcs1(void) { &ett_pkcs1_ECDSA_Sig_Value, /*--- End of included file: packet-pkcs1-ettarr.c ---*/ -#line 62 "../../asn1/pkcs1/packet-pkcs1-template.c" +#line 65 "../../asn1/pkcs1/packet-pkcs1-template.c" }; /* Register protocol */ @@ -558,7 +561,7 @@ void proto_reg_handoff_pkcs1(void) { /*--- End of included file: packet-pkcs1-dis-tab.c ---*/ -#line 77 "../../asn1/pkcs1/packet-pkcs1-template.c" +#line 80 "../../asn1/pkcs1/packet-pkcs1-template.c" register_ber_oid_dissector("1.2.840.113549.2.2", dissect_ber_oid_NULL_callback, proto_pkcs1, "md2"); register_ber_oid_dissector("1.2.840.113549.2.4", dissect_ber_oid_NULL_callback, proto_pkcs1, "md4"); diff --git a/epan/dissectors/packet-pkixproxy.c b/epan/dissectors/packet-pkixproxy.c index 4a913d5d5d..770cbcd2cd 100644 --- a/epan/dissectors/packet-pkixproxy.c +++ b/epan/dissectors/packet-pkixproxy.c @@ -45,6 +45,8 @@ #define PSNAME "PKIXPROXY" #define PFNAME "pkixproxy" +void proto_register_pkixproxy(void); + /* Initialize the protocol and registered fields */ static int proto_pkixproxy = -1; @@ -57,7 +59,7 @@ static int hf_pkixproxy_policyLanguage = -1; /* OBJECT_IDENTIFIER */ static int hf_pkixproxy_policy = -1; /* OCTET_STRING */ /*--- End of included file: packet-pkixproxy-hf.c ---*/ -#line 43 "../../asn1/pkixproxy/packet-pkixproxy-template.c" +#line 45 "../../asn1/pkixproxy/packet-pkixproxy-template.c" /* Initialize the subtree pointers */ @@ -67,7 +69,7 @@ static gint ett_pkixproxy_ProxyCertInfoExtension = -1; static gint ett_pkixproxy_ProxyPolicy = -1; /*--- End of included file: packet-pkixproxy-ett.c ---*/ -#line 46 "../../asn1/pkixproxy/packet-pkixproxy-template.c" +#line 48 "../../asn1/pkixproxy/packet-pkixproxy-template.c" /*--- Included file: packet-pkixproxy-fn.c ---*/ @@ -141,7 +143,7 @@ static void dissect_ProxyCertInfoExtension_PDU(tvbuff_t *tvb _U_, packet_info *p /*--- End of included file: packet-pkixproxy-fn.c ---*/ -#line 48 "../../asn1/pkixproxy/packet-pkixproxy-template.c" +#line 50 "../../asn1/pkixproxy/packet-pkixproxy-template.c" /*--- proto_register_pkixproxy ----------------------------------------------*/ @@ -174,7 +176,7 @@ void proto_register_pkixproxy(void) { "OCTET_STRING", HFILL }}, /*--- End of included file: packet-pkixproxy-hfarr.c ---*/ -#line 56 "../../asn1/pkixproxy/packet-pkixproxy-template.c" +#line 58 "../../asn1/pkixproxy/packet-pkixproxy-template.c" }; /* List of subtrees */ @@ -186,7 +188,7 @@ void proto_register_pkixproxy(void) { &ett_pkixproxy_ProxyPolicy, /*--- End of included file: packet-pkixproxy-ettarr.c ---*/ -#line 61 "../../asn1/pkixproxy/packet-pkixproxy-template.c" +#line 63 "../../asn1/pkixproxy/packet-pkixproxy-template.c" }; /* Register protocol */ @@ -208,7 +210,7 @@ void proto_reg_handoff_pkixproxy(void) { /*--- End of included file: packet-pkixproxy-dis-tab.c ---*/ -#line 76 "../../asn1/pkixproxy/packet-pkixproxy-template.c" +#line 78 "../../asn1/pkixproxy/packet-pkixproxy-template.c" oid_add_from_string("id-ppl-anyLanguage","1.3.6.1.5.5.7.21.0"); oid_add_from_string("id-ppl-inheritAll","1.3.6.1.5.5.7.21.1"); oid_add_from_string("id-ppl-independent","1.3.6.1.5.5.7.21.2"); diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c index dec8946196..b64f1599c5 100644 --- a/epan/dissectors/packet-pkixqualified.c +++ b/epan/dissectors/packet-pkixqualified.c @@ -47,6 +47,10 @@ #define PSNAME "PKIXQUALIFIED" #define PFNAME "pkixqualified" +void proto_register_pkixqualified(void); +void proto_reg_handoff_pkixqualified(void); + + /* Initialize the protocol and registered fields */ static int proto_pkixqualified = -1; @@ -74,7 +78,7 @@ static int hf_pkixqualified_nameRegistrationAuthorities = -1; /* NameRegistrati static int hf_pkixqualified_NameRegistrationAuthorities_item = -1; /* GeneralName */ /*--- End of included file: packet-pkixqualified-hf.c ---*/ -#line 45 "../../asn1/pkixqualified/packet-pkixqualified-template.c" +#line 49 "../../asn1/pkixqualified/packet-pkixqualified-template.c" /* Initialize the subtree pointers */ @@ -89,7 +93,7 @@ static gint ett_pkixqualified_SemanticsInformation = -1; static gint ett_pkixqualified_NameRegistrationAuthorities = -1; /*--- End of included file: packet-pkixqualified-ett.c ---*/ -#line 48 "../../asn1/pkixqualified/packet-pkixqualified-template.c" +#line 52 "../../asn1/pkixqualified/packet-pkixqualified-template.c" static const char *object_identifier_id; @@ -351,7 +355,7 @@ static void dissect_XmppAddr_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot /*--- End of included file: packet-pkixqualified-fn.c ---*/ -#line 52 "../../asn1/pkixqualified/packet-pkixqualified-template.c" +#line 56 "../../asn1/pkixqualified/packet-pkixqualified-template.c" /*--- proto_register_pkixqualified ----------------------------------------------*/ @@ -444,7 +448,7 @@ void proto_register_pkixqualified(void) { NULL, HFILL }}, /*--- End of included file: packet-pkixqualified-hfarr.c ---*/ -#line 60 "../../asn1/pkixqualified/packet-pkixqualified-template.c" +#line 64 "../../asn1/pkixqualified/packet-pkixqualified-template.c" }; /* List of subtrees */ @@ -461,7 +465,7 @@ void proto_register_pkixqualified(void) { &ett_pkixqualified_NameRegistrationAuthorities, /*--- End of included file: packet-pkixqualified-ettarr.c ---*/ -#line 65 "../../asn1/pkixqualified/packet-pkixqualified-template.c" +#line 69 "../../asn1/pkixqualified/packet-pkixqualified-template.c" }; /* Register protocol */ @@ -492,6 +496,6 @@ void proto_reg_handoff_pkixqualified(void) { /*--- End of included file: packet-pkixqualified-dis-tab.c ---*/ -#line 80 "../../asn1/pkixqualified/packet-pkixqualified-template.c" +#line 84 "../../asn1/pkixqualified/packet-pkixqualified-template.c" } diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c index 187b6973fa..35c2d3f759 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -47,6 +47,9 @@ #define PSNAME "PKIXTSP" #define PFNAME "pkixtsp" +void proto_register_pkixtsp(void); +void proto_reg_handoff_pkixtsp(void); + /* Initialize the protocol and registered fields */ static int proto_pkixtsp = -1; @@ -86,7 +89,7 @@ static int hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable = -1; static int hf_pkixtsp_PKIFailureInfo_systemFailure = -1; /*--- End of included file: packet-pkixtsp-hf.c ---*/ -#line 45 "../../asn1/pkixtsp/packet-pkixtsp-template.c" +#line 48 "../../asn1/pkixtsp/packet-pkixtsp-template.c" /* Initialize the subtree pointers */ static gint ett_pkixtsp = -1; @@ -102,7 +105,7 @@ static gint ett_pkixtsp_TSTInfo = -1; static gint ett_pkixtsp_Accuracy = -1; /*--- End of included file: packet-pkixtsp-ett.c ---*/ -#line 49 "../../asn1/pkixtsp/packet-pkixtsp-template.c" +#line 52 "../../asn1/pkixtsp/packet-pkixtsp-template.c" @@ -359,7 +362,7 @@ static void dissect_TSTInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto /*--- End of included file: packet-pkixtsp-fn.c ---*/ -#line 52 "../../asn1/pkixtsp/packet-pkixtsp-template.c" +#line 55 "../../asn1/pkixtsp/packet-pkixtsp-template.c" static int @@ -539,7 +542,7 @@ void proto_register_pkixtsp(void) { NULL, HFILL }}, /*--- End of included file: packet-pkixtsp-hfarr.c ---*/ -#line 103 "../../asn1/pkixtsp/packet-pkixtsp-template.c" +#line 106 "../../asn1/pkixtsp/packet-pkixtsp-template.c" }; /* List of subtrees */ @@ -557,7 +560,7 @@ void proto_register_pkixtsp(void) { &ett_pkixtsp_Accuracy, /*--- End of included file: packet-pkixtsp-ettarr.c ---*/ -#line 109 "../../asn1/pkixtsp/packet-pkixtsp-template.c" +#line 112 "../../asn1/pkixtsp/packet-pkixtsp-template.c" }; /* Register protocol */ @@ -588,6 +591,6 @@ void proto_reg_handoff_pkixtsp(void) { /*--- End of included file: packet-pkixtsp-dis-tab.c ---*/ -#line 133 "../../asn1/pkixtsp/packet-pkixtsp-template.c" +#line 136 "../../asn1/pkixtsp/packet-pkixtsp-template.c" } diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c index 3adb8bb5b6..01ea7bf308 100644 --- a/epan/dissectors/packet-q932-ros.c +++ b/epan/dissectors/packet-q932-ros.c @@ -45,6 +45,9 @@ #define PSNAME "Q932.ROS" #define PFNAME "q932.ros" +void proto_register_q932_ros(void); +void proto_reg_handoff_q932_ros(void); + /* Initialize the protocol and registered fields */ static int proto_q932_ros = -1; @@ -76,7 +79,7 @@ static int hf_q932_ros_present = -1; /* INTEGER */ static int hf_q932_ros_InvokeId_present = -1; /* InvokeId_present */ /*--- End of included file: packet-q932-ros-hf.c ---*/ -#line 43 "../../asn1/q932-ros/packet-q932-ros-template.c" +#line 46 "../../asn1/q932-ros/packet-q932-ros-template.c" /* Initialize the subtree pointers */ @@ -94,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 46 "../../asn1/q932-ros/packet-q932-ros-template.c" +#line 49 "../../asn1/q932-ros/packet-q932-ros-template.c" static expert_field ei_ros_undecoded = EI_INIT; @@ -677,7 +680,7 @@ static int dissect_ROS_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree /*--- End of included file: packet-q932-ros-fn.c ---*/ -#line 63 "../../asn1/q932-ros/packet-q932-ros-template.c" +#line 66 "../../asn1/q932-ros/packet-q932-ros-template.c" /*--- dissect_q932_ros -----------------------------------------------------*/ static int dissect_q932_ros(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { @@ -792,7 +795,7 @@ void proto_register_q932_ros(void) { "InvokeId_present", HFILL }}, /*--- End of included file: packet-q932-ros-hfarr.c ---*/ -#line 77 "../../asn1/q932-ros/packet-q932-ros-template.c" +#line 80 "../../asn1/q932-ros/packet-q932-ros-template.c" }; /* List of subtrees */ @@ -812,7 +815,7 @@ void proto_register_q932_ros(void) { &ett_q932_ros_InvokeId, /*--- End of included file: packet-q932-ros-ettarr.c ---*/ -#line 82 "../../asn1/q932-ros/packet-q932-ros-template.c" +#line 85 "../../asn1/q932-ros/packet-q932-ros-template.c" }; static ei_register_info ei[] = { diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c index 6c0d137360..9928d46d6b 100644 --- a/epan/dissectors/packet-rrlp.c +++ b/epan/dissectors/packet-rrlp.c @@ -55,6 +55,8 @@ #pragma warning(disable:4146) #endif +void proto_register_rrlp(void); +void proto_reg_handoff_rrlp(void); /* Initialize the protocol and registered fields */ static int proto_rrlp = -1; @@ -886,7 +888,7 @@ static int hf_rrlp_GANSSModelID_model7 = -1; static int hf_rrlp_GANSSModelID_model8 = -1; /*--- End of included file: packet-rrlp-hf.c ---*/ -#line 56 "../../asn1/rrlp/packet-rrlp-template.c" +#line 58 "../../asn1/rrlp/packet-rrlp-template.c" /* Initialize the subtree pointers */ static gint ett_rrlp = -1; @@ -1147,7 +1149,7 @@ static gint ett_rrlp_GANSSModelID = -1; static gint ett_rrlp_AssistanceNeeded = -1; /*--- End of included file: packet-rrlp-ett.c ---*/ -#line 60 "../../asn1/rrlp/packet-rrlp-template.c" +#line 62 "../../asn1/rrlp/packet-rrlp-template.c" /* Include constants */ @@ -1159,7 +1161,7 @@ static gint ett_rrlp_AssistanceNeeded = -1; #define maxGANSSAssistanceData 40 /*--- End of included file: packet-rrlp-val.h ---*/ -#line 63 "../../asn1/rrlp/packet-rrlp-template.c" +#line 65 "../../asn1/rrlp/packet-rrlp-template.c" @@ -7152,7 +7154,7 @@ static void dissect_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre /*--- End of included file: packet-rrlp-fn.c ---*/ -#line 66 "../../asn1/rrlp/packet-rrlp-template.c" +#line 68 "../../asn1/rrlp/packet-rrlp-template.c" /*--- proto_register_rrlp -------------------------------------------*/ @@ -10446,7 +10448,7 @@ void proto_register_rrlp(void) { NULL, HFILL }}, /*--- End of included file: packet-rrlp-hfarr.c ---*/ -#line 75 "../../asn1/rrlp/packet-rrlp-template.c" +#line 77 "../../asn1/rrlp/packet-rrlp-template.c" }; /* List of subtrees */ @@ -10709,7 +10711,7 @@ void proto_register_rrlp(void) { &ett_rrlp_AssistanceNeeded, /*--- End of included file: packet-rrlp-ettarr.c ---*/ -#line 81 "../../asn1/rrlp/packet-rrlp-template.c" +#line 83 "../../asn1/rrlp/packet-rrlp-template.c" }; diff --git a/epan/dissectors/packet-sbc-ap.c b/epan/dissectors/packet-sbc-ap.c index 3bf3b75172..f2402e6859 100644 --- a/epan/dissectors/packet-sbc-ap.c +++ b/epan/dissectors/packet-sbc-ap.c @@ -51,6 +51,9 @@ #define PSNAME "SBCAP" #define PFNAME "sbcap" +void proto_register_sbc_ap(void); +void proto_reg_handoff_sbc_ap(void); + /* The registered port number for SBc-AP is 29168. * The registered payload protocol identifier for SBc-AP is 24. */ @@ -101,7 +104,7 @@ typedef enum _ProtocolIE_ID_enum { } ProtocolIE_ID_enum; /*--- End of included file: packet-sbc-ap-val.h ---*/ -#line 54 "../../asn1/sbc-ap/packet-sbc-ap-template.c" +#line 57 "../../asn1/sbc-ap/packet-sbc-ap-template.c" /* Initialize the protocol and registered fields */ static int proto_sbc_ap = -1; @@ -166,7 +169,7 @@ static int hf_sbc_ap_successfulOutcome_value = -1; /* SuccessfulOutcome_value * static int hf_sbc_ap_unsuccessfulOutcome_value = -1; /* UnsuccessfulOutcome_value */ /*--- End of included file: packet-sbc-ap-hf.c ---*/ -#line 59 "../../asn1/sbc-ap/packet-sbc-ap-template.c" +#line 62 "../../asn1/sbc-ap/packet-sbc-ap-template.c" /* Initialize the subtree pointers */ static int ett_sbc_ap = -1; @@ -199,7 +202,7 @@ static gint ett_sbc_ap_SuccessfulOutcome = -1; static gint ett_sbc_ap_UnsuccessfulOutcome = -1; /*--- End of included file: packet-sbc-ap-ett.c ---*/ -#line 64 "../../asn1/sbc-ap/packet-sbc-ap-template.c" +#line 67 "../../asn1/sbc-ap/packet-sbc-ap-template.c" enum{ INITIATING_MESSAGE, @@ -1128,7 +1131,7 @@ static int dissect_SBC_AP_PDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro /*--- End of included file: packet-sbc-ap-fn.c ---*/ -#line 91 "../../asn1/sbc-ap/packet-sbc-ap-template.c" +#line 94 "../../asn1/sbc-ap/packet-sbc-ap-template.c" static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { @@ -1415,7 +1418,7 @@ void proto_register_sbc_ap(void) { "UnsuccessfulOutcome_value", HFILL }}, /*--- End of included file: packet-sbc-ap-hfarr.c ---*/ -#line 153 "../../asn1/sbc-ap/packet-sbc-ap-template.c" +#line 156 "../../asn1/sbc-ap/packet-sbc-ap-template.c" }; /* List of subtrees */ @@ -1449,7 +1452,7 @@ void proto_register_sbc_ap(void) { &ett_sbc_ap_UnsuccessfulOutcome, /*--- End of included file: packet-sbc-ap-ettarr.c ---*/ -#line 159 "../../asn1/sbc-ap/packet-sbc-ap-template.c" +#line 162 "../../asn1/sbc-ap/packet-sbc-ap-template.c" }; @@ -1507,7 +1510,7 @@ proto_reg_handoff_sbc_ap(void) /*--- End of included file: packet-sbc-ap-dis-tab.c ---*/ -#line 192 "../../asn1/sbc-ap/packet-sbc-ap-template.c" +#line 195 "../../asn1/sbc-ap/packet-sbc-ap-template.c" } else { if (SctpPort != 0) { dissector_delete_uint("sctp.port", SctpPort, sbc_ap_handle); diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index 865c6a4ba4..e01c4cdcd5 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -63,6 +63,9 @@ #define PSNAME "SPNEGO" #define PFNAME "spnego" +void proto_register_spnego(void); +void proto_reg_handoff_spnego(void); + /* Initialize the protocol and registered fields */ static int proto_spnego = -1; static int proto_spnego_krb5 = -1; @@ -113,7 +116,7 @@ static int hf_spnego_ContextFlags_confFlag = -1; static int hf_spnego_ContextFlags_integFlag = -1; /*--- End of included file: packet-spnego-hf.c ---*/ -#line 82 "../../asn1/spnego/packet-spnego-template.c" +#line 85 "../../asn1/spnego/packet-spnego-template.c" /* Global variables */ static const char *MechType_oid; @@ -139,7 +142,7 @@ static gint ett_spnego_NegTokenTarg = -1; static gint ett_spnego_InitialContextToken_U = -1; /*--- End of included file: packet-spnego-ett.c ---*/ -#line 96 "../../asn1/spnego/packet-spnego-template.c" +#line 99 "../../asn1/spnego/packet-spnego-template.c" /* * Unfortunately, we have to have a forward declaration of this, @@ -584,7 +587,7 @@ dissect_spnego_InitialContextToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, /*--- End of included file: packet-spnego-fn.c ---*/ -#line 107 "../../asn1/spnego/packet-spnego-template.c" +#line 110 "../../asn1/spnego/packet-spnego-template.c" /* * This is the SPNEGO KRB5 dissector. It is not true KRB5, but some ASN.1 * wrapped blob with an OID, USHORT token ID, and a Ticket, that is also @@ -1944,7 +1947,7 @@ void proto_register_spnego(void) { NULL, HFILL }}, /*--- End of included file: packet-spnego-hfarr.c ---*/ -#line 1378 "../../asn1/spnego/packet-spnego-template.c" +#line 1381 "../../asn1/spnego/packet-spnego-template.c" }; /* List of subtrees */ @@ -1966,7 +1969,7 @@ void proto_register_spnego(void) { &ett_spnego_InitialContextToken_U, /*--- End of included file: packet-spnego-ettarr.c ---*/ -#line 1388 "../../asn1/spnego/packet-spnego-template.c" +#line 1391 "../../asn1/spnego/packet-spnego-template.c" }; /* Register protocol */ diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index ee39b4f1f7..12cf2a817b 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -73,7 +73,6 @@ #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; @@ -152,7 +151,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 125 "../../asn1/t38/packet-t38-template.c" +#line 124 "../../asn1/t38/packet-t38-template.c" /* T38 setup fields */ static int hf_t38_setup = -1; @@ -186,7 +185,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 145 "../../asn1/t38/packet-t38-template.c" +#line 144 "../../asn1/t38/packet-t38-template.c" static gint ett_t38_setup = -1; static gint ett_data_fragment = -1; @@ -337,7 +336,7 @@ void t38_add_address(packet_info *pinfo, } -fragment_head * +static fragment_head * force_reassemble_seq(reassembly_table *table, packet_info *pinfo, guint32 id) { fragment_head *fd_head; @@ -979,7 +978,7 @@ static int dissect_UDPTLPacket_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-t38-fn.c ---*/ -#line 394 "../../asn1/t38/packet-t38-template.c" +#line 393 "../../asn1/t38/packet-t38-template.c" /* initialize the tap t38_info and the conversation */ static void @@ -1335,7 +1334,7 @@ proto_register_t38(void) "OCTET_STRING", HFILL }}, /*--- End of included file: packet-t38-hfarr.c ---*/ -#line 673 "../../asn1/t38/packet-t38-template.c" +#line 672 "../../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 }}, @@ -1396,7 +1395,7 @@ proto_register_t38(void) &ett_t38_T_fec_data, /*--- End of included file: packet-t38-ettarr.c ---*/ -#line 720 "../../asn1/t38/packet-t38-template.c" +#line 719 "../../asn1/t38/packet-t38-template.c" &ett_t38_setup, &ett_data_fragment, &ett_data_fragments diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index ac499fad2f..2692abb5f4 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -52,6 +52,8 @@ * for channels that doesn't have the C/T flag! This should be based * on the RRC message RadioBearerSetup. */ +void proto_register_umts_fp(void); +void proto_reg_handoff_umts_fp(void); /* Initialize the protocol and registered fields. */ diff --git a/epan/dissectors/packet-umts_mac.c b/epan/dissectors/packet-umts_mac.c index 7c4bea9b8d..f7b4ccf3b5 100644 --- a/epan/dissectors/packet-umts_mac.c +++ b/epan/dissectors/packet-umts_mac.c @@ -37,6 +37,9 @@ #include "packet-rlc.h" #include "packet-nbap.h" +void proto_register_umts_mac(void); +void proto_reg_handoff_umts_mac(void); + int proto_umts_mac = -1; extern int proto_fp; extern int proto_rlc; @@ -797,7 +800,7 @@ static body_parts ** get_body_parts(mac_is_channel * ch) return bpa; } -tvbuff_t * mac_is_add_fragment(tvbuff_t * tvb _U_, packet_info *pinfo, proto_tree * tree _U_, guint8 lchid, guint ueid, int offset, guint8 ss, guint16 tsn, int sdu_no, guint8 no_sdus, guint16 maclength) +static tvbuff_t * mac_is_add_fragment(tvbuff_t * tvb _U_, packet_info *pinfo, proto_tree * tree _U_, guint8 lchid, guint ueid, int offset, guint8 ss, guint16 tsn, int sdu_no, guint8 no_sdus, guint16 maclength) { mac_is_channel ch; /* Channel for looking up in hash tables. */ ch.lchid = lchid; diff --git a/epan/dissectors/packet-uts.c b/epan/dissectors/packet-uts.c index 3f879e587d..af4350fd1f 100644 --- a/epan/dissectors/packet-uts.c +++ b/epan/dissectors/packet-uts.c @@ -49,6 +49,8 @@ #define MAX_POLL_TYPE_MSG_SIZE (50) +void proto_register_uts(void); + static int proto_uts = -1; static gint ett_uts = -1; static gint ett_header_uts = -1; diff --git a/epan/dissectors/packet-v120.c b/epan/dissectors/packet-v120.c index 0a02498d2e..e37b4144ef 100644 --- a/epan/dissectors/packet-v120.c +++ b/epan/dissectors/packet-v120.c @@ -29,6 +29,9 @@ #include <epan/packet.h> #include <epan/xdlc.h> +void proto_register_v120(void); +void proto_reg_handoff_v120(void); + static int proto_v120 = -1; static int hf_v120_address = -1; static int hf_v120_rc = -1; diff --git a/epan/dissectors/packet-v150fw.c b/epan/dissectors/packet-v150fw.c index 0d90e6facd..9fe2e4b4fe 100644 --- a/epan/dissectors/packet-v150fw.c +++ b/epan/dissectors/packet-v150fw.c @@ -34,6 +34,8 @@ #include <epan/packet.h> +void proto_register_v150fw(void); + /* Initialize the protocol & registered fields * Look familiar? This is in the same format as an NTE (named telephone event) from RFC 2833: */ diff --git a/epan/dissectors/packet-v52.c b/epan/dissectors/packet-v52.c index 4cb4561f77..73ecca3b1b 100644 --- a/epan/dissectors/packet-v52.c +++ b/epan/dissectors/packet-v52.c @@ -37,6 +37,9 @@ #include <epan/packet.h> #include <epan/expert.h> +void proto_register_v52(void); +void proto_reg_handoff_v52(void); + static int proto_v52 = -1; static int hf_v52_discriminator = -1; diff --git a/epan/dissectors/packet-v5dl.c b/epan/dissectors/packet-v5dl.c index 8d4f06af3f..5eda30c0a2 100644 --- a/epan/dissectors/packet-v5dl.c +++ b/epan/dissectors/packet-v5dl.c @@ -41,6 +41,8 @@ #include <epan/xdlc.h> #include <epan/crc16-tvb.h> +void proto_register_v5dl(void); + static int proto_v5dl = -1; static int hf_v5dl_direction = -1; /* static int hf_v5dl_address = -1; */ diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c index f55004bc7b..a7bcd7133b 100644 --- a/epan/dissectors/packet-v5ua.c +++ b/epan/dissectors/packet-v5ua.c @@ -50,6 +50,9 @@ #include <epan/strutil.h> #include <epan/sctpppids.h> /* include V5UA payload protocol ID */ +void proto_register_v5ua(void); +void proto_reg_handoff_v5ua(void); + static int paddingl = 0; static int dlci_efa = -1; diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c index 99cff7a523..23446a5837 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -48,6 +48,9 @@ #define PSNAME "X509CE" #define PFNAME "x509ce" +void proto_register_x509ce(void); +void proto_reg_handoff_x509ce(void); + /* Initialize the protocol and registered fields */ static int proto_x509ce = -1; static int hf_x509ce_id_ce_invalidityDate = -1; @@ -256,7 +259,7 @@ static int hf_x509ce_EntrustInfoFlags_webCategory = -1; static int hf_x509ce_EntrustInfoFlags_sETCategory = -1; /*--- End of included file: packet-x509ce-hf.c ---*/ -#line 50 "../../asn1/x509ce/packet-x509ce-template.c" +#line 53 "../../asn1/x509ce/packet-x509ce-template.c" /* Initialize the subtree pointers */ @@ -324,7 +327,7 @@ static gint ett_x509ce_EntrustInfoFlags = -1; static gint ett_x509ce_ScramblerCapabilities = -1; /*--- End of included file: packet-x509ce-ett.c ---*/ -#line 53 "../../asn1/x509ce/packet-x509ce-template.c" +#line 56 "../../asn1/x509ce/packet-x509ce-template.c" /*--- Included file: packet-x509ce-fn.c ---*/ #line 1 "../../asn1/x509ce/packet-x509ce-fn.c" @@ -1866,7 +1869,7 @@ static void dissect_CicamBrandId_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-x509ce-fn.c ---*/ -#line 54 "../../asn1/x509ce/packet-x509ce-template.c" +#line 57 "../../asn1/x509ce/packet-x509ce-template.c" /* CI+ (www.ci-plus.com) defines some X.509 certificate extensions that use OIDs which are not officially assigned @@ -2720,7 +2723,7 @@ void proto_register_x509ce(void) { NULL, HFILL }}, /*--- End of included file: packet-x509ce-hfarr.c ---*/ -#line 119 "../../asn1/x509ce/packet-x509ce-template.c" +#line 122 "../../asn1/x509ce/packet-x509ce-template.c" }; /* List of subtrees */ @@ -2790,7 +2793,7 @@ void proto_register_x509ce(void) { &ett_x509ce_ScramblerCapabilities, /*--- End of included file: packet-x509ce-ettarr.c ---*/ -#line 124 "../../asn1/x509ce/packet-x509ce-template.c" +#line 127 "../../asn1/x509ce/packet-x509ce-template.c" }; /* Register protocol */ @@ -2853,7 +2856,7 @@ void proto_reg_handoff_x509ce(void) { /*--- End of included file: packet-x509ce-dis-tab.c ---*/ -#line 139 "../../asn1/x509ce/packet-x509ce-template.c" +#line 142 "../../asn1/x509ce/packet-x509ce-template.c" register_ber_oid_dissector("2.5.29.24", dissect_x509ce_invalidityDate_callback, proto_x509ce, "id-ce-invalidityDate"); register_ber_oid_dissector("2.5.29.51", dissect_x509ce_baseUpdateTime_callback, proto_x509ce, "id-ce-baseUpdateTime"); } diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index c607db67b8..1faa8df349 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -50,6 +50,9 @@ #define PSNAME "X509IF" #define PFNAME "x509if" +void proto_register_x509if(void); +void proto_reg_handoff_x509if(void); + /* Initialize the protocol and registered fields */ static int proto_x509if = -1; static int hf_x509if_object_identifier_id = -1; @@ -214,7 +217,7 @@ static int hf_x509if_AllowedSubset_oneLevel = -1; static int hf_x509if_AllowedSubset_wholeSubtree = -1; /*--- End of included file: packet-x509if-hf.c ---*/ -#line 50 "../../asn1/x509if/packet-x509if-template.c" +#line 53 "../../asn1/x509if/packet-x509if-template.c" /* Initialize the subtree pointers */ @@ -295,7 +298,7 @@ static gint ett_x509if_SEQUENCE_SIZE_1_MAX_OF_AttributeType = -1; static gint ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString = -1; /*--- End of included file: packet-x509if-ett.c ---*/ -#line 53 "../../asn1/x509if/packet-x509if-template.c" +#line 56 "../../asn1/x509if/packet-x509if-template.c" static proto_tree *top_of_dn = NULL; static proto_tree *top_of_rdn = NULL; @@ -2096,7 +2099,7 @@ static void dissect_HierarchyBelow_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_ /*--- End of included file: packet-x509if-fn.c ---*/ -#line 89 "../../asn1/x509if/packet-x509if-template.c" +#line 92 "../../asn1/x509if/packet-x509if-template.c" const char * x509if_get_last_dn(void) { @@ -2762,7 +2765,7 @@ void proto_register_x509if(void) { NULL, HFILL }}, /*--- End of included file: packet-x509if-hfarr.c ---*/ -#line 134 "../../asn1/x509if/packet-x509if-template.c" +#line 137 "../../asn1/x509if/packet-x509if-template.c" }; /* List of subtrees */ @@ -2845,7 +2848,7 @@ void proto_register_x509if(void) { &ett_x509if_SET_SIZE_1_MAX_OF_DirectoryString, /*--- End of included file: packet-x509if-ettarr.c ---*/ -#line 139 "../../asn1/x509if/packet-x509if-template.c" +#line 142 "../../asn1/x509if/packet-x509if-template.c" }; /* Register protocol */ @@ -2903,6 +2906,6 @@ void proto_reg_handoff_x509if(void) { /*--- End of included file: packet-x509if-dis-tab.c ---*/ -#line 158 "../../asn1/x509if/packet-x509if-template.c" +#line 161 "../../asn1/x509if/packet-x509if-template.c" } diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index a1988793a6..da46bed587 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -47,6 +47,9 @@ #define PSNAME "X509SAT" #define PFNAME "x509sat" +void proto_register_x509sat(void); +void proto_reg_handoff_x509sat(void); + /* Initialize the protocol and registered fields */ static int proto_x509sat = -1; @@ -219,7 +222,7 @@ static int hf_x509sat_T_bitNamedDays_friday = -1; static int hf_x509sat_T_bitNamedDays_saturday = -1; /*--- End of included file: packet-x509sat-hf.c ---*/ -#line 45 "../../asn1/x509sat/packet-x509sat-template.c" +#line 48 "../../asn1/x509sat/packet-x509sat-template.c" /* Initialize the subtree pointers */ @@ -274,7 +277,7 @@ static gint ett_x509sat_T_between = -1; static gint ett_x509sat_LocaleContextSyntax = -1; /*--- End of included file: packet-x509sat-ett.c ---*/ -#line 48 "../../asn1/x509sat/packet-x509sat-template.c" +#line 51 "../../asn1/x509sat/packet-x509sat-template.c" /*--- Included file: packet-x509sat-fn.c ---*/ @@ -1843,7 +1846,7 @@ static void dissect_GUID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tr /*--- End of included file: packet-x509sat-fn.c ---*/ -#line 50 "../../asn1/x509sat/packet-x509sat-template.c" +#line 53 "../../asn1/x509sat/packet-x509sat-template.c" /*--- proto_register_x509sat ----------------------------------------------*/ @@ -2512,7 +2515,7 @@ void proto_register_x509sat(void) { NULL, HFILL }}, /*--- End of included file: packet-x509sat-hfarr.c ---*/ -#line 58 "../../asn1/x509sat/packet-x509sat-template.c" +#line 61 "../../asn1/x509sat/packet-x509sat-template.c" }; /* List of subtrees */ @@ -2569,7 +2572,7 @@ void proto_register_x509sat(void) { &ett_x509sat_LocaleContextSyntax, /*--- End of included file: packet-x509sat-ettarr.c ---*/ -#line 63 "../../asn1/x509sat/packet-x509sat-template.c" +#line 66 "../../asn1/x509sat/packet-x509sat-template.c" }; /* Register protocol */ @@ -2622,7 +2625,7 @@ void proto_register_x509sat(void) { register_ber_syntax_dissector("X121Address", proto_x509sat, dissect_X121Address_PDU); /*--- End of included file: packet-x509sat-syn-reg.c ---*/ -#line 73 "../../asn1/x509sat/packet-x509sat-template.c" +#line 76 "../../asn1/x509sat/packet-x509sat-template.c" } @@ -2815,7 +2818,7 @@ void proto_reg_handoff_x509sat(void) { /*--- End of included file: packet-x509sat-dis-tab.c ---*/ -#line 80 "../../asn1/x509sat/packet-x509sat-template.c" +#line 83 "../../asn1/x509sat/packet-x509sat-template.c" /* OBJECT CLASSES */ |