diff options
Diffstat (limited to 'lib/megaco/src')
32 files changed, 789 insertions, 220 deletions
diff --git a/lib/megaco/src/app/megaco.erl b/lib/megaco/src/app/megaco.erl index 2c27043782..9ec949ee54 100644 --- a/lib/megaco/src/app/megaco.erl +++ b/lib/megaco/src/app/megaco.erl @@ -101,7 +101,7 @@ formated_long_timestamp/0 ]). --deprecated([{format_versions,1,"use megaco:print_version_info/0,1 instead"}]). +-deprecated([{format_versions, 1, "use megaco:print_version_info/0,1 instead."}]). -export_type([ void/0 diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile index b9643669f6..7fc90fd6d5 100644 --- a/lib/megaco/src/binary/Makefile +++ b/lib/megaco/src/binary/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2000-2016. All Rights Reserved. +# Copyright Ericsson AB 2000-2020. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -47,7 +47,8 @@ include modules.mk ASN1_SPECS = $(ASN1_V1_SPEC) \ $(ASN1_V2_SPEC) \ - $(ASN1_PREV3A_SPEC) + $(ASN1_V3_SPEC) \ + $(ASN1_PREV3A_SPEC) $(ASN1_PREV3B_SPEC) $(ASN1_PREV3C_SPEC) ASN1_FILES = $(ASN1_SPECS:%=%.asn) V1_SPECS = $(BER_ASN1_V1_SPEC) \ diff --git a/lib/megaco/src/binary/depend.mk b/lib/megaco/src/binary/depend.mk index 16901e39f0..d831e5fe54 100644 --- a/lib/megaco/src/binary/depend.mk +++ b/lib/megaco/src/binary/depend.mk @@ -2,7 +2,7 @@ # %CopyrightBegin% # -# Copyright Ericsson AB 2001-2016. All Rights Reserved. +# Copyright Ericsson AB 2001-2020. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -37,15 +37,19 @@ endif BER_V1_FLAGS = $(ASN1_CT_OPTS) +asn1config BER_V2_FLAGS = $(ASN1_CT_OPTS) +asn1config +# <DEPRECATED> BER_PREV3A_FLAGS = $(ASN1_CT_OPTS) +asn1config BER_PREV3B_FLAGS = $(ASN1_CT_OPTS) +asn1config BER_PREV3C_FLAGS = $(ASN1_CT_OPTS) +asn1config +# </DEPRECATED> BER_V3_FLAGS = $(ASN1_CT_OPTS) +asn1config PER_V1_FLAGS = $(ASN1_CT_OPTS) PER_V2_FLAGS = $(ASN1_CT_OPTS) +# <DEPRECATED> PER_PREV3A_FLAGS = $(ASN1_CT_OPTS) PER_PREV3B_FLAGS = $(ASN1_CT_OPTS) PER_PREV3C_FLAGS = $(ASN1_CT_OPTS) +# </DEPRECATED> PER_V3_FLAGS = $(ASN1_CT_OPTS) @@ -94,6 +98,7 @@ $(EBIN)/$(PER_ASN1_V2_SPEC).$(EMULATOR): \ # -- (prev3a) -- +# <DEPRECATED> $(BER_ASN1_PREV3A_SPEC).erl: \ $(BER_ASN1_PREV3A_SPEC).set.asn \ $(ASN1_PREV3A_SPEC).asn @@ -111,10 +116,12 @@ $(PER_ASN1_PREV3A_SPEC).erl: \ $(EBIN)/$(PER_ASN1_PREV3A_SPEC).$(EMULATOR): \ $(PER_ASN1_PREV3A_SPEC).erl +# </DEPRECATED> # -- (prev3b) -- +# <DEPRECATED> $(BER_ASN1_PREV3B_SPEC).erl: \ $(BER_ASN1_PREV3B_SPEC).set.asn \ $(ASN1_PREV3B_SPEC).asn @@ -132,10 +139,12 @@ $(PER_ASN1_PREV3B_SPEC).erl: \ $(EBIN)/$(PER_ASN1_PREV3B_SPEC).$(EMULATOR): \ $(PER_ASN1_PREV3B_SPEC).erl +# </DEPRECATED> # -- (prev3c) -- +# <DEPRECATED> $(BER_ASN1_PREV3C_SPEC).erl: \ $(BER_ASN1_PREV3C_SPEC).set.asn \ $(ASN1_PREV3C_SPEC).asn @@ -153,6 +162,7 @@ $(PER_ASN1_PREV3C_SPEC).erl: \ $(EBIN)/$(PER_ASN1_PREV3C_SPEC).$(EMULATOR): \ $(PER_ASN1_PREV3C_SPEC).erl +# </DEPRECATED> # -- (v3) -- @@ -198,6 +208,7 @@ $(EBIN)/megaco_binary_name_resolver_v2.$(EMULATOR): \ megaco_binary_name_resolver_v2.erl \ ../app/megaco_internal.hrl +# <DEPRECATED> $(EBIN)/megaco_binary_name_resolver_prev3a.$(EMULATOR): \ megaco_binary_name_resolver_prev3a.erl \ ../app/megaco_internal.hrl @@ -209,6 +220,7 @@ $(EBIN)/megaco_binary_name_resolver_prev3b.$(EMULATOR): \ $(EBIN)/megaco_binary_name_resolver_prev3c.$(EMULATOR): \ megaco_binary_name_resolver_prev3c.erl \ ../app/megaco_internal.hrl +# </DEPRECATED> $(EBIN)/megaco_binary_name_resolver_v3.$(EMULATOR): \ megaco_binary_name_resolver_v3.erl @@ -229,6 +241,7 @@ $(EBIN)/megaco_binary_transformer_v2.$(EMULATOR): \ $(MEGACO_INCLUDEDIR)/megaco.hrl \ $(MEGACO_INCLUDEDIR)/megaco_message_v2.hrl +# <DEPRECATED> $(EBIN)/megaco_binary_transformer_prev3a.$(EMULATOR): \ megaco_binary_transformer_prev3a.erl \ ../app/megaco_internal.hrl \ @@ -246,6 +259,7 @@ $(EBIN)/megaco_binary_transformer_prev3c.$(EMULATOR): \ ../app/megaco_internal.hrl \ $(MEGACO_INCLUDEDIR)/megaco.hrl \ $(MEGACO_INCLUDEDIR)/megaco_message_prev3c.hrl +# </DEPRECATED> $(EBIN)/megaco_binary_transformer_v3.$(EMULATOR): \ megaco_binary_transformer_v3.erl \ diff --git a/lib/megaco/src/binary/megaco_ber_encoder.erl b/lib/megaco/src/binary/megaco_ber_encoder.erl index 1efe18c870..57f21f2a29 100644 --- a/lib/megaco/src/binary/megaco_ber_encoder.erl +++ b/lib/megaco/src/binary/megaco_ber_encoder.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2016. All Rights Reserved. +%% Copyright Ericsson AB 1999-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -45,16 +45,22 @@ -define(V1_ASN1_MOD, megaco_ber_media_gateway_control_v1). -define(V2_ASN1_MOD, megaco_ber_media_gateway_control_v2). -define(V3_ASN1_MOD, megaco_ber_media_gateway_control_v3). + +%% <DEPRECATED> -define(PREV3A_ASN1_MOD, megaco_ber_media_gateway_control_prev3a). -define(PREV3B_ASN1_MOD, megaco_ber_media_gateway_control_prev3b). -define(PREV3C_ASN1_MOD, megaco_ber_media_gateway_control_prev3c). +%% </DEPRECATED> -define(V1_TRANS_MOD, megaco_binary_transformer_v1). -define(V2_TRANS_MOD, megaco_binary_transformer_v2). -define(V3_TRANS_MOD, megaco_binary_transformer_v3). + +%% <DEPRECATED> -define(PREV3A_TRANS_MOD, megaco_binary_transformer_prev3a). -define(PREV3B_TRANS_MOD, megaco_binary_transformer_prev3b). -define(PREV3C_TRANS_MOD, megaco_binary_transformer_prev3c). +%% </DEPRECATED> -define(BIN_LIB, megaco_binary_encoder_lib). @@ -64,9 +70,7 @@ %% Return {ok, Version} | {error, Reason} %%---------------------------------------------------------------------- -version_of([{version3,v3}|EC], Binary) -> - Decoders = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?V3_ASN1_MOD], - ?BIN_LIB:version_of(EC, Binary, 1, Decoders); +%% <DEPRECATED> version_of([{version3,prev3c}|EC], Binary) -> Decoders = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?PREV3C_ASN1_MOD], ?BIN_LIB:version_of(EC, Binary, 1, Decoders); @@ -76,6 +80,14 @@ version_of([{version3,prev3b}|EC], Binary) -> version_of([{version3,prev3a}|EC], Binary) -> Decoders = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?PREV3A_ASN1_MOD], ?BIN_LIB:version_of(EC, Binary, 1, Decoders); +%% <DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +version_of([{version3,v3}|EC], Binary) -> + Decoders = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?V3_ASN1_MOD], + ?BIN_LIB:version_of(EC, Binary, 1, Decoders); +%% </BACKWARD-COMPAT-CLAUSE> + version_of(EC, Binary) -> Decoders = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?V3_ASN1_MOD], ?BIN_LIB:version_of(EC, Binary, 1, Decoders). @@ -93,10 +105,13 @@ encode_message(EC, %% -- Version 1 -- +%% <BACKWARD-COMPAT-CLAUSE> encode_message([{version3,_}|EC], 1, MegaMsg) -> AsnMod = ?V1_ASN1_MOD, TransMod = ?V1_TRANS_MOD, ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + encode_message(EC, 1, MegaMsg) -> AsnMod = ?V1_ASN1_MOD, TransMod = ?V1_TRANS_MOD, @@ -105,10 +120,13 @@ encode_message(EC, 1, MegaMsg) -> %% -- Version 2 -- +%% <BACKWARD-COMPAT-CLAUSE> encode_message([{version3,_}|EC], 2, MegaMsg) -> AsnMod = ?V2_ASN1_MOD, TransMod = ?V2_TRANS_MOD, ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + encode_message(EC, 2, MegaMsg) -> AsnMod = ?V2_ASN1_MOD, TransMod = ?V2_TRANS_MOD, @@ -117,10 +135,7 @@ encode_message(EC, 2, MegaMsg) -> %% -- Version 3 -- -encode_message([{version3,v3}|EC], 3, MegaMsg) -> - AsnMod = ?V3_ASN1_MOD, - TransMod = ?V3_TRANS_MOD, - ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list); +%% <DEPRECATED> encode_message([{version3,prev3c}|EC], 3, MegaMsg) -> AsnMod = ?PREV3C_ASN1_MOD, TransMod = ?PREV3C_TRANS_MOD, @@ -133,6 +148,15 @@ encode_message([{version3,prev3a}|EC], 3, MegaMsg) -> AsnMod = ?PREV3A_ASN1_MOD, TransMod = ?PREV3A_TRANS_MOD, ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +encode_message([{version3,v3}|EC], 3, MegaMsg) -> + AsnMod = ?V3_ASN1_MOD, + TransMod = ?V3_TRANS_MOD, + ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + encode_message(EC, 3, MegaMsg) -> AsnMod = ?V3_ASN1_MOD, TransMod = ?V3_TRANS_MOD, @@ -244,10 +268,13 @@ decode_message(EC, dynamic, Binary) -> %% -- Version 1 -- +%% <BACKWARD-COMPAT-CLAUSE> decode_message([{version3,_}|EC], 1, Binary) -> AsnMod = ?V1_ASN1_MOD, TransMod = ?V1_TRANS_MOD, ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary); +%% </BACKWARD-COMPAT-CLAUSE> + decode_message(EC, 1, Binary) -> AsnMod = ?V1_ASN1_MOD, TransMod = ?V1_TRANS_MOD, @@ -256,10 +283,13 @@ decode_message(EC, 1, Binary) -> %% -- Version 2 -- +%% <BACKWARD-COMPAT-CLAUSE> decode_message([{version3,_}|EC], 2, Binary) -> AsnMod = ?V2_ASN1_MOD, TransMod = ?V2_TRANS_MOD, ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary); +%% </BACKWARD-COMPAT-CLAUSE> + decode_message(EC, 2, Binary) -> AsnMod = ?V2_ASN1_MOD, TransMod = ?V2_TRANS_MOD, @@ -268,10 +298,7 @@ decode_message(EC, 2, Binary) -> %% -- Version 3 -- -decode_message([{version3,v3}|EC], 3, Binary) -> - AsnMod = ?V3_ASN1_MOD, - TransMod = ?V3_TRANS_MOD, - ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary); +%% <DEPRECATED> decode_message([{version3,prev3c}|EC], 3, Binary) -> AsnMod = ?PREV3C_ASN1_MOD, TransMod = ?PREV3C_TRANS_MOD, @@ -284,17 +311,22 @@ decode_message([{version3,prev3a}|EC], 3, Binary) -> AsnMod = ?PREV3A_ASN1_MOD, TransMod = ?PREV3A_TRANS_MOD, ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +decode_message([{version3,v3}|EC], 3, Binary) -> + AsnMod = ?V3_ASN1_MOD, + TransMod = ?V3_TRANS_MOD, + ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary); +%% </BACKWARD-COMPAT-CLAUSE> + decode_message(EC, 3, Binary) -> AsnMod = ?V3_ASN1_MOD, TransMod = ?V3_TRANS_MOD, ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary). -decode_mini_message([{version3,v3}|EC], dynamic, Bin) -> - Mods = [?V1_ASN1_MOD, - ?V2_ASN1_MOD, - ?V3_ASN1_MOD], - ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary); +%% <DEPRECATED> decode_mini_message([{version3,prev3c}|EC], dynamic, Bin) -> Mods = [?V1_ASN1_MOD, ?V2_ASN1_MOD, @@ -310,27 +342,43 @@ decode_mini_message([{version3,prev3a}|EC], dynamic, Bin) -> ?V2_ASN1_MOD, ?PREV3A_ASN1_MOD], ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +decode_mini_message([{version3,v3}|EC], dynamic, Bin) -> + Mods = [?V1_ASN1_MOD, + ?V2_ASN1_MOD, + ?V3_ASN1_MOD], + ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary); +%% </BACKWARD-COMPAT-CLAUSE> + decode_mini_message(EC, dynamic, Bin) -> Mods = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?V3_ASN1_MOD], ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary); +%% <BACKWARD-COMPAT-CLAUSE> decode_mini_message([{version3,_}|EC], 1, Bin) -> AsnMod = ?V1_ASN1_MOD, ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary); +%% </BACKWARD-COMPAT-CLAUSE> + decode_mini_message(EC, 1, Bin) -> AsnMod = ?V1_ASN1_MOD, ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary); + +%% <BACKWARD-COMPAT-CLAUSE> decode_mini_message([{version3,_}|EC], 2, Bin) -> AsnMod = ?V2_ASN1_MOD, ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary); +%% </BACKWARD-COMPAT-CLAUSE> + decode_mini_message(EC, 2, Bin) -> AsnMod = ?V2_ASN1_MOD, ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary); -decode_mini_message([{version3,v3}|EC], 3, Bin) -> - AsnMod = ?V3_ASN1_MOD, - ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary); + +%% <DEPRECATED> decode_mini_message([{version3,prev3c}|EC], 3, Bin) -> AsnMod = ?PREV3C_ASN1_MOD, ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary); @@ -340,6 +388,15 @@ decode_mini_message([{version3,prev3b}|EC], 3, Bin) -> decode_mini_message([{version3,prev3a}|EC], 3, Bin) -> AsnMod = ?PREV3A_ASN1_MOD, ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary); +%% </DEPRECATED> + + +%% <BACKWARD-COMPAT-CLAUSE> +decode_mini_message([{version3,v3}|EC], 3, Bin) -> + AsnMod = ?V3_ASN1_MOD, + ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary); +%% </BACKWARD-COMPAT-CLAUSE> + decode_mini_message(EC, 3, Bin) -> AsnMod = ?V3_ASN1_MOD, ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary). diff --git a/lib/megaco/src/binary/megaco_binary_encoder.erl b/lib/megaco/src/binary/megaco_binary_encoder.erl index e0bcd8fe4d..40ee11c59d 100644 --- a/lib/megaco/src/binary/megaco_binary_encoder.erl +++ b/lib/megaco/src/binary/megaco_binary_encoder.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2016. All Rights Reserved. +%% Copyright Ericsson AB 2000-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -55,26 +55,31 @@ encode_message(EC, #'MegacoMessage'{mess = #'Message'{version = V}} = MegaMsg) -> encode_message(EC, V, MegaMsg). +%% <BACKWARD-COMPAT-CLAUSE> encode_message([{version3,_}|EC], 1, MegaMsg) -> AsnMod = megaco_ber_media_gateway_control_v1, TransMod = megaco_binary_transformer_v1, ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + encode_message(EC, 1, MegaMsg) -> AsnMod = megaco_ber_media_gateway_control_v1, TransMod = megaco_binary_transformer_v1, ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list); + +%% <BACKWARD-COMPAT-CLAUSE> encode_message([{version3,_}|EC], 2, MegaMsg) -> AsnMod = megaco_ber_media_gateway_control_v2, TransMod = megaco_binary_transformer_v2, ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + encode_message(EC, 2, MegaMsg) -> AsnMod = megaco_ber_media_gateway_control_v2, TransMod = megaco_binary_transformer_v2, ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list); -encode_message([{version3,v3}|EC], 3, MegaMsg) -> - AsnMod = megaco_ber_media_gateway_control_v3, - TransMod = megaco_binary_transformer_v3, - ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list); + +%% <DEPRECATED> encode_message([{version3,prev3c}|EC], 3, MegaMsg) -> AsnMod = megaco_ber_media_gateway_control_prev3c, TransMod = megaco_binary_transformer_prev3c, @@ -87,6 +92,15 @@ encode_message([{version3,prev3a}|EC], 3, MegaMsg) -> AsnMod = megaco_ber_media_gateway_control_prev3a, TransMod = megaco_binary_transformer_prev3a, ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +encode_message([{version3,v3}|EC], 3, MegaMsg) -> + AsnMod = megaco_ber_media_gateway_control_v3, + TransMod = megaco_binary_transformer_v3, + ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + encode_message(EC, 3, MegaMsg) -> AsnMod = megaco_ber_media_gateway_control_v3, TransMod = megaco_binary_transformer_v3, @@ -99,26 +113,31 @@ encode_message(EC, 3, MegaMsg) -> %% Return {ok, Binary} | {error, Reason} %%---------------------------------------------------------------------- +%% <BACKWARD-COMPAT-CLAUSE> encode_transaction([{version3,_}|EC], 1, Trans) -> AsnMod = megaco_ber_media_gateway_control_v1, TransMod = megaco_binary_transformer_v1, ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + encode_transaction(EC, 1, Trans) -> AsnMod = megaco_ber_media_gateway_control_v1, TransMod = megaco_binary_transformer_v1, ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod, io_list); + +%% <BACKWARD-COMPAT-CLAUSE> encode_transaction([{version3,_}|EC], 2, Trans) -> AsnMod = megaco_ber_media_gateway_control_v2, TransMod = megaco_binary_transformer_v2, ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + encode_transaction(EC, 2, Trans) -> AsnMod = megaco_ber_media_gateway_control_v2, TransMod = megaco_binary_transformer_v2, ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod, io_list); -encode_transaction([{version3,v3}|EC], 3, Trans) -> - AsnMod = megaco_ber_media_gateway_control_v3, - TransMod = megaco_binary_transformer_v3, - ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod, io_list); + +%% <DEPRECATED> encode_transaction([{version3,prev3c}|EC], 3, Trans) -> AsnMod = megaco_ber_media_gateway_control_prev3c, TransMod = megaco_binary_transformer_prev3c, @@ -131,6 +150,15 @@ encode_transaction([{version3,prev3a}|EC], 3, Trans) -> AsnMod = megaco_ber_media_gateway_control_prev3a, TransMod = megaco_binary_transformer_prev3a, ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod, io_list); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +encode_transaction([{version3,v3}|EC], 3, Trans) -> + AsnMod = megaco_ber_media_gateway_control_v3, + TransMod = megaco_binary_transformer_v3, + ?BIN_LIB:encode_transaction(EC, Trans, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + encode_transaction(EC, 3, Trans) -> AsnMod = megaco_ber_media_gateway_control_v3, TransMod = megaco_binary_transformer_v3, @@ -141,29 +169,34 @@ encode_transaction(EC, 3, Trans) -> %% Convert a list of ActionRequest record's into a binary %% Return {ok, DeepIoList} | {error, Reason} %%---------------------------------------------------------------------- + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_requests([{version3,_}|EC], 1, ActReqs) when is_list(ActReqs) -> AsnMod = megaco_ber_media_gateway_control_v1, TransMod = megaco_binary_transformer_v1, ?BIN_LIB:encode_action_requests(EC, ActReqs, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_requests(EC, 1, ActReqs) when is_list(ActReqs) -> AsnMod = megaco_ber_media_gateway_control_v1, TransMod = megaco_binary_transformer_v1, ?BIN_LIB:encode_action_requests(EC, ActReqs, AsnMod, TransMod, io_list); + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_requests([{version3,_}|EC], 2, ActReqs) when is_list(ActReqs) -> AsnMod = megaco_ber_media_gateway_control_v2, TransMod = megaco_binary_transformer_v2, ?BIN_LIB:encode_action_requests(EC, ActReqs, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_requests(EC, 2, ActReqs) when is_list(ActReqs) -> AsnMod = megaco_ber_media_gateway_control_v2, TransMod = megaco_binary_transformer_v2, ?BIN_LIB:encode_action_requests(EC, ActReqs, AsnMod, TransMod, io_list); -encode_action_requests([{version3,v3}|EC], 3, ActReqs) - when is_list(ActReqs) -> - AsnMod = megaco_ber_media_gateway_control_v3, - TransMod = megaco_binary_transformer_v3, - ?BIN_LIB:encode_action_requests(EC, ActReqs, AsnMod, TransMod, io_list); + +%% <DEPRECATED> encode_action_requests([{version3,prev3c}|EC], 3, ActReqs) when is_list(ActReqs) -> AsnMod = megaco_ber_media_gateway_control_prev3c, @@ -179,6 +212,16 @@ encode_action_requests([{version3,prev3a}|EC], 3, ActReqs) AsnMod = megaco_ber_media_gateway_control_prev3a, TransMod = megaco_binary_transformer_prev3a, ?BIN_LIB:encode_action_requests(EC, ActReqs, AsnMod, TransMod, io_list); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +encode_action_requests([{version3,v3}|EC], 3, ActReqs) + when is_list(ActReqs) -> + AsnMod = megaco_ber_media_gateway_control_v3, + TransMod = megaco_binary_transformer_v3, + ?BIN_LIB:encode_action_requests(EC, ActReqs, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_requests(EC, 3, ActReqs) when is_list(ActReqs) -> AsnMod = megaco_ber_media_gateway_control_v3, TransMod = megaco_binary_transformer_v3, @@ -189,26 +232,32 @@ encode_action_requests(EC, 3, ActReqs) when is_list(ActReqs) -> %% Convert a ActionRequest record into a binary %% Return {ok, DeepIoList} | {error, Reason} %%---------------------------------------------------------------------- + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_request([{version3,_}|EC], 1, ActReq) -> AsnMod = megaco_ber_media_gateway_control_v1, TransMod = megaco_binary_transformer_v1, ?BIN_LIB:encode_action_request(EC, ActReq, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_request(EC, 1, ActReq) -> AsnMod = megaco_ber_media_gateway_control_v1, TransMod = megaco_binary_transformer_v1, ?BIN_LIB:encode_action_request(EC, ActReq, AsnMod, TransMod, io_list); + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_request([{version3,_}|EC], 2, ActReq) -> AsnMod = megaco_ber_media_gateway_control_v2, TransMod = megaco_binary_transformer_v2, ?BIN_LIB:encode_action_request(EC, ActReq, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_request(EC, 2, ActReq) -> AsnMod = megaco_ber_media_gateway_control_v2, TransMod = megaco_binary_transformer_v2, ?BIN_LIB:encode_action_request(EC, ActReq, AsnMod, TransMod, io_list); -encode_action_request([{version3,v3}|EC], 3, ActReq) -> - AsnMod = megaco_ber_media_gateway_control_v3, - TransMod = megaco_binary_transformer_v3, - ?BIN_LIB:encode_action_request(EC, ActReq, AsnMod, TransMod, io_list); + +%% <DEPRECATED> encode_action_request([{version3,prev3c}|EC], 3, ActReq) -> AsnMod = megaco_ber_media_gateway_control_prev3c, TransMod = megaco_binary_transformer_prev3c, @@ -221,6 +270,15 @@ encode_action_request([{version3,prev3a}|EC], 3, ActReq) -> AsnMod = megaco_ber_media_gateway_control_prev3a, TransMod = megaco_binary_transformer_prev3a, ?BIN_LIB:encode_action_request(EC, ActReq, AsnMod, TransMod, io_list); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +encode_action_request([{version3,v3}|EC], 3, ActReq) -> + AsnMod = megaco_ber_media_gateway_control_v3, + TransMod = megaco_binary_transformer_v3, + ?BIN_LIB:encode_action_request(EC, ActReq, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_request(EC, 3, ActReq) -> AsnMod = megaco_ber_media_gateway_control_v3, TransMod = megaco_binary_transformer_v3, @@ -242,11 +300,7 @@ encode_action_reply(_EC, _V, _AcionReply) -> %% Return {ok, Version} | {error, Reason} %%---------------------------------------------------------------------- -version_of([{version3,v3}|EC], Binary) -> - Decoders = [megaco_ber_media_gateway_control_v1, - megaco_ber_media_gateway_control_v2, - megaco_ber_media_gateway_control_v3], - ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders); +%% <DEPRECATED> version_of([{version3,prev3c}|EC], Binary) -> Decoders = [megaco_ber_media_gateway_control_v1, megaco_ber_media_gateway_control_v2, @@ -262,6 +316,16 @@ version_of([{version3,prev3a}|EC], Binary) -> megaco_ber_media_gateway_control_v2, megaco_ber_media_gateway_control_prev3a], ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +version_of([{version3,v3}|EC], Binary) -> + Decoders = [megaco_ber_media_gateway_control_v1, + megaco_ber_media_gateway_control_v2, + megaco_ber_media_gateway_control_v3], + ?BIN_LIB:version_of(EC, Binary, dynamic, Decoders); +%% </BACKWARD-COMPAT-CLAUSE> + version_of(EC, Binary) -> Decoders = [megaco_ber_media_gateway_control_v1, megaco_ber_media_gateway_control_v2, @@ -277,14 +341,7 @@ version_of(EC, Binary) -> decode_message(EC, Binary) -> decode_message(EC, 1, Binary). -decode_message([{version3,v3}|EC], dynamic, Binary) -> - Decoders = [{megaco_ber_media_gateway_control_v1, - megaco_binary_transformer_v1}, - {megaco_ber_media_gateway_control_v2, - megaco_binary_transformer_v2}, - {megaco_ber_media_gateway_control_v3, - megaco_binary_transformer_v3}], - ?BIN_LIB:decode_message_dynamic(EC, Binary, Decoders, binary); +%% <DEPRECATED> decode_message([{version3,prev3c}|EC], dynamic, Binary) -> Decoders = [{megaco_ber_media_gateway_control_v1, megaco_binary_transformer_v1}, @@ -309,6 +366,19 @@ decode_message([{version3,prev3a}|EC], dynamic, Binary) -> {megaco_ber_media_gateway_control_prev3a, megaco_binary_transformer_prev3a}], ?BIN_LIB:decode_message_dynamic(EC, Binary, Decoders, binary); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +decode_message([{version3,v3}|EC], dynamic, Binary) -> + Decoders = [{megaco_ber_media_gateway_control_v1, + megaco_binary_transformer_v1}, + {megaco_ber_media_gateway_control_v2, + megaco_binary_transformer_v2}, + {megaco_ber_media_gateway_control_v3, + megaco_binary_transformer_v3}], + ?BIN_LIB:decode_message_dynamic(EC, Binary, Decoders, binary); +%% </BACKWARD-COMPAT-CLAUSE> + decode_message(EC, dynamic, Binary) -> Decoders = [{megaco_ber_media_gateway_control_v1, megaco_binary_transformer_v1}, @@ -321,10 +391,12 @@ decode_message(EC, dynamic, Binary) -> %% -- Version 1 -- +%% <BACKWARD-COMPAT-CLAUSE> decode_message([{version3,_}|EC], 1, Binary) -> AsnMod = megaco_ber_media_gateway_control_v1, TransMod = megaco_binary_transformer_v1, ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary); +%% </BACKWARD-COMPAT-CLAUSE> decode_message(EC, 1, Binary) -> AsnMod = megaco_ber_media_gateway_control_v1, @@ -334,10 +406,12 @@ decode_message(EC, 1, Binary) -> %% -- Version 2 -- +%% <BACKWARD-COMPAT-CLAUSE> decode_message([{version3,_}|EC], 2, Binary) -> AsnMod = megaco_ber_media_gateway_control_v2, TransMod = megaco_binary_transformer_v2, ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary); +%% </BACKWARD-COMPAT-CLAUSE> decode_message(EC, 2, Binary) -> AsnMod = megaco_ber_media_gateway_control_v2, @@ -347,10 +421,7 @@ decode_message(EC, 2, Binary) -> %% -- Version 3 -- -decode_message([{version3,v3}|EC], 3, Binary) -> - AsnMod = megaco_ber_media_gateway_control_v3, - TransMod = megaco_binary_transformer_v3, - ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary); +%% <DEPRECATED> decode_message([{version3,prev3c}|EC], 3, Binary) -> AsnMod = megaco_ber_media_gateway_control_prev3c, TransMod = megaco_binary_transformer_prev3c, @@ -363,6 +434,14 @@ decode_message([{version3,prev3a}|EC], 3, Binary) -> AsnMod = megaco_ber_media_gateway_control_prev3a, TransMod = megaco_binary_transformer_prev3a, ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +decode_message([{version3,v3}|EC], 3, Binary) -> + AsnMod = megaco_ber_media_gateway_control_v3, + TransMod = megaco_binary_transformer_v3, + ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary); +%% </BACKWARD-COMPAT-CLAUSE> decode_message(EC, 3, Binary) -> AsnMod = megaco_ber_media_gateway_control_v3, @@ -370,11 +449,7 @@ decode_message(EC, 3, Binary) -> ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, binary). -decode_mini_message([{version3,v3}|EC], dynamic, Bin) -> - Mods = [megaco_ber_media_gateway_control_v1, - megaco_ber_media_gateway_control_v2, - megaco_ber_media_gateway_control_v3], - ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary); +%% <DEPRECATED> decode_mini_message([{version3,prev3c}|EC], dynamic, Bin) -> Mods = [megaco_ber_media_gateway_control_v1, megaco_ber_media_gateway_control_v2, @@ -390,29 +465,43 @@ decode_mini_message([{version3,prev3a}|EC], dynamic, Bin) -> megaco_ber_media_gateway_control_v2, megaco_ber_media_gateway_control_prev3a], ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +decode_mini_message([{version3,v3}|EC], dynamic, Bin) -> + Mods = [megaco_ber_media_gateway_control_v1, + megaco_ber_media_gateway_control_v2, + megaco_ber_media_gateway_control_v3], + ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary); +%% </BACKWARD-COMPAT-CLAUSE> + decode_mini_message(EC, dynamic, Bin) -> Mods = [megaco_ber_media_gateway_control_v1, megaco_ber_media_gateway_control_v2, megaco_ber_media_gateway_control_v3], ?BIN_LIB:decode_mini_message_dynamic(EC, Bin, Mods, binary); +%% <BACKWARD-COMPAT-CLAUSE> decode_mini_message([{version3,_}|EC], 1, Bin) -> AsnMod = megaco_ber_media_gateway_control_v1, ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary); +%% </BACKWARD-COMPAT-CLAUSE> + decode_mini_message(EC, 1, Bin) -> AsnMod = megaco_ber_media_gateway_control_v1, ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary); +%% <BACKWARD-COMPAT-CLAUSE> decode_mini_message([{version3,_}|EC], 2, Bin) -> AsnMod = megaco_ber_media_gateway_control_v2, ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary); +%% </BACKWARD-COMPAT-CLAUSE> + decode_mini_message(EC, 2, Bin) -> AsnMod = megaco_ber_media_gateway_control_v2, ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary); -decode_mini_message([{version3,v3}|EC], 3, Bin) -> - AsnMod = megaco_ber_media_gateway_control_v3, - ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary); +%% <DEPRECATED> decode_mini_message([{version3,prev3c}|EC], 3, Bin) -> AsnMod = megaco_ber_media_gateway_control_prev3c, ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary); @@ -422,6 +511,14 @@ decode_mini_message([{version3,prev3b}|EC], 3, Bin) -> decode_mini_message([{version3,prev3a}|EC], 3, Bin) -> AsnMod = megaco_ber_media_gateway_control_prev3a, ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +decode_mini_message([{version3,v3}|EC], 3, Bin) -> + AsnMod = megaco_ber_media_gateway_control_v3, + ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary); +%% </BACKWARD-COMPAT-CLAUSE> + decode_mini_message(EC, 3, Bin) -> AsnMod = megaco_ber_media_gateway_control_v3, ?BIN_LIB:decode_mini_message(EC, Bin, AsnMod, binary). diff --git a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3a.erl b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3a.erl index f9e3fe39e3..d8440c6bc8 100644 --- a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3a.erl +++ b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3a.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2019. All Rights Reserved. +%% Copyright Ericsson AB 2004-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -21,6 +21,11 @@ %% %%---------------------------------------------------------------------- %% Purpose: Handle meta data about packages +%% +%% DEPRECATED +%% DEPRECATED +%% DEPRECATED +%% %%---------------------------------------------------------------------- -module(megaco_binary_name_resolver_prev3a). diff --git a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3b.erl b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3b.erl index 141225f501..bb04eee3c2 100644 --- a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3b.erl +++ b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3b.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2019. All Rights Reserved. +%% Copyright Ericsson AB 2005-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -21,6 +21,11 @@ %% %%---------------------------------------------------------------------- %% Purpose: Handle meta data about packages +%% +%% DEPRECATED +%% DEPRECATED +%% DEPRECATED +%% %%---------------------------------------------------------------------- -module(megaco_binary_name_resolver_prev3b). diff --git a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3c.erl b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3c.erl index b27a0be26e..5336f9a8ad 100644 --- a/lib/megaco/src/binary/megaco_binary_name_resolver_prev3c.erl +++ b/lib/megaco/src/binary/megaco_binary_name_resolver_prev3c.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2019. All Rights Reserved. +%% Copyright Ericsson AB 2005-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -21,6 +21,11 @@ %% %%---------------------------------------------------------------------- %% Purpose: Handle meta data about packages +%% +%% DEPRECATED +%% DEPRECATED +%% DEPRECATED +%% %%---------------------------------------------------------------------- -module(megaco_binary_name_resolver_prev3c). diff --git a/lib/megaco/src/binary/megaco_binary_transformer_prev3a.erl b/lib/megaco/src/binary/megaco_binary_transformer_prev3a.erl index 81cf0065dd..be716188d3 100644 --- a/lib/megaco/src/binary/megaco_binary_transformer_prev3a.erl +++ b/lib/megaco/src/binary/megaco_binary_transformer_prev3a.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2016. All Rights Reserved. +%% Copyright Ericsson AB 2004-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -21,6 +21,11 @@ %% %%---------------------------------------------------------------------- %% Purpose: Transform internal form of Megaco/H.248 messages +%% +%% DEPRECATED +%% DEPRECATED +%% DEPRECATED +%% %%---------------------------------------------------------------------- -module(megaco_binary_transformer_prev3a). @@ -32,6 +37,7 @@ -export([tr_message/3, tr_transaction/3]). + -define(DEFAULT_NAME_RESOLVER, megaco_binary_name_resolver_prev3a). -record(state, {mode, % verify | encode | decode diff --git a/lib/megaco/src/binary/megaco_binary_transformer_prev3b.erl b/lib/megaco/src/binary/megaco_binary_transformer_prev3b.erl index a6dab5d780..8b1cf91159 100644 --- a/lib/megaco/src/binary/megaco_binary_transformer_prev3b.erl +++ b/lib/megaco/src/binary/megaco_binary_transformer_prev3b.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2016. All Rights Reserved. +%% Copyright Ericsson AB 2005-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -21,6 +21,11 @@ %% %%---------------------------------------------------------------------- %% Purpose: Transform internal form of Megaco/H.248 messages +%% +%% DEPRECATED +%% DEPRECATED +%% DEPRECATED +%% %%---------------------------------------------------------------------- -module(megaco_binary_transformer_prev3b). @@ -32,6 +37,7 @@ -export([tr_message/3, tr_transaction/3]). + -define(DEFAULT_NAME_RESOLVER, megaco_binary_name_resolver_prev3b). -record(state, {mode, % verify | encode | decode diff --git a/lib/megaco/src/binary/megaco_binary_transformer_prev3c.erl b/lib/megaco/src/binary/megaco_binary_transformer_prev3c.erl index 63714be31d..da6ea877ba 100644 --- a/lib/megaco/src/binary/megaco_binary_transformer_prev3c.erl +++ b/lib/megaco/src/binary/megaco_binary_transformer_prev3c.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2016. All Rights Reserved. +%% Copyright Ericsson AB 2005-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -21,6 +21,11 @@ %% %%---------------------------------------------------------------------- %% Purpose: Transform internal form of Megaco/H.248 messages +%% +%% DEPRECATED +%% DEPRECATED +%% DEPRECATED +%% %%---------------------------------------------------------------------- -module(megaco_binary_transformer_prev3c). @@ -32,6 +37,7 @@ -export([tr_message/3, tr_transaction/3]). + -define(DEFAULT_NAME_RESOLVER, megaco_binary_name_resolver_prev3c). -record(state, {mode, % verify | encode | decode diff --git a/lib/megaco/src/binary/megaco_per_encoder.erl b/lib/megaco/src/binary/megaco_per_encoder.erl index 3de33b1d60..187e37d21b 100644 --- a/lib/megaco/src/binary/megaco_per_encoder.erl +++ b/lib/megaco/src/binary/megaco_per_encoder.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2016. All Rights Reserved. +%% Copyright Ericsson AB 2000-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -64,9 +64,7 @@ %% Return {ok, Version} | {error, Reason} %%---------------------------------------------------------------------- -version_of([{version3,v3}|EC], Binary) -> - Decoders = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?V3_ASN1_MOD], - ?BIN_LIB:version_of(EC, Binary, 1, Decoders); +%% <DEPRECATED> version_of([{version3,prev3c}|EC], Binary) -> Decoders = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?PREV3C_ASN1_MOD], ?BIN_LIB:version_of(EC, Binary, 1, Decoders); @@ -76,6 +74,14 @@ version_of([{version3,prev3b}|EC], Binary) -> version_of([{version3,prev3a}|EC], Binary) -> Decoders = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?PREV3A_ASN1_MOD], ?BIN_LIB:version_of(EC, Binary, 1, Decoders); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +version_of([{version3,v3}|EC], Binary) -> + Decoders = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?V3_ASN1_MOD], + ?BIN_LIB:version_of(EC, Binary, 1, Decoders); +%% </BACKWARD-COMPAT-CLAUSE> + version_of(EC, Binary) -> Decoders = [?V1_ASN1_MOD, ?V2_ASN1_MOD, ?V3_ASN1_MOD], ?BIN_LIB:version_of(EC, Binary, 1, Decoders). @@ -93,10 +99,13 @@ encode_message(EC, %% -- Version 1 -- +%% <BACKWARD-COMPAT-CLAUSE> encode_message([{version3,_}|EC], 1, MegaMsg) -> AsnMod = ?V1_ASN1_MOD, TransMod = ?V1_TRANS_MOD, ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + encode_message(EC, 1, MegaMsg) -> AsnMod = ?V1_ASN1_MOD, TransMod = ?V1_TRANS_MOD, @@ -105,10 +114,13 @@ encode_message(EC, 1, MegaMsg) -> %% -- Version 2 -- +%% <BACKWARD-COMPAT-CLAUSE> encode_message([{version3,_}|EC], 2, MegaMsg) -> AsnMod = ?V2_ASN1_MOD, TransMod = ?V2_TRANS_MOD, ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + encode_message(EC, 2, MegaMsg) -> AsnMod = ?V2_ASN1_MOD, TransMod = ?V2_TRANS_MOD, @@ -117,10 +129,7 @@ encode_message(EC, 2, MegaMsg) -> %% -- Version 3 -- -encode_message([{version3,v3}|EC], 3, MegaMsg) -> - AsnMod = ?V3_ASN1_MOD, - TransMod = ?V3_TRANS_MOD, - ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list); +%% <DEPRECATED> encode_message([{version3,prev3c}|EC], 3, MegaMsg) -> AsnMod = ?PREV3C_ASN1_MOD, TransMod = ?PREV3C_TRANS_MOD, @@ -133,6 +142,15 @@ encode_message([{version3,prev3a}|EC], 3, MegaMsg) -> AsnMod = ?PREV3A_ASN1_MOD, TransMod = ?PREV3A_TRANS_MOD, ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +encode_message([{version3,v3}|EC], 3, MegaMsg) -> + AsnMod = ?V3_ASN1_MOD, + TransMod = ?V3_TRANS_MOD, + ?BIN_LIB:encode_message(EC, MegaMsg, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + encode_message(EC, 3, MegaMsg) -> AsnMod = ?V3_ASN1_MOD, TransMod = ?V3_TRANS_MOD, @@ -245,10 +263,13 @@ decode_message(EC, dynamic, Binary) -> %% -- Version 1 -- +%% <BACKWARD-COMPAT-CLAUSE> decode_message([{version3,_}|EC], 1, Binary) -> AsnMod = ?V1_ASN1_MOD, TransMod = ?V1_TRANS_MOD, ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + decode_message(EC, 1, Binary) -> AsnMod = ?V1_ASN1_MOD, TransMod = ?V1_TRANS_MOD, @@ -256,10 +277,13 @@ decode_message(EC, 1, Binary) -> %% -- Version 2 -- +%% <BACKWARD-COMPAT-CLAUSE> decode_message([{version3,_}|EC], 2, Binary) -> AsnMod = ?V2_ASN1_MOD, TransMod = ?V2_TRANS_MOD, ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + decode_message(EC, 2, Binary) -> AsnMod = ?V2_ASN1_MOD, TransMod = ?V2_TRANS_MOD, @@ -267,10 +291,7 @@ decode_message(EC, 2, Binary) -> %% -- Version 3 -- -decode_message([{version3,v3}|EC], 3, Binary) -> - AsnMod = ?V3_ASN1_MOD, - TransMod = ?V3_TRANS_MOD, - ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, io_list); +%% <DEPRECATED> decode_message([{version3,prev3c}|EC], 3, Binary) -> AsnMod = ?PREV3C_ASN1_MOD, TransMod = ?PREV3C_TRANS_MOD, @@ -283,6 +304,15 @@ decode_message([{version3,prev3a}|EC], 3, Binary) -> AsnMod = ?PREV3A_ASN1_MOD, TransMod = ?PREV3A_TRANS_MOD, ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, io_list); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +decode_message([{version3,v3}|EC], 3, Binary) -> + AsnMod = ?V3_ASN1_MOD, + TransMod = ?V3_TRANS_MOD, + ?BIN_LIB:decode_message(EC, Binary, AsnMod, TransMod, io_list); +%% </BACKWARD-COMPAT-CLAUSE> + decode_message(EC, 3, Binary) -> AsnMod = ?V3_ASN1_MOD, TransMod = ?V3_TRANS_MOD, diff --git a/lib/megaco/src/binary/modules.mk b/lib/megaco/src/binary/modules.mk index bf5db0e243..485f0fe610 100644 --- a/lib/megaco/src/binary/modules.mk +++ b/lib/megaco/src/binary/modules.mk @@ -2,7 +2,7 @@ # %CopyrightBegin% # -# Copyright Ericsson AB 2001-2016. All Rights Reserved. +# Copyright Ericsson AB 2001-2020. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,62 +18,71 @@ # # %CopyrightEnd% +# <DEPRECATED> +PREV3_MODULES = \ + megaco_ber_media_gateway_control_prev3a \ + megaco_ber_media_gateway_control_prev3b \ + megaco_ber_media_gateway_control_prev3c \ + megaco_per_media_gateway_control_prev3a \ + megaco_per_media_gateway_control_prev3b \ + megaco_per_media_gateway_control_prev3c \ + megaco_binary_name_resolver_prev3a \ + megaco_binary_name_resolver_prev3b \ + megaco_binary_name_resolver_prev3c \ + megaco_binary_transformer_prev3a \ + megaco_binary_transformer_prev3b \ + megaco_binary_transformer_prev3c +# </DEPRECATED> + MODULES = \ megaco_binary_encoder \ megaco_binary_encoder_lib \ megaco_ber_encoder \ megaco_ber_media_gateway_control_v1 \ megaco_ber_media_gateway_control_v2 \ - megaco_ber_media_gateway_control_prev3a \ - megaco_ber_media_gateway_control_prev3b \ - megaco_ber_media_gateway_control_prev3c \ megaco_ber_media_gateway_control_v3 \ megaco_per_encoder \ megaco_per_media_gateway_control_v1 \ megaco_per_media_gateway_control_v2 \ - megaco_per_media_gateway_control_prev3a \ - megaco_per_media_gateway_control_prev3b \ - megaco_per_media_gateway_control_prev3c \ megaco_per_media_gateway_control_v3 \ megaco_binary_name_resolver_v1 \ megaco_binary_name_resolver_v2 \ - megaco_binary_name_resolver_prev3a \ - megaco_binary_name_resolver_prev3b \ - megaco_binary_name_resolver_prev3c \ megaco_binary_name_resolver_v3 \ megaco_binary_term_id \ megaco_binary_term_id_gen \ megaco_binary_transformer_v1 \ megaco_binary_transformer_v2 \ - megaco_binary_transformer_prev3a \ - megaco_binary_transformer_prev3b \ - megaco_binary_transformer_prev3c \ - megaco_binary_transformer_v3 + megaco_binary_transformer_v3 \ + $(PREV3_MODULES) INTERNAL_HRL_FILES = ASN1_V1_SPEC = MEDIA-GATEWAY-CONTROL-v1 ASN1_V2_SPEC = MEDIA-GATEWAY-CONTROL-v2 +ASN1_V3_SPEC = MEDIA-GATEWAY-CONTROL-v3 +# <DEPRECATED> ASN1_PREV3A_SPEC = MEDIA-GATEWAY-CONTROL-prev3a ASN1_PREV3B_SPEC = MEDIA-GATEWAY-CONTROL-prev3b ASN1_PREV3C_SPEC = MEDIA-GATEWAY-CONTROL-prev3c -ASN1_V3_SPEC = MEDIA-GATEWAY-CONTROL-v3 +# </DEPRECATED> -BER_ASN1_V1_SPEC = megaco_ber_media_gateway_control_v1 -PER_ASN1_V1_SPEC = megaco_per_media_gateway_control_v1 +BER_ASN1_V1_SPEC = megaco_ber_media_gateway_control_v1 +PER_ASN1_V1_SPEC = megaco_per_media_gateway_control_v1 -BER_ASN1_V2_SPEC = megaco_ber_media_gateway_control_v2 -PER_ASN1_V2_SPEC = megaco_per_media_gateway_control_v2 +BER_ASN1_V2_SPEC = megaco_ber_media_gateway_control_v2 +PER_ASN1_V2_SPEC = megaco_per_media_gateway_control_v2 -BER_ASN1_PREV3A_SPEC = megaco_ber_media_gateway_control_prev3a -PER_ASN1_PREV3A_SPEC = megaco_per_media_gateway_control_prev3a +BER_ASN1_V3_SPEC = megaco_ber_media_gateway_control_v3 +PER_ASN1_V3_SPEC = megaco_per_media_gateway_control_v3 -BER_ASN1_PREV3B_SPEC = megaco_ber_media_gateway_control_prev3b -PER_ASN1_PREV3B_SPEC = megaco_per_media_gateway_control_prev3b +# <DEPRECATED> +BER_ASN1_PREV3A_SPEC = megaco_ber_media_gateway_control_prev3a +PER_ASN1_PREV3A_SPEC = megaco_per_media_gateway_control_prev3a -BER_ASN1_PREV3C_SPEC = megaco_ber_media_gateway_control_prev3c -PER_ASN1_PREV3C_SPEC = megaco_per_media_gateway_control_prev3c +BER_ASN1_PREV3B_SPEC = megaco_ber_media_gateway_control_prev3b +PER_ASN1_PREV3B_SPEC = megaco_per_media_gateway_control_prev3b -BER_ASN1_V3_SPEC = megaco_ber_media_gateway_control_v3 -PER_ASN1_V3_SPEC = megaco_per_media_gateway_control_v3 +BER_ASN1_PREV3C_SPEC = megaco_ber_media_gateway_control_prev3c +PER_ASN1_PREV3C_SPEC = megaco_per_media_gateway_control_prev3c +# </DEPRECATED> diff --git a/lib/megaco/src/engine/megaco_config.erl b/lib/megaco/src/engine/megaco_config.erl index 1ceccf21d1..27d7673d74 100644 --- a/lib/megaco/src/engine/megaco_config.erl +++ b/lib/megaco/src/engine/megaco_config.erl @@ -1539,7 +1539,16 @@ verify_val(Item, Val) -> send_mod when is_atom(Val) -> true; send_handle -> true; encoding_mod when is_atom(Val) -> true; - encoding_config when is_list(Val) -> true; + encoding_config when is_list(Val) -> + case Val of + [{version3, V3}|_] when (V3 =/= v3) -> + warning_msg("Encoding Config version3 ~p is deprecated!~n" + "It will be removed in OTP 24. Use 'v3' instead!"), + ok; + _ -> + ok + end, + true; protocol_version -> megaco_config_misc:verify_strict_uint(Val); auth_data -> true; @@ -2165,6 +2174,8 @@ snmp_counters() -> %%----------------------------------------------------------------- +warning_msg(F) -> + warning_msg(F, []). warning_msg(F, A) -> ?megaco_warning("Config server: " ++ F, A). diff --git a/lib/megaco/src/engine/megaco_erl_dist_encoder.erl b/lib/megaco/src/engine/megaco_erl_dist_encoder.erl index 64204cc056..5ecab5bc56 100644 --- a/lib/megaco/src/engine/megaco_erl_dist_encoder.erl +++ b/lib/megaco/src/engine/megaco_erl_dist_encoder.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2016. All Rights Reserved. +%% Copyright Ericsson AB 2000-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -56,8 +56,11 @@ encode_message(Config, #'MegacoMessage'{mess = #'Message'{version = V}} = MegaMsg) -> encode_message(Config, V, MegaMsg). +%% <BACKWARD-COMPAT-CLAUSE> encode_message([{version3, _}|EC], Vsn, MegaMsg) -> encode_message(EC, Vsn, MegaMsg); +%% </BACKWARD-COMPAT-CLAUSE> + encode_message([megaco_compressed|Config], Vsn, MegaMsg) when is_record(MegaMsg, 'MegacoMessage') -> {ok, erlang:term_to_binary(?MC_MOD:encode(MegaMsg, Vsn), Config)}; @@ -76,8 +79,11 @@ encode_message(_Config, _Vsn, _MegaMsg) -> %% Return {ok, Bin} | {error, Reason} %%---------------------------------------------------------------------- +%% <BACKWARD-COMPAT-CLAUSE> encode_transaction([{version3, _}|EC], Vsn, Trans) -> encode_transaction(EC, Vsn, Trans); +%% </BACKWARD-COMPAT-CLAUSE> + encode_transaction([megaco_compressed|Config], _Vsn, Trans) -> {ok, erlang:term_to_binary(?MC_MOD:encode(Trans), Config)}; encode_transaction([{megaco_compressed, Mod}|Config], _Vsn, Trans) -> @@ -90,8 +96,12 @@ encode_transaction(Config, _Vsn, Trans) -> %% Convert a list of ActionRequest record's into a binary %% Return {ok, Binary} | {error, Reason} %%---------------------------------------------------------------------- + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_requests([{version3, _}|EC], Vsn, ActReqs) -> encode_action_requests(EC, Vsn, ActReqs); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_requests([megaco_compressed|Config], Vsn, ActReqs0) when is_list(ActReqs0) -> ActReqs = [?MC_MOD:encode(AR, Vsn) || AR <- ActReqs0], @@ -110,8 +120,12 @@ encode_action_requests(Config, _Vsn, ActReqs) %% Convert a ActionRequest record into a binary %% Return {ok, Binary} | {error, Reason} %%---------------------------------------------------------------------- + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_request([{version3, _}|EC], Vsn, ActReq) -> encode_action_request(EC, Vsn, ActReq); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_request([megaco_compressed|Config], Vsn, ActReq) when is_tuple(ActReq) -> {ok, erlang:term_to_binary(?MC_MOD:encode(ActReq, Vsn), Config)}; @@ -128,8 +142,12 @@ encode_action_request(Config, _Vsn, ActReq) %% Convert a CommandRequest record into a binary %% Return {ok, DeepIoList} | {error, Reason} %%---------------------------------------------------------------------- + +%% <BACKWARD-COMPAT-CLAUSE> encode_command_request([{version3, _}|EC], Vsn, CmdReq) -> encode_command_request(EC, Vsn, CmdReq); +%% </BACKWARD-COMPAT-CLAUSE> + encode_command_request([megaco_compressed|Config], Vsn, CmdReq) when is_tuple(CmdReq) -> {ok, erlang:term_to_binary(?MC_MOD:encode(CmdReq, Vsn), Config)}; @@ -145,8 +163,12 @@ encode_command_request(Config, _Vsn, CmdReq) %% Convert a action reply into a binary %% Return {ok, DeepIoList} | {error, Reason} %%---------------------------------------------------------------------- + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_reply([{version3, _}|EC], Vsn, ActRep) -> encode_action_reply(EC, Vsn, ActRep); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_reply([megaco_compressed|Config], Vsn, ActRep) when is_tuple(ActRep) -> {ok, erlang:term_to_binary(?MC_MOD:encode(ActRep, Vsn), Config)}; @@ -175,8 +197,11 @@ version_of(Config, Bin) when is_binary(Bin) -> decode_message(Config, Bin) -> decode_message(Config, 1, Bin). +%% <BACKWARD-COMPAT-CLAUSE> decode_message([{version3, _}|EC], V, Bin) -> decode_message(EC, V, Bin); +%% </BACKWARD-COMPAT-CLAUSE> + decode_message([megaco_compressed = MC|_Config], Vsn, Bin) -> case catch erlang:binary_to_term(Bin) of Msg when is_tuple(Msg) -> diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile index 8e7e82b276..3dd24b1df7 100644 --- a/lib/megaco/src/text/Makefile +++ b/lib/megaco/src/text/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2000-2016. All Rights Reserved. +# Copyright Ericsson AB 2000-2020. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -113,16 +113,12 @@ info: # Special Build Targets # ---------------------------------------------------- -parser: parser_v1 parser_v2 parser_prev3a parser_prev3b +parser: parser_v1 parser_v2 parser_v1: megaco_text_parser_v1.$(EMULATOR) parser_v2: megaco_text_parser_v2.$(EMULATOR) -parser_prev3a: megaco_text_parser_prev3a.$(EMULATOR) - -parser_prev3b: megaco_text_parser_prev3b.$(EMULATOR) - # ---------------------------------------------------- # Release Target diff --git a/lib/megaco/src/text/depend.mk b/lib/megaco/src/text/depend.mk index 5001250afd..39c68fc8a9 100644 --- a/lib/megaco/src/text/depend.mk +++ b/lib/megaco/src/text/depend.mk @@ -2,7 +2,7 @@ # %CopyrightBegin% # -# Copyright Ericsson AB 2001-2016. All Rights Reserved. +# Copyright Ericsson AB 2001-2020. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -27,6 +27,8 @@ megaco_text_parser_v2.erl: \ megaco_text_parser_v3.erl: \ megaco_text_parser_v3.yrl \ megaco_text_parser_v3.hrl + +# <DEPRECATED> megaco_text_parser_prev3a.erl: \ megaco_text_parser_prev3a.yrl \ megaco_text_parser_prev3a.hrl @@ -36,6 +38,7 @@ megaco_text_parser_prev3b.erl: \ megaco_text_parser_prev3c.erl: \ megaco_text_parser_prev3c.yrl \ megaco_text_parser_prev3c.hrl +# </DEPRECATED> megaco_text_mini_parser.erl: \ megaco_text_mini_parser.yrl \ @@ -68,6 +71,7 @@ $(EBIN)/megaco_compact_text_encoder_v3.$(EMULATOR): \ megaco_text_tokens.hrl \ megaco_text_gen_v3.hrl +# <DEPRECATED> $(EBIN)/megaco_compact_text_encoder_prev3a.$(EMULATOR): \ megaco_compact_text_encoder_prev3a.erl \ $(MEGACO_INCLUDEDIR)/megaco.hrl \ @@ -88,6 +92,7 @@ $(EBIN)/megaco_compact_text_encoder_prev3c.$(EMULATOR): \ $(MEGACO_INCLUDEDIR)/megaco_message_prev3c.hrl \ megaco_text_tokens.hrl \ megaco_text_gen_prev3c.hrl +# </DEPRECATED> $(EBIN)/megaco_pretty_text_encoder.$(EMULATOR): \ megaco_pretty_text_encoder.erl @@ -113,6 +118,7 @@ $(EBIN)/megaco_pretty_text_encoder_v3.$(EMULATOR): \ megaco_text_tokens.hrl \ megaco_text_gen_v3.hrl +# <DEPRECATED> $(EBIN)/megaco_pretty_text_encoder_prev3a.$(EMULATOR): \ megaco_pretty_text_encoder_prev3a.erl \ $(MEGACO_INCLUDEDIR)/megaco.hrl \ @@ -133,6 +139,7 @@ $(EBIN)/megaco_pretty_text_encoder_prev3c.$(EMULATOR): \ $(MEGACO_INCLUDEDIR)/megaco_message_prev3c.hrl \ megaco_text_tokens.hrl \ megaco_text_gen_prev3c.hrl +# </DEPRECATED> $(EBIN)/megaco_text_parser_v1.$(EMULATOR): \ megaco_text_parser_v1.erl \ @@ -155,6 +162,7 @@ $(EBIN)/megaco_text_parser_v3.$(EMULATOR): \ megaco_text_tokens.hrl \ megaco_text_parser_v3.hrl +# <DEPRECATED> $(EBIN)/megaco_text_parser_prev3a.$(EMULATOR): \ megaco_text_parser_prev3a.erl \ $(MEGACO_INCLUDEDIR)/megaco.hrl \ @@ -175,6 +183,7 @@ $(EBIN)/megaco_text_parser_prev3c.$(EMULATOR): \ $(MEGACO_INCLUDEDIR)/megaco_message_prev3c.hrl \ megaco_text_tokens.hrl \ megaco_text_parser_prev3c.hrl +# </DEPRECATED> $(EBIN)/megaco_text_scanner.$(EMULATOR): megaco_text_scanner.erl \ $(MEGACO_INCLUDEDIR)/megaco.hrl \ diff --git a/lib/megaco/src/text/megaco_compact_text_encoder.erl b/lib/megaco/src/text/megaco_compact_text_encoder.erl index 74638308da..ca1b9362fb 100644 --- a/lib/megaco/src/text/megaco_compact_text_encoder.erl +++ b/lib/megaco/src/text/megaco_compact_text_encoder.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2016. All Rights Reserved. +%% Copyright Ericsson AB 2000-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -63,22 +63,36 @@ encode_message(EncodingConfig, #'MegacoMessage'{mess = #'Message'{version = V}} = MegaMsg) -> encode_message(EncodingConfig, V, MegaMsg). +%% <BACKWARD-COMPAT-CLAUSE> encode_message([{version3,_}|EC], 1, MegaMsg) -> megaco_compact_text_encoder_v1:encode_message(EC, MegaMsg); +%% </BACKWARD-COMPAT-CLAUSE> + encode_message(EC, 1, MegaMsg) -> megaco_compact_text_encoder_v1:encode_message(EC, MegaMsg); + +%% <BACKWARD-COMPAT-CLAUSE> encode_message([{version3,_}|EC], 2, MegaMsg) -> megaco_compact_text_encoder_v2:encode_message(EC, MegaMsg); +%% </BACKWARD-COMPAT-CLAUSE> + encode_message(EC, 2, MegaMsg) -> megaco_compact_text_encoder_v2:encode_message(EC, MegaMsg); -encode_message([{version3,v3}|EC], 3, MegaMsg) -> - megaco_compact_text_encoder_v3:encode_message(EC, MegaMsg); + +%% <DEPRECATED> encode_message([{version3,prev3c}|EC], 3, MegaMsg) -> megaco_compact_text_encoder_prev3c:encode_message(EC, MegaMsg); encode_message([{version3,prev3b}|EC], 3, MegaMsg) -> megaco_compact_text_encoder_prev3b:encode_message(EC, MegaMsg); encode_message([{version3,prev3a}|EC], 3, MegaMsg) -> megaco_compact_text_encoder_prev3a:encode_message(EC, MegaMsg); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +encode_message([{version3,v3}|EC], 3, MegaMsg) -> + megaco_compact_text_encoder_v3:encode_message(EC, MegaMsg); +%% </BACKWARD-COMPAT-CLAUSE> + encode_message(EC, 3, MegaMsg) -> megaco_compact_text_encoder_v3:encode_message(EC, MegaMsg); encode_message(_EC, V, _MegaMsg) -> @@ -124,27 +138,8 @@ decode_message([], _, Bin) when is_binary(Bin) -> {error, Reason, Line} -> %% OTP-4007 scan_error(Reason, Line, Bin) %% OTP-4007 end; -decode_message([{version3,v3}], _, Bin) when is_binary(Bin) -> - %% d("decode_message(v3) -> entry"), - case megaco_text_scanner:scan(Bin) of - {ok, Tokens, 1, _LastLine} -> - do_decode_message(?V1_PARSE_MOD, Tokens, Bin); - - {ok, Tokens, 2, _LastLine} -> - do_decode_message(?V2_PARSE_MOD, Tokens, Bin); - - {ok, Tokens, 3, _LastLine} -> - do_decode_message(?V3_PARSE_MOD, Tokens, Bin); - - {ok, _Tokens, V, _LastLine} -> - {error, {unsupported_version, V}}; - - {error, Reason, Tokens, Line} -> - scan_error(Reason, Line, Tokens, Bin); - {error, Reason, Line} -> %% OTP-4007 - scan_error(Reason, Line, Bin) %% OTP-4007 - end; +%% <DEPRECATED> decode_message([{version3,prev3c}], _, Bin) when is_binary(Bin) -> %% d("decode_message(prev3c) -> entry"), case megaco_text_scanner:scan(Bin) of @@ -208,9 +203,12 @@ decode_message([{version3,prev3a}], _, Bin) when is_binary(Bin) -> {error, Reason, Line} -> %% OTP-4007 scan_error(Reason, Line, Bin) %% OTP-4007 end; -decode_message([{flex, Port}], _, Bin) when is_binary(Bin) -> - %% d("decode_message(flex) -> entry"), - case megaco_flex_scanner:scan(Bin, Port) of +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +decode_message([{version3,v3}], _, Bin) when is_binary(Bin) -> + %% d("decode_message(v3) -> entry"), + case megaco_text_scanner:scan(Bin) of {ok, Tokens, 1, _LastLine} -> do_decode_message(?V1_PARSE_MOD, Tokens, Bin); @@ -223,14 +221,16 @@ decode_message([{flex, Port}], _, Bin) when is_binary(Bin) -> {ok, _Tokens, V, _LastLine} -> {error, {unsupported_version, V}}; - %% {error, Reason, Tokens, Line} -> - %% scan_error(Reason, Line, Tokens, Bin); + {error, Reason, Tokens, Line} -> + scan_error(Reason, Line, Tokens, Bin); {error, Reason, Line} -> %% OTP-4007 scan_error(Reason, Line, Bin) %% OTP-4007 end; -decode_message([{version3,v3},{flex, Port}], _, Bin) when is_binary(Bin) -> - %% d("decode_message(v3,flex) -> entry"), +%% </BACKWARD-COMPAT-CLAUSE> + +decode_message([{flex, Port}], _, Bin) when is_binary(Bin) -> + %% d("decode_message(flex) -> entry"), case megaco_flex_scanner:scan(Bin, Port) of {ok, Tokens, 1, _LastLine} -> do_decode_message(?V1_PARSE_MOD, Tokens, Bin); @@ -250,6 +250,8 @@ decode_message([{version3,v3},{flex, Port}], _, Bin) when is_binary(Bin) -> {error, Reason, Line} -> %% OTP-4007 scan_error(Reason, Line, Bin) %% OTP-4007 end; + +%% <DEPRECATED> decode_message([{version3,prev3c},{flex, Port}], _, Bin) when is_binary(Bin) -> %% d("decode_message(prev3c,flex) -> entry"), case megaco_flex_scanner:scan(Bin, Port) of @@ -313,6 +315,32 @@ decode_message([{version3,prev3a},{flex, Port}], _, Bin) when is_binary(Bin) -> {error, Reason, Line} -> %% OTP-4007 scan_error(Reason, Line, Bin) %% OTP-4007 end; +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +decode_message([{version3,v3},{flex, Port}], _, Bin) when is_binary(Bin) -> + %% d("decode_message(v3,flex) -> entry"), + case megaco_flex_scanner:scan(Bin, Port) of + {ok, Tokens, 1, _LastLine} -> + do_decode_message(?V1_PARSE_MOD, Tokens, Bin); + + {ok, Tokens, 2, _LastLine} -> + do_decode_message(?V2_PARSE_MOD, Tokens, Bin); + + {ok, Tokens, 3, _LastLine} -> + do_decode_message(?V3_PARSE_MOD, Tokens, Bin); + + {ok, _Tokens, V, _LastLine} -> + {error, {unsupported_version, V}}; + + %% {error, Reason, Tokens, Line} -> + %% scan_error(Reason, Line, Tokens, Bin); + + {error, Reason, Line} -> %% OTP-4007 + scan_error(Reason, Line, Bin) %% OTP-4007 + end; +%% <BACKWARD-COMPAT-CLAUSE> + decode_message(EC, _, Bin) when is_binary(Bin) -> {error, {bad_encoding_config, EC}}; decode_message(_EC, _, _BadBin) -> @@ -387,22 +415,37 @@ l2i(L) when is_list(L) -> %% Convert a transaction record into a deep io list %% Return {ok, DeepIoList} | {error, Reason} %%---------------------------------------------------------------------- + +%% <BACKWARD-COMPAT-CLAUSE> encode_transaction([{version3,_}|EC], 1, Trans) -> megaco_compact_text_encoder_v1:encode_transaction(EC, Trans); +%% </BACKWARD-COMPAT-CLAUSE> + encode_transaction(EC, 1, Trans) -> megaco_compact_text_encoder_v1:encode_transaction(EC, Trans); + +%% <BACKWARD-COMPAT-CLAUSE> encode_transaction([{version3,_}|EC], 2, Trans) -> megaco_compact_text_encoder_v2:encode_transaction(EC, Trans); +%% </BACKWARD-COMPAT-CLAUSE> + encode_transaction(EC, 2, Trans) -> megaco_compact_text_encoder_v2:encode_transaction(EC, Trans); + +%% <DEPRECATED> encode_transaction([{version3,prev3c}|EC], 3, Trans) -> megaco_compact_text_encoder_prev3c:encode_transaction(EC, Trans); encode_transaction([{version3,prev3b}|EC], 3, Trans) -> megaco_compact_text_encoder_prev3b:encode_transaction(EC, Trans); encode_transaction([{version3,prev3a}|EC], 3, Trans) -> megaco_compact_text_encoder_prev3a:encode_transaction(EC, Trans); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> encode_transaction([{version3,v3}|EC], 3, Trans) -> megaco_compact_text_encoder_v3:encode_transaction(EC, Trans); +%% </BACKWARD-COMPAT-CLAUSE> + encode_transaction(EC, 3, Trans) -> megaco_compact_text_encoder_v3:encode_transaction(EC, Trans); encode_transaction(_EC, V, _Trans) -> @@ -413,16 +456,26 @@ encode_transaction(_EC, V, _Trans) -> %% Convert a list of ActionRequest record's into a binary %% Return {ok, DeepIoList} | {error, Reason} %%---------------------------------------------------------------------- + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_requests([{version3,_}|EC], 1, ActReqs) when is_list(ActReqs) -> megaco_compact_text_encoder_v1:encode_action_requests(EC, ActReqs); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_requests(EC, 1, ActReqs) when is_list(ActReqs) -> megaco_compact_text_encoder_v1:encode_action_requests(EC, ActReqs); + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_requests([{version3,_}|EC], 2, ActReqs) when is_list(ActReqs) -> megaco_compact_text_encoder_v2:encode_action_requests(EC, ActReqs); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_requests(EC, 2, ActReqs) when is_list(ActReqs) -> megaco_compact_text_encoder_v2:encode_action_requests(EC, ActReqs); + +%% <DEPRECATED> encode_action_requests([{version3,prev3c}|EC], 3, ActReqs) when is_list(ActReqs) -> megaco_compact_text_encoder_prev3c:encode_action_requests(EC, ActReqs); @@ -432,9 +485,14 @@ encode_action_requests([{version3,prev3b}|EC], 3, ActReqs) encode_action_requests([{version3,prev3a}|EC], 3, ActReqs) when is_list(ActReqs) -> megaco_compact_text_encoder_prev3a:encode_action_requests(EC, ActReqs); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_requests([{version3,v3}|EC], 3, ActReqs) when is_list(ActReqs) -> megaco_compact_text_encoder_v3:encode_action_requests(EC, ActReqs); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_requests(EC, 3, ActReqs) when is_list(ActReqs) -> megaco_compact_text_encoder_v3:encode_action_requests(EC, ActReqs); encode_action_requests(_EC, V, _ActReqs) -> @@ -445,22 +503,37 @@ encode_action_requests(_EC, V, _ActReqs) -> %% Convert a ActionRequest record into a binary %% Return {ok, DeepIoList} | {error, Reason} %%---------------------------------------------------------------------- + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_request([{version3,_}|EC], 1, ActReq) -> megaco_compact_text_encoder_v1:encode_action_request(EC, ActReq); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_request(EC, 1, ActReq) -> megaco_compact_text_encoder_v1:encode_action_request(EC, ActReq); + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_request([{version3,_}|EC], 2, ActReq) -> megaco_compact_text_encoder_v2:encode_action_request(EC, ActReq); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_request(EC, 2, ActReq) -> megaco_compact_text_encoder_v2:encode_action_request(EC, ActReq); + +%% <DEPRECATED> encode_action_request([{version3,prev3c}|EC], 3, ActReq) -> megaco_compact_text_encoder_prev3c:encode_action_request(EC, ActReq); encode_action_request([{version3,prev3b}|EC], 3, ActReq) -> megaco_compact_text_encoder_prev3b:encode_action_request(EC, ActReq); encode_action_request([{version3,prev3a}|EC], 3, ActReq) -> megaco_compact_text_encoder_prev3a:encode_action_request(EC, ActReq); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_request([{version3,v3}|EC], 3, ActReq) -> megaco_compact_text_encoder_v3:encode_action_request(EC, ActReq); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_request(EC, 3, ActReq) -> megaco_compact_text_encoder_v3:encode_action_request(EC, ActReq); encode_action_request(_EC, V, _ActReq) -> @@ -471,22 +544,37 @@ encode_action_request(_EC, V, _ActReq) -> %% Convert a CommandRequest record into a deep io list %% Return {ok, DeepIoList} | {error, Reason} %%---------------------------------------------------------------------- + +%% <BACKWARD-COMPAT-CLAUSE> encode_command_request([{version3,_}|EC], 1, CmdReq) -> megaco_compact_text_encoder_v1:encode_command_request(EC, CmdReq); +%% </BACKWARD-COMPAT-CLAUSE> + encode_command_request(EC, 1, CmdReq) -> megaco_compact_text_encoder_v1:encode_command_request(EC, CmdReq); + +%% <BACKWARD-COMPAT-CLAUSE> encode_command_request([{version3,_}|EC], 2, CmdReq) -> megaco_compact_text_encoder_v2:encode_command_request(EC, CmdReq); +%% </BACKWARD-COMPAT-CLAUSE> + encode_command_request(EC, 2, CmdReq) -> megaco_compact_text_encoder_v2:encode_command_request(EC, CmdReq); + +%% <DEPRECATED> encode_command_request([{version3,prev3c}|EC], 3, CmdReq) -> megaco_compact_text_encoder_prev3c:encode_command_request(EC, CmdReq); encode_command_request([{version3,prev3b}|EC], 3, CmdReq) -> megaco_compact_text_encoder_prev3b:encode_command_request(EC, CmdReq); encode_command_request([{version3,prev3a}|EC], 3, CmdReq) -> megaco_compact_text_encoder_prev3a:encode_command_request(EC, CmdReq); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> encode_command_request([{version3,v3}|EC], 3, CmdReq) -> megaco_compact_text_encoder_v3:encode_command_request(EC, CmdReq); +%% </BACKWARD-COMPAT-CLAUSE> + encode_command_request(EC, 3, CmdReq) -> megaco_compact_text_encoder_v3:encode_command_request(EC, CmdReq); encode_command_request(_EC, V, _CmdReq) -> @@ -497,22 +585,37 @@ encode_command_request(_EC, V, _CmdReq) -> %% Convert a action reply into a deep io list %% Return {ok, DeepIoList} | {error, Reason} %%---------------------------------------------------------------------- + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_reply([{version3,_}|EC], 1, ActRep) -> megaco_compact_text_encoder_v1:encode_action_reply(EC, ActRep); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_reply(EC, 1, ActRep) -> megaco_compact_text_encoder_v1:encode_action_reply(EC, ActRep); + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_reply([{version3,_}|EC], 2, ActRep) -> megaco_compact_text_encoder_v2:encode_action_reply(EC, ActRep); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_reply(EC, 2, ActRep) -> megaco_compact_text_encoder_v2:encode_action_reply(EC, ActRep); + +%% <DEPRECATED> encode_action_reply([{version3,prev3c}|EC], 3, ActRep) -> megaco_compact_text_encoder_prev3c:encode_action_reply(EC, ActRep); encode_action_reply([{version3,prev3b}|EC], 3, ActRep) -> megaco_compact_text_encoder_prev3b:encode_action_reply(EC, ActRep); encode_action_reply([{version3,prev3a}|EC], 3, ActRep) -> megaco_compact_text_encoder_prev3a:encode_action_reply(EC, ActRep); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_reply([{version3,v3}|EC], 3, ActRep) -> megaco_compact_text_encoder_v3:encode_action_reply(EC, ActRep); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_reply(EC, 3, ActRep) -> megaco_compact_text_encoder_v3:encode_action_reply(EC, ActRep); encode_action_reply(_EC, V, _ActRep) -> @@ -541,10 +644,14 @@ token_tag2string(Tag, 3) -> token_tag2string(Tag, v3); token_tag2string(Tag, v3) -> megaco_compact_text_encoder_v3:token_tag2string(Tag); + +%% <DEPRECATED> token_tag2string(Tag, prev3b) -> megaco_compact_text_encoder_prev3b:token_tag2string(Tag); token_tag2string(Tag, prev3c) -> megaco_compact_text_encoder_prev3c:token_tag2string(Tag); +%% </DEPRECATED> + token_tag2string(Tag, _Vsn) -> token_tag2string(Tag, ?TT2S_BEST_VERSION). diff --git a/lib/megaco/src/text/megaco_compact_text_encoder_prev3a.erl b/lib/megaco/src/text/megaco_compact_text_encoder_prev3a.erl index c3a68d4ed7..50e2a65409 100644 --- a/lib/megaco/src/text/megaco_compact_text_encoder_prev3a.erl +++ b/lib/megaco/src/text/megaco_compact_text_encoder_prev3a.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2016. All Rights Reserved. +%% Copyright Ericsson AB 2004-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -21,6 +21,11 @@ %% %%---------------------------------------------------------------------- %% Purpose: Encode COMPACT Megaco/H.248 text messages from internal form +%% +%% DEPRECATED +%% DEPRECATED +%% DEPRECATED +%% %%---------------------------------------------------------------------- -module(megaco_compact_text_encoder_prev3a). diff --git a/lib/megaco/src/text/megaco_compact_text_encoder_prev3b.erl b/lib/megaco/src/text/megaco_compact_text_encoder_prev3b.erl index f98d1ea9ed..d581d2fb16 100644 --- a/lib/megaco/src/text/megaco_compact_text_encoder_prev3b.erl +++ b/lib/megaco/src/text/megaco_compact_text_encoder_prev3b.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2016. All Rights Reserved. +%% Copyright Ericsson AB 2005-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -21,6 +21,11 @@ %% %%---------------------------------------------------------------------- %% Purpose: Encode COMPACT Megaco/H.248 text messages from internal form +%% +%% DEPRECATED +%% DEPRECATED +%% DEPRECATED +%% %%---------------------------------------------------------------------- -module(megaco_compact_text_encoder_prev3b). diff --git a/lib/megaco/src/text/megaco_compact_text_encoder_prev3c.erl b/lib/megaco/src/text/megaco_compact_text_encoder_prev3c.erl index 14cf1adb9b..95e244a696 100644 --- a/lib/megaco/src/text/megaco_compact_text_encoder_prev3c.erl +++ b/lib/megaco/src/text/megaco_compact_text_encoder_prev3c.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2016. All Rights Reserved. +%% Copyright Ericsson AB 2005-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -21,6 +21,11 @@ %% %%---------------------------------------------------------------------- %% Purpose: Encode COMPACT Megaco/H.248 text messages from internal form +%% +%% DEPRECATED +%% DEPRECATED +%% DEPRECATED +%% %%---------------------------------------------------------------------- -module(megaco_compact_text_encoder_prev3c). diff --git a/lib/megaco/src/text/megaco_pretty_text_encoder.erl b/lib/megaco/src/text/megaco_pretty_text_encoder.erl index 7c47876e8e..56e47a5f24 100644 --- a/lib/megaco/src/text/megaco_pretty_text_encoder.erl +++ b/lib/megaco/src/text/megaco_pretty_text_encoder.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2000-2016. All Rights Reserved. +%% Copyright Ericsson AB 2000-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -74,22 +74,36 @@ encode_message(EncodingConfig, encode_message(EncodingConfig, V, MegaMsg). +%% <BACKWARD-COMPAT-CLAUSE> encode_message([{version3,_}|EC], 1, MegaMsg) -> megaco_pretty_text_encoder_v1:encode_message(EC, MegaMsg); +%% </BACKWARD-COMPAT-CLAUSE> + encode_message(EC, 1, MegaMsg) -> megaco_pretty_text_encoder_v1:encode_message(EC, MegaMsg); + +%% <BACKWARD-COMPAT-CLAUSE> encode_message([{version3,_}|EC], 2, MegaMsg) -> megaco_pretty_text_encoder_v2:encode_message(EC, MegaMsg); +%% </BACKWARD-COMPAT-CLAUSE> + encode_message(EC, 2, MegaMsg) -> megaco_pretty_text_encoder_v2:encode_message(EC, MegaMsg); + +%% <DEPRECATED> encode_message([{version3,prev3c}|EC], 3, MegaMsg) -> megaco_pretty_text_encoder_prev3c:encode_message(EC, MegaMsg); encode_message([{version3,prev3b}|EC], 3, MegaMsg) -> megaco_pretty_text_encoder_prev3b:encode_message(EC, MegaMsg); encode_message([{version3,prev3a}|EC], 3, MegaMsg) -> megaco_pretty_text_encoder_prev3a:encode_message(EC, MegaMsg); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> encode_message([{version3,v3}|EC], 3, MegaMsg) -> megaco_pretty_text_encoder_v3:encode_message(EC, MegaMsg); +%% </BACKWARD-COMPAT-CLAUSE> + encode_message(EC, 3, MegaMsg) -> megaco_pretty_text_encoder_v3:encode_message(EC, MegaMsg); encode_message(_EC, V, _MegaMsg) -> @@ -133,7 +147,9 @@ decode_message([], _, Bin) when is_binary(Bin) -> {error, Reason, Line} -> %% OTP-4007 scan_error(Reason, Line, Bin) %% OTP-4007 end; -decode_message([{version3,v3}], _, Bin) when is_binary(Bin) -> + +%% <DEPRECATED> +decode_message([{version3,prev3c}], _, Bin) when is_binary(Bin) -> case megaco_text_scanner:scan(Bin) of {ok, Tokens, 1, _LastLine} -> do_decode_message(?V1_PARSE_MOD, Tokens, Bin); @@ -142,7 +158,7 @@ decode_message([{version3,v3}], _, Bin) when is_binary(Bin) -> do_decode_message(?V2_PARSE_MOD, Tokens, Bin); {ok, Tokens, 3, _LastLine} -> - do_decode_message(?V3_PARSE_MOD, Tokens, Bin); + do_decode_message(?PREV3C_PARSE_MOD, Tokens, Bin); {ok, _Tokens, V, _LastLine} -> {error, {unsupported_version, V}}; @@ -150,10 +166,10 @@ decode_message([{version3,v3}], _, Bin) when is_binary(Bin) -> {error, Reason, Tokens, Line} -> scan_error(Reason, Line, Tokens, Bin); - {error, Reason, Line} -> %% OTP-4007 - scan_error(Reason, Line, Bin) %% OTP-4007 + {error, Reason, Line} -> + scan_error(Reason, Line, Bin) end; -decode_message([{version3,prev3c}], _, Bin) when is_binary(Bin) -> +decode_message([{version3,prev3b}], _, Bin) when is_binary(Bin) -> case megaco_text_scanner:scan(Bin) of {ok, Tokens, 1, _LastLine} -> do_decode_message(?V1_PARSE_MOD, Tokens, Bin); @@ -162,7 +178,7 @@ decode_message([{version3,prev3c}], _, Bin) when is_binary(Bin) -> do_decode_message(?V2_PARSE_MOD, Tokens, Bin); {ok, Tokens, 3, _LastLine} -> - do_decode_message(?PREV3C_PARSE_MOD, Tokens, Bin); + do_decode_message(?PREV3B_PARSE_MOD, Tokens, Bin); {ok, _Tokens, V, _LastLine} -> {error, {unsupported_version, V}}; @@ -170,10 +186,10 @@ decode_message([{version3,prev3c}], _, Bin) when is_binary(Bin) -> {error, Reason, Tokens, Line} -> scan_error(Reason, Line, Tokens, Bin); - {error, Reason, Line} -> - scan_error(Reason, Line, Bin) + {error, Reason, Line} -> %% OTP-4007 + scan_error(Reason, Line, Bin) %% OTP-4007 end; -decode_message([{version3,prev3b}], _, Bin) when is_binary(Bin) -> +decode_message([{version3,prev3a}], _, Bin) when is_binary(Bin) -> case megaco_text_scanner:scan(Bin) of {ok, Tokens, 1, _LastLine} -> do_decode_message(?V1_PARSE_MOD, Tokens, Bin); @@ -182,7 +198,7 @@ decode_message([{version3,prev3b}], _, Bin) when is_binary(Bin) -> do_decode_message(?V2_PARSE_MOD, Tokens, Bin); {ok, Tokens, 3, _LastLine} -> - do_decode_message(?PREV3B_PARSE_MOD, Tokens, Bin); + do_decode_message(?PREV3A_PARSE_MOD, Tokens, Bin); {ok, _Tokens, V, _LastLine} -> {error, {unsupported_version, V}}; @@ -193,7 +209,10 @@ decode_message([{version3,prev3b}], _, Bin) when is_binary(Bin) -> {error, Reason, Line} -> %% OTP-4007 scan_error(Reason, Line, Bin) %% OTP-4007 end; -decode_message([{version3,prev3a}], _, Bin) when is_binary(Bin) -> +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +decode_message([{version3,v3}], _, Bin) when is_binary(Bin) -> case megaco_text_scanner:scan(Bin) of {ok, Tokens, 1, _LastLine} -> do_decode_message(?V1_PARSE_MOD, Tokens, Bin); @@ -202,7 +221,7 @@ decode_message([{version3,prev3a}], _, Bin) when is_binary(Bin) -> do_decode_message(?V2_PARSE_MOD, Tokens, Bin); {ok, Tokens, 3, _LastLine} -> - do_decode_message(?PREV3A_PARSE_MOD, Tokens, Bin); + do_decode_message(?V3_PARSE_MOD, Tokens, Bin); {ok, _Tokens, V, _LastLine} -> {error, {unsupported_version, V}}; @@ -213,6 +232,8 @@ decode_message([{version3,prev3a}], _, Bin) when is_binary(Bin) -> {error, Reason, Line} -> %% OTP-4007 scan_error(Reason, Line, Bin) %% OTP-4007 end; +%% </BACKWARD-COMPAT-CLAUSE> + decode_message([{flex, Port}], _, Bin) when is_binary(Bin) -> case megaco_flex_scanner:scan(Bin, Port) of {ok, Tokens, 1, _LastLine} -> @@ -233,7 +254,9 @@ decode_message([{flex, Port}], _, Bin) when is_binary(Bin) -> {error, Reason, Line} -> %% OTP-4007 scan_error(Reason, Line, Bin) %% OTP-4007 end; -decode_message([{version3,v3},{flex, Port}], _, Bin) when is_binary(Bin) -> + +%% <DEPRECATED> +decode_message([{version3,prev3c},{flex, Port}], _, Bin) when is_binary(Bin) -> case megaco_flex_scanner:scan(Bin, Port) of {ok, Tokens, 1, _LastLine} -> do_decode_message(?V1_PARSE_MOD, Tokens, Bin); @@ -242,7 +265,7 @@ decode_message([{version3,v3},{flex, Port}], _, Bin) when is_binary(Bin) -> do_decode_message(?V2_PARSE_MOD, Tokens, Bin); {ok, Tokens, 3, _LastLine} -> - do_decode_message(?V3_PARSE_MOD, Tokens, Bin); + do_decode_message(?PREV3C_PARSE_MOD, Tokens, Bin); {ok, _Tokens, V, _LastLine} -> {error, {unsupported_version, V}}; @@ -253,7 +276,7 @@ decode_message([{version3,v3},{flex, Port}], _, Bin) when is_binary(Bin) -> {error, Reason, Line} -> %% OTP-4007 scan_error(Reason, Line, Bin) %% OTP-4007 end; -decode_message([{version3,prev3c},{flex, Port}], _, Bin) when is_binary(Bin) -> +decode_message([{version3,prev3b},{flex, Port}], _, Bin) when is_binary(Bin) -> case megaco_flex_scanner:scan(Bin, Port) of {ok, Tokens, 1, _LastLine} -> do_decode_message(?V1_PARSE_MOD, Tokens, Bin); @@ -262,7 +285,7 @@ decode_message([{version3,prev3c},{flex, Port}], _, Bin) when is_binary(Bin) -> do_decode_message(?V2_PARSE_MOD, Tokens, Bin); {ok, Tokens, 3, _LastLine} -> - do_decode_message(?PREV3C_PARSE_MOD, Tokens, Bin); + do_decode_message(?PREV3B_PARSE_MOD, Tokens, Bin); {ok, _Tokens, V, _LastLine} -> {error, {unsupported_version, V}}; @@ -273,7 +296,7 @@ decode_message([{version3,prev3c},{flex, Port}], _, Bin) when is_binary(Bin) -> {error, Reason, Line} -> %% OTP-4007 scan_error(Reason, Line, Bin) %% OTP-4007 end; -decode_message([{version3,prev3b},{flex, Port}], _, Bin) when is_binary(Bin) -> +decode_message([{version3,prev3a},{flex, Port}], _, Bin) when is_binary(Bin) -> case megaco_flex_scanner:scan(Bin, Port) of {ok, Tokens, 1, _LastLine} -> do_decode_message(?V1_PARSE_MOD, Tokens, Bin); @@ -282,7 +305,7 @@ decode_message([{version3,prev3b},{flex, Port}], _, Bin) when is_binary(Bin) -> do_decode_message(?V2_PARSE_MOD, Tokens, Bin); {ok, Tokens, 3, _LastLine} -> - do_decode_message(?PREV3B_PARSE_MOD, Tokens, Bin); + do_decode_message(?PREV3A_PARSE_MOD, Tokens, Bin); {ok, _Tokens, V, _LastLine} -> {error, {unsupported_version, V}}; @@ -293,7 +316,10 @@ decode_message([{version3,prev3b},{flex, Port}], _, Bin) when is_binary(Bin) -> {error, Reason, Line} -> %% OTP-4007 scan_error(Reason, Line, Bin) %% OTP-4007 end; -decode_message([{version3,prev3a},{flex, Port}], _, Bin) when is_binary(Bin) -> +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +decode_message([{version3,v3},{flex, Port}], _, Bin) when is_binary(Bin) -> case megaco_flex_scanner:scan(Bin, Port) of {ok, Tokens, 1, _LastLine} -> do_decode_message(?V1_PARSE_MOD, Tokens, Bin); @@ -302,7 +328,7 @@ decode_message([{version3,prev3a},{flex, Port}], _, Bin) when is_binary(Bin) -> do_decode_message(?V2_PARSE_MOD, Tokens, Bin); {ok, Tokens, 3, _LastLine} -> - do_decode_message(?PREV3A_PARSE_MOD, Tokens, Bin); + do_decode_message(?V3_PARSE_MOD, Tokens, Bin); {ok, _Tokens, V, _LastLine} -> {error, {unsupported_version, V}}; @@ -310,9 +336,11 @@ decode_message([{version3,prev3a},{flex, Port}], _, Bin) when is_binary(Bin) -> %% {error, Reason, Tokens, Line} -> %% scan_error(Reason, Line, Tokens, Bin); - {error, Reason, Line} -> %% OTP-4007 + {error, Reason, Line} -> %% OTP-4007 scan_error(Reason, Line, Bin) %% OTP-4007 end; +%% </BACKWARD-COMPAT-CLAUSE> + decode_message(EC, _, Bin) when is_binary(Bin) -> {error, {bad_encoding_config, EC}}; decode_message(_EC, _, _BadBin) -> @@ -386,22 +414,36 @@ l2i(L) when is_list(L) -> encode_transaction(Trans) -> encode_transaction([], 1, Trans). +%% <BACKWARD-COMPAT-CLAUSE> encode_transaction([{version3,_}|EC], 1, Trans) -> megaco_pretty_text_encoder_v1:encode_transaction(EC, Trans); +%% </BACKWARD-COMPAT-CLAUSE> + encode_transaction(EC, 1, Trans) -> megaco_pretty_text_encoder_v1:encode_transaction(EC, Trans); + +%% <BACKWARD-COMPAT-CLAUSE> encode_transaction([{version3,_}|EC], 2, Trans) -> megaco_pretty_text_encoder_v2:encode_transaction(EC, Trans); +%% </BACKWARD-COMPAT-CLAUSE> + encode_transaction(EC, 2, Trans) -> megaco_pretty_text_encoder_v2:encode_transaction(EC, Trans); -encode_transaction([{version3,v3}|EC], 3, Trans) -> - megaco_pretty_text_encoder_v3:encode_transaction(EC, Trans); + +%% <DEPRECATED> encode_transaction([{version3,prev3c}|EC], 3, Trans) -> megaco_pretty_text_encoder_prev3c:encode_transaction(EC, Trans); encode_transaction([{version3,prev3b}|EC], 3, Trans) -> megaco_pretty_text_encoder_prev3b:encode_transaction(EC, Trans); encode_transaction([{version3,prev3a}|EC], 3, Trans) -> megaco_pretty_text_encoder_prev3a:encode_transaction(EC, Trans); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +encode_transaction([{version3,v3}|EC], 3, Trans) -> + megaco_pretty_text_encoder_v3:encode_transaction(EC, Trans); +%% </BACKWARD-COMPAT-CLAUSE> + encode_transaction(EC, 3, Trans) -> megaco_pretty_text_encoder_v3:encode_transaction(EC, Trans); encode_transaction(_EC, V, _Trans) -> @@ -412,17 +454,24 @@ encode_transaction(_EC, V, _Trans) -> %% Convert a list of ActionRequest record's into a binary %% Return {ok, DeepIoList} | {error, Reason} %%---------------------------------------------------------------------- + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_requests([{version3,_}|EC], 1, ActReqs) when is_list(ActReqs) -> megaco_pretty_text_encoder_v1:encode_action_requests(EC, ActReqs); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_requests(EC, 1, ActReqs) when is_list(ActReqs) -> megaco_pretty_text_encoder_v1:encode_action_requests(EC, ActReqs); + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_requests([{version3,_}|EC], 2, ActReqs) when is_list(ActReqs) -> megaco_pretty_text_encoder_v2:encode_action_requests(EC, ActReqs); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_requests(EC, 2, ActReqs) when is_list(ActReqs) -> megaco_pretty_text_encoder_v2:encode_action_requests(EC, ActReqs); -encode_action_requests([{version3,v3}|EC], 3, ActReqs) - when is_list(ActReqs) -> - megaco_pretty_text_encoder_v3:encode_action_requests(EC, ActReqs); + +%% <DEPRECATED> encode_action_requests([{version3,prev3c}|EC], 3, ActReqs) when is_list(ActReqs) -> megaco_pretty_text_encoder_prev3c:encode_action_requests(EC, ActReqs); @@ -432,6 +481,14 @@ encode_action_requests([{version3,prev3b}|EC], 3, ActReqs) encode_action_requests([{version3,prev3a}|EC], 3, ActReqs) when is_list(ActReqs) -> megaco_pretty_text_encoder_prev3a:encode_action_requests(EC, ActReqs); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +encode_action_requests([{version3,v3}|EC], 3, ActReqs) + when is_list(ActReqs) -> + megaco_pretty_text_encoder_v3:encode_action_requests(EC, ActReqs); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_requests(EC, 3, ActReqs) when is_list(ActReqs) -> megaco_pretty_text_encoder_v3:encode_action_requests(EC, ActReqs); encode_action_requests(_EC, V, _ActReqs) -> @@ -442,22 +499,37 @@ encode_action_requests(_EC, V, _ActReqs) -> %% Convert a ActionRequest record into a binary %% Return {ok, DeepIoList} | {error, Reason} %%---------------------------------------------------------------------- + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_request([{version3,_}|EC], 1, ActReq) -> megaco_pretty_text_encoder_v1:encode_action_request(EC, ActReq); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_request(EC, 1, ActReq) -> megaco_pretty_text_encoder_v1:encode_action_request(EC, ActReq); + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_request([{version3,_}|EC], 2, ActReq) -> megaco_pretty_text_encoder_v2:encode_action_request(EC, ActReq); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_request(EC, 2, ActReq) -> megaco_pretty_text_encoder_v2:encode_action_request(EC, ActReq); -encode_action_request([{version3,v3}|EC], 3, ActReq) -> - megaco_pretty_text_encoder_v3:encode_action_request(EC, ActReq); + +%% <DEPRECATED> encode_action_request([{version3,prev3c}|EC], 3, ActReq) -> megaco_pretty_text_encoder_prev3c:encode_action_request(EC, ActReq); encode_action_request([{version3,prev3b}|EC], 3, ActReq) -> megaco_pretty_text_encoder_prev3b:encode_action_request(EC, ActReq); encode_action_request([{version3,prev3a}|EC], 3, ActReq) -> megaco_pretty_text_encoder_prev3a:encode_action_request(EC, ActReq); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +encode_action_request([{version3,v3}|EC], 3, ActReq) -> + megaco_pretty_text_encoder_v3:encode_action_request(EC, ActReq); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_request(EC, 3, ActReq) -> megaco_pretty_text_encoder_v3:encode_action_request(EC, ActReq); encode_action_request(_EC, V, _ActReq) -> @@ -471,22 +543,36 @@ encode_action_request(_EC, V, _ActReq) -> encode_command_request(CmdReq) -> encode_command_request([], 1, CmdReq). +%% <BACKWARD-COMPAT-CLAUSE> encode_command_request([{version3,_}|EC], 1, CmdReq) -> megaco_pretty_text_encoder_v1:encode_command_request(EC, CmdReq); +%% </BACKWARD-COMPAT-CLAUSE> + encode_command_request(EC, 1, CmdReq) -> megaco_pretty_text_encoder_v1:encode_command_request(EC, CmdReq); + +%% <BACKWARD-COMPAT-CLAUSE> encode_command_request([{version3,_}|EC], 2, CmdReq) -> megaco_pretty_text_encoder_v2:encode_command_request(EC, CmdReq); +%% </BACKWARD-COMPAT-CLAUSE> + encode_command_request(EC, 2, CmdReq) -> megaco_pretty_text_encoder_v2:encode_command_request(EC, CmdReq); -encode_command_request([{version3,v3}|EC], 3, CmdReq) -> - megaco_pretty_text_encoder_v3:encode_command_request(EC, CmdReq); + +%% <DEPRECATED> encode_command_request([{version3,prev3c}|EC], 3, CmdReq) -> megaco_pretty_text_encoder_prev3c:encode_command_request(EC, CmdReq); encode_command_request([{version3,prev3b}|EC], 3, CmdReq) -> megaco_pretty_text_encoder_prev3b:encode_command_request(EC, CmdReq); encode_command_request([{version3,prev3a}|EC], 3, CmdReq) -> megaco_pretty_text_encoder_prev3a:encode_command_request(EC, CmdReq); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +encode_command_request([{version3,v3}|EC], 3, CmdReq) -> + megaco_pretty_text_encoder_v3:encode_command_request(EC, CmdReq); +%% </BACKWARD-COMPAT-CLAUSE> + encode_command_request(EC, 3, CmdReq) -> megaco_pretty_text_encoder_v3:encode_command_request(EC, CmdReq); encode_command_request(_EC, V, _CmdReq) -> @@ -503,22 +589,36 @@ encode_action_reply(ActRep) -> %% "~n", [?MODULE, ActRep]), encode_action_reply([], 1, ActRep). +%% <BACKWARD-COMPAT-CLAUSE> encode_action_reply([{version3,_}|EC], 1, ActRep) -> megaco_pretty_text_encoder_v1:encode_action_reply(EC, ActRep); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_reply(EC, 1, ActRep) -> megaco_pretty_text_encoder_v1:encode_action_reply(EC, ActRep); + +%% <BACKWARD-COMPAT-CLAUSE> encode_action_reply([{version3,_}|EC], 2, ActRep) -> megaco_pretty_text_encoder_v2:encode_action_reply(EC, ActRep); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_reply(EC, 2, ActRep) -> megaco_pretty_text_encoder_v2:encode_action_reply(EC, ActRep); -encode_action_reply([{version3,v3}|EC], 3, ActRep) -> - megaco_pretty_text_encoder_v3:encode_action_reply(EC, ActRep); + +%% <DEPRECATED> encode_action_reply([{version3,prev3c}|EC], 3, ActRep) -> megaco_pretty_text_encoder_prev3c:encode_action_reply(EC, ActRep); encode_action_reply([{version3,prev3b}|EC], 3, ActRep) -> megaco_pretty_text_encoder_prev3b:encode_action_reply(EC, ActRep); encode_action_reply([{version3,prev3a}|EC], 3, ActRep) -> megaco_pretty_text_encoder_prev3a:encode_action_reply(EC, ActRep); +%% </DEPRECATED> + +%% <BACKWARD-COMPAT-CLAUSE> +encode_action_reply([{version3,v3}|EC], 3, ActRep) -> + megaco_pretty_text_encoder_v3:encode_action_reply(EC, ActRep); +%% </BACKWARD-COMPAT-CLAUSE> + encode_action_reply(EC, 3, ActRep) -> megaco_pretty_text_encoder_v3:encode_action_reply(EC, ActRep); encode_action_reply(_EC, V, _ActRep) -> @@ -572,10 +672,14 @@ token_tag2string(Tag, 3) -> token_tag2string(Tag, v3); token_tag2string(Tag, v3) -> megaco_pretty_text_encoder_v3:token_tag2string(Tag); + +%% <DEPRECATED> token_tag2string(Tag, prev3b) -> megaco_pretty_text_encoder_prev3b:token_tag2string(Tag); token_tag2string(Tag, prev3c) -> megaco_pretty_text_encoder_prev3c:token_tag2string(Tag); +%% </DEPRECATED> + token_tag2string(Tag, _Vsn) -> token_tag2string(Tag, ?TT2S_BEST_VERSION). diff --git a/lib/megaco/src/text/megaco_pretty_text_encoder_prev3a.erl b/lib/megaco/src/text/megaco_pretty_text_encoder_prev3a.erl index 78f916d928..dd9c43c7ea 100644 --- a/lib/megaco/src/text/megaco_pretty_text_encoder_prev3a.erl +++ b/lib/megaco/src/text/megaco_pretty_text_encoder_prev3a.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2016. All Rights Reserved. +%% Copyright Ericsson AB 2004-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -20,7 +20,12 @@ %% %%---------------------------------------------------------------------- -%%% Purpose: Encode PRETTY Megaco/H.248 text messages from internal form +%% Purpose: Encode PRETTY Megaco/H.248 text messages from internal form +%% +%% DEPRECATED +%% DEPRECATED +%% DEPRECATED +%% %%---------------------------------------------------------------------- -module(megaco_pretty_text_encoder_prev3a). diff --git a/lib/megaco/src/text/megaco_pretty_text_encoder_prev3b.erl b/lib/megaco/src/text/megaco_pretty_text_encoder_prev3b.erl index 87e17dfe85..3df83b2160 100644 --- a/lib/megaco/src/text/megaco_pretty_text_encoder_prev3b.erl +++ b/lib/megaco/src/text/megaco_pretty_text_encoder_prev3b.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2016. All Rights Reserved. +%% Copyright Ericsson AB 2005-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -20,7 +20,12 @@ %% %%---------------------------------------------------------------------- -%%% Purpose: Encode PRETTY Megaco/H.248 text messages from internal form +%% Purpose: Encode PRETTY Megaco/H.248 text messages from internal form +%% +%% DEPRECATED +%% DEPRECATED +%% DEPRECATED +%% %%---------------------------------------------------------------------- -module(megaco_pretty_text_encoder_prev3b). diff --git a/lib/megaco/src/text/megaco_pretty_text_encoder_prev3c.erl b/lib/megaco/src/text/megaco_pretty_text_encoder_prev3c.erl index 386567b959..c0228bef14 100644 --- a/lib/megaco/src/text/megaco_pretty_text_encoder_prev3c.erl +++ b/lib/megaco/src/text/megaco_pretty_text_encoder_prev3c.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2016. All Rights Reserved. +%% Copyright Ericsson AB 2005-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -20,7 +20,12 @@ %% %%---------------------------------------------------------------------- -%%% Purpose: Encode PRETTY Megaco/H.248 text messages from internal form +%% Purpose: Encode PRETTY Megaco/H.248 text messages from internal form +%% +%% DEPRECATED +%% DEPRECATED +%% DEPRECATED +%% %%---------------------------------------------------------------------- -module(megaco_pretty_text_encoder_prev3c). diff --git a/lib/megaco/src/text/megaco_text_parser_prev3a.hrl b/lib/megaco/src/text/megaco_text_parser_prev3a.hrl index d7e847993a..138b4cd728 100644 --- a/lib/megaco/src/text/megaco_text_parser_prev3a.hrl +++ b/lib/megaco/src/text/megaco_text_parser_prev3a.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2019. All Rights Reserved. +%% Copyright Ericsson AB 2004-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -21,6 +21,11 @@ %% %%---------------------------------------------------------------------- %% Purpose : Define semantic text parser actions +%% +%% DEPRECATED +%% DEPRECATED +%% DEPRECATED +%% %%---------------------------------------------------------------------- @@ -29,6 +34,7 @@ -define(encoder_version_pre_prev3c,true). -include("megaco_text_tokens.hrl"). + -ifdef(megaco_parser_inline). -compile({inline,[{make_safe_token,1}]}). -endif. diff --git a/lib/megaco/src/text/megaco_text_parser_prev3a.yrl b/lib/megaco/src/text/megaco_text_parser_prev3a.yrl index 0a07fbec2b..9100800c3d 100644 --- a/lib/megaco/src/text/megaco_text_parser_prev3a.yrl +++ b/lib/megaco/src/text/megaco_text_parser_prev3a.yrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2004-2016. All Rights Reserved. +%% Copyright Ericsson AB 2004-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -21,6 +21,11 @@ %% %%---------------------------------------------------------------------- %% Purpose: YECC grammar for text encoding of Megaco/H.248 +%% +%% DEPRECATED +%% DEPRECATED +%% DEPRECATED +%% %%---------------------------------------------------------------------- %%---------------------------------------------------------------------- diff --git a/lib/megaco/src/text/megaco_text_parser_prev3b.hrl b/lib/megaco/src/text/megaco_text_parser_prev3b.hrl index 479f963c70..c38aaa1140 100644 --- a/lib/megaco/src/text/megaco_text_parser_prev3b.hrl +++ b/lib/megaco/src/text/megaco_text_parser_prev3b.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2019. All Rights Reserved. +%% Copyright Ericsson AB 2005-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -21,6 +21,11 @@ %% %%---------------------------------------------------------------------- %% Purpose : Define semantic text parser actions +%% +%% DEPRECATED +%% DEPRECATED +%% DEPRECATED +%% %%---------------------------------------------------------------------- @@ -29,6 +34,7 @@ -define(encoder_version_pre_prev3c,true). -include("megaco_text_tokens.hrl"). + -ifdef(megaco_parser_inline). -compile({inline,[{make_safe_token,1}]}). -endif. diff --git a/lib/megaco/src/text/megaco_text_parser_prev3b.yrl b/lib/megaco/src/text/megaco_text_parser_prev3b.yrl index 133938d7f7..eed984cdc3 100644 --- a/lib/megaco/src/text/megaco_text_parser_prev3b.yrl +++ b/lib/megaco/src/text/megaco_text_parser_prev3b.yrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2016. All Rights Reserved. +%% Copyright Ericsson AB 2005-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -21,6 +21,11 @@ %% %%---------------------------------------------------------------------- %% Purpose: YECC grammar for text encoding of Megaco/H.248 +%% +%% DEPRECATED +%% DEPRECATED +%% DEPRECATED +%% %%---------------------------------------------------------------------- %%---------------------------------------------------------------------- diff --git a/lib/megaco/src/text/megaco_text_parser_prev3c.hrl b/lib/megaco/src/text/megaco_text_parser_prev3c.hrl index 3ed9582308..2a215d739d 100644 --- a/lib/megaco/src/text/megaco_text_parser_prev3c.hrl +++ b/lib/megaco/src/text/megaco_text_parser_prev3c.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2019. All Rights Reserved. +%% Copyright Ericsson AB 2005-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -21,6 +21,11 @@ %% %%---------------------------------------------------------------------- %% Purpose : Define semantic text parser actions +%% +%% DEPRECATED +%% DEPRECATED +%% DEPRECATED +%% %%---------------------------------------------------------------------- @@ -28,6 +33,7 @@ -include_lib("megaco/include/megaco_message_prev3c.hrl"). -include("megaco_text_tokens.hrl"). + -ifdef(megaco_parser_inline). -compile({inline,[{make_safe_token,1}]}). -endif. diff --git a/lib/megaco/src/text/megaco_text_parser_prev3c.yrl b/lib/megaco/src/text/megaco_text_parser_prev3c.yrl index d78f4ff99c..42188923a0 100644 --- a/lib/megaco/src/text/megaco_text_parser_prev3c.yrl +++ b/lib/megaco/src/text/megaco_text_parser_prev3c.yrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2016. All Rights Reserved. +%% Copyright Ericsson AB 2005-2020. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -21,6 +21,11 @@ %% %%---------------------------------------------------------------------- %% Purpose: YECC grammar for text encoding of Megaco/H.248 +%% +%% DEPRECATED +%% DEPRECATED +%% DEPRECATED +%% %%---------------------------------------------------------------------- %%---------------------------------------------------------------------- diff --git a/lib/megaco/src/text/modules.mk b/lib/megaco/src/text/modules.mk index 46bf7d57ba..c0436755cc 100644 --- a/lib/megaco/src/text/modules.mk +++ b/lib/megaco/src/text/modules.mk @@ -2,7 +2,7 @@ # %CopyrightBegin% # -# Copyright Ericsson AB 2001-2016. All Rights Reserved. +# Copyright Ericsson AB 2001-2020. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,49 +18,62 @@ # # %CopyrightEnd% +# <DEPRECATED> +PREV3_MODULES = \ + megaco_compact_text_encoder_prev3a \ + megaco_compact_text_encoder_prev3b \ + megaco_compact_text_encoder_prev3c \ + megaco_pretty_text_encoder_prev3a \ + megaco_pretty_text_encoder_prev3b \ + megaco_pretty_text_encoder_prev3c +# </DEPRECATED> + MODULES = \ megaco_compact_text_encoder \ megaco_compact_text_encoder_v1 \ megaco_compact_text_encoder_v2 \ megaco_compact_text_encoder_v3 \ - megaco_compact_text_encoder_prev3a \ - megaco_compact_text_encoder_prev3b \ - megaco_compact_text_encoder_prev3c \ megaco_pretty_text_encoder \ megaco_pretty_text_encoder_v1 \ megaco_pretty_text_encoder_v2 \ megaco_pretty_text_encoder_v3 \ - megaco_pretty_text_encoder_prev3a \ - megaco_pretty_text_encoder_prev3b \ - megaco_pretty_text_encoder_prev3c \ megaco_text_mini_decoder \ - megaco_text_scanner + megaco_text_scanner \ + $(PREV3_MODULES) +# <DEPRECATED> +PREV3_INTERNAL_HRL_FILES = \ + megaco_text_gen_prev3a.hrl \ + megaco_text_gen_prev3b.hrl \ + megaco_text_gen_prev3c.hrl \ + megaco_text_parser_prev3a.hrl \ + megaco_text_parser_prev3b.hrl \ + megaco_text_parser_prev3c.hrl +# </DEPRECATED> + INTERNAL_HRL_FILES = \ megaco_text_gen_v1.hrl \ megaco_text_gen_v2.hrl \ megaco_text_gen_v3.hrl \ - megaco_text_gen_prev3a.hrl \ - megaco_text_gen_prev3b.hrl \ - megaco_text_gen_prev3c.hrl \ megaco_text_parser_v1.hrl \ megaco_text_parser_v2.hrl \ megaco_text_parser_v3.hrl \ - megaco_text_parser_prev3a.hrl \ - megaco_text_parser_prev3b.hrl \ - megaco_text_parser_prev3c.hrl \ megaco_text_mini_parser.hrl \ - megaco_text_tokens.hrl + megaco_text_tokens.hrl \ + $(PREV3_INTERNAL_HRL_FILES) +# <DEPRECATED> +PREV3_INTERNAL_YRL_FILES = \ + megaco_text_parser_prev3a.yrl \ + megaco_text_parser_prev3b.yrl \ + megaco_text_parser_prev3c.yrl +# </DEPRECATED> + INTERNAL_YRL_FILES = \ megaco_text_parser_v1.yrl \ megaco_text_parser_v2.yrl \ megaco_text_parser_v3.yrl \ - megaco_text_parser_prev3a.yrl \ - megaco_text_parser_prev3b.yrl \ - megaco_text_parser_prev3c.yrl \ - megaco_text_mini_parser.yrl - - + megaco_text_mini_parser.yrl \ + $(PREV3_INTERNAL_YRL_FILES) |