diff options
author | Anders Broman <anders.broman@ericsson.com> | 2013-12-08 22:02:12 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2013-12-08 22:02:12 +0000 |
commit | 4124b7aa170001bcb0df4b8605a9a6b1682e5b5f (patch) | |
tree | ad499e4e97ada84295a364f0fd96eee524da9392 /asn1 | |
parent | 23c9eb270fc7aeb82f7bc171b58e8038031ce4be (diff) | |
download | wireshark-4124b7aa170001bcb0df4b8605a9a6b1682e5b5f.tar.gz |
- Forward declaration of register functions.
svn path=/trunk/; revision=53872
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/goose/packet-goose-template.c | 3 | ||||
-rw-r--r-- | asn1/gsm_map/GSMMAP.asn | 4 | ||||
-rw-r--r-- | asn1/gsm_map/packet-gsm_map-template.c | 15 | ||||
-rw-r--r-- | asn1/h235/packet-h235-template.c | 3 | ||||
-rw-r--r-- | asn1/h283/packet-h283-template.c | 3 | ||||
-rw-r--r-- | asn1/h323/packet-h323-template.c | 2 | ||||
-rw-r--r-- | asn1/h450-ros/packet-h450-ros-template.c | 3 | ||||
-rw-r--r-- | asn1/h460/packet-h460-template.c | 3 | ||||
-rw-r--r-- | asn1/ldap/packet-ldap-template.c | 3 | ||||
-rw-r--r-- | asn1/p7/packet-p7-template.c | 3 | ||||
-rw-r--r-- | asn1/ranap/packet-ranap-template.c | 1 | ||||
-rw-r--r-- | asn1/tetra/packet-tetra-template.c | 3 |
12 files changed, 41 insertions, 5 deletions
diff --git a/asn1/goose/packet-goose-template.c b/asn1/goose/packet-goose-template.c index c65a9b1d9f..0e07a5c52f 100644 --- a/asn1/goose/packet-goose-template.c +++ b/asn1/goose/packet-goose-template.c @@ -38,6 +38,9 @@ #define PSNAME "GOOSE" #define PFNAME "goose" +void proto_register_goose(void); +void proto_reg_handoff_goose(void); + /* Initialize the protocol and registered fields */ static int proto_goose = -1; static int hf_goose_appid = -1; diff --git a/asn1/gsm_map/GSMMAP.asn b/asn1/gsm_map/GSMMAP.asn index 8fe32799e8..b62ef43a67 100644 --- a/asn1/gsm_map/GSMMAP.asn +++ b/asn1/gsm_map/GSMMAP.asn @@ -146,7 +146,7 @@ GSMMAPOperationLocalvalue ::= INTEGER{ processAccessSignalling (33), forwardAccessSignalling (34), noteInternalHandover (35), - unAllocated (36), + cancelVcsgLocation (36), reset (37), forwardCheckSS (38), prepareGroupCall (39), @@ -163,7 +163,7 @@ GSMMAPOperationLocalvalue ::= INTEGER{ activateTraceMode (50), deactivateTraceMode (51), traceSubscriberActivity (52), - unAllocated (53), + updateVcsgLocation (53), beginSubscriberActivity (54), sendIdentification (55), sendAuthenticationInfo (56), diff --git a/asn1/gsm_map/packet-gsm_map-template.c b/asn1/gsm_map/packet-gsm_map-template.c index 4d31d45d3e..f00f460f87 100644 --- a/asn1/gsm_map/packet-gsm_map-template.c +++ b/asn1/gsm_map/packet-gsm_map-template.c @@ -1116,7 +1116,9 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ TRUE , dissect_gsm_map_ms_ForwardAccessSignalling_Arg, -1); break; /* reserved noteInternalHandover (35) */ - /* undefined 36 */ + case 36: /*cancelVcsgLocation*/ + offset=dissect_gsm_map_ms_CancelVcsgLocationArg(FALSE, tvb, offset, actx, tree, -1); + break; case 37: /*reset*/ offset=dissect_gsm_map_ms_ResetArg(FALSE, tvb, offset, actx, tree, -1); break; @@ -1184,7 +1186,10 @@ static int dissect_invokeData(proto_tree *tree, tvbuff_t *tvb, int offset, asn1_ offset=dissect_gsm_map_om_DeactivateTraceModeArg(FALSE, tvb, offset, actx, tree, -1); break; /* reserved traceSubscriberActivity (52) */ - /* undefined 53 */ + + case 53: /* UpdateVcsgLocation 53 */ + offset=dissect_gsm_map_ms_UpdateVcsgLocationArg(FALSE, tvb, offset, actx, tree, -1); + break; case 54: /*beginSubscriberActivity*/ offset=dissect_gsm_old_BeginSubscriberActivityArg(FALSE, tvb, offset, actx, tree, -1); break; @@ -1469,6 +1474,9 @@ static int dissect_returnResultData(proto_tree *tree, tvbuff_t *tvb, int offset, case 32: /*provideSIWFSSignallingModify*/ offset=dissect_gsm_old_SIWFSSignallingModifyRes(FALSE, tvb, offset, actx, tree, -1); break; + case 36: /*cancelVcsgLocation*/ + offset=dissect_gsm_map_ms_CancelVcsgLocationRes(FALSE, tvb, offset, actx, tree, -1); + break; case 39: /*prepareGroupCall*/ offset=dissect_gsm_map_gr_PrepareGroupCallRes(FALSE, tvb, offset, actx, tree, -1); break; @@ -1505,6 +1513,9 @@ static int dissect_returnResultData(proto_tree *tree, tvbuff_t *tvb, int offset, case 51: /*deactivateTraceMode*/ offset=dissect_gsm_map_om_DeactivateTraceModeRes(FALSE, tvb, offset, actx, tree, -1); break; + case 53: /* UpdateVcsgLocation 53 */ + offset=dissect_gsm_map_ms_UpdateVcsgLocationRes(FALSE, tvb, offset, actx, tree, -1); + break; case 55: /*sendIdentification */ offset=dissect_mc_message(tvb, offset, actx, tree, FALSE, dissect_gsm_map_IMSI, hf_gsm_map_imsi, diff --git a/asn1/h235/packet-h235-template.c b/asn1/h235/packet-h235-template.c index 55137f0952..072f266c90 100644 --- a/asn1/h235/packet-h235-template.c +++ b/asn1/h235/packet-h235-template.c @@ -46,6 +46,9 @@ #define OID_TG "0.0.8.235.0.3.70" #define OID_SG "0.0.8.235.0.3.71" +void proto_register_h235(void); +void proto_reg_handoff_h235(void); + /* Initialize the protocol and registered fields */ static int proto_h235 = -1; #include "packet-h235-hf.c" diff --git a/asn1/h283/packet-h283-template.c b/asn1/h283/packet-h283-template.c index 05a946dcb1..decad2f135 100644 --- a/asn1/h283/packet-h283-template.c +++ b/asn1/h283/packet-h283-template.c @@ -36,6 +36,9 @@ #define PSNAME "LCT" #define PFNAME "lct" +void proto_register_h283(void); +void proto_reg_handoff_h283(void); + /* Initialize the protocol and registered fields */ static int proto_h283 = -1; #include "packet-h283-hf.c" diff --git a/asn1/h323/packet-h323-template.c b/asn1/h323/packet-h323-template.c index 2dbfef2a1a..363ffc8cde 100644 --- a/asn1/h323/packet-h323-template.c +++ b/asn1/h323/packet-h323-template.c @@ -39,6 +39,8 @@ #define PSNAME "H.323" #define PFNAME "h323" +void proto_register_h323(void); +void proto_reg_handoff_h323(void); /* Generic Extensible Framework */ gef_ctx_t* gef_ctx_alloc(gef_ctx_t *parent, const gchar *type) { diff --git a/asn1/h450-ros/packet-h450-ros-template.c b/asn1/h450-ros/packet-h450-ros-template.c index 50064acfd5..ee31ab6411 100644 --- a/asn1/h450-ros/packet-h450-ros-template.c +++ b/asn1/h450-ros/packet-h450-ros-template.c @@ -37,6 +37,9 @@ #define PSNAME "H450.ROS" #define PFNAME "h450.ros" +void proto_register_h450_ros(void); +void proto_reg_handoff_h450_ros(void); + /* Initialize the protocol and registered fields */ static int proto_h450_ros = -1; #include "packet-h450-ros-hf.c" diff --git a/asn1/h460/packet-h460-template.c b/asn1/h460/packet-h460-template.c index 4490fbc835..03385dd10a 100644 --- a/asn1/h460/packet-h460-template.c +++ b/asn1/h460/packet-h460-template.c @@ -41,6 +41,9 @@ #define PSNAME "H.460" #define PFNAME "h460" +void proto_register_h460(void); +void proto_reg_handoff_h460(void); + /* Initialize the protocol and registered fields */ static int proto_h460 = -1; #include "packet-h460-hf.c" diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c index 6f821b5f73..1d83292dbe 100644 --- a/asn1/ldap/packet-ldap-template.c +++ b/asn1/ldap/packet-ldap-template.c @@ -119,6 +119,9 @@ #define PSNAME "LDAP" #define PFNAME "ldap" +void proto_register_ldap(void); +void proto_reg_handoff_ldap(void); + /* Initialize the protocol and registered fields */ static int ldap_tap = -1; static int proto_ldap = -1; diff --git a/asn1/p7/packet-p7-template.c b/asn1/p7/packet-p7-template.c index ed8015e815..36cb8789ca 100644 --- a/asn1/p7/packet-p7-template.c +++ b/asn1/p7/packet-p7-template.c @@ -43,6 +43,9 @@ #define PSNAME "P7" #define PFNAME "p7" +void proto_register_p7(void); +void proto_reg_handoff_p7(void); + static guint global_p7_tcp_port = 102; static dissector_handle_t tpkt_handle; static int seqno = 0; diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c index d0cc896e36..cc89e548e6 100644 --- a/asn1/ranap/packet-ranap-template.c +++ b/asn1/ranap/packet-ranap-template.c @@ -141,7 +141,6 @@ static int dissect_OutcomeValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t static int dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index); static int dissect_ranap_TargetRNC_ToSourceRNC_TransparentContainer(tvbuff_t *tvb, int offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index); -void proto_reg_handoff_ranap(void); #include "packet-ranap-fn.c" diff --git a/asn1/tetra/packet-tetra-template.c b/asn1/tetra/packet-tetra-template.c index 2283c6130e..fe4fae4876 100644 --- a/asn1/tetra/packet-tetra-template.c +++ b/asn1/tetra/packet-tetra-template.c @@ -46,6 +46,9 @@ #define PROTO_TAG_tetra "TETRA" +void proto_register_tetra(void); +void proto_reg_handoff_ldap(void); + /* Wireshark ID of the tetra protocol */ static int proto_tetra = -1; |