From 541053e0219e2512dffb95175a6e3358c7fd8ff2 Mon Sep 17 00:00:00 2001 From: Andreas Schultz Date: Wed, 2 Jun 2021 18:19:57 +0200 Subject: [PATCH] bump gtp and pfcp lib to normalize FQDNs on ingres --- apps/ergw_core/test/pgw_SUITE.erl | 4 ++-- apps/ergw_core/test/saegw_s11_SUITE.erl | 4 ++-- rebar.config | 4 ++-- rebar.lock | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/ergw_core/test/pgw_SUITE.erl b/apps/ergw_core/test/pgw_SUITE.erl index 7c56ad3a..633f2f93 100644 --- a/apps/ergw_core/test/pgw_SUITE.erl +++ b/apps/ergw_core/test/pgw_SUITE.erl @@ -2598,7 +2598,7 @@ session_options(Config) -> 'Multi-Session-Id' => '_', 'Diameter-Session-Id' => '_', 'Called-Station-Id' => - unicode:characters_to_binary(lists:join($., ?'APN-ExAmPlE')), + string:lowercase(iolist_to_binary(lists:join($., ?'APN-ExAmPlE'))), 'Calling-Station-Id' => ?MSISDN, 'Service-Type' => 'Framed-User', 'Framed-Protocol' => 'GPRS-PDP-Context', @@ -3616,7 +3616,7 @@ simple_ocs(Config) -> %% 'Acct-Interim-Interval' => '?????', %% 'Bearer-Operation' => '?????', 'Called-Station-Id' => - unicode:characters_to_binary(lists:join($., ?'APN-ExAmPlE')), + string:lowercase(iolist_to_binary(lists:join($., ?'APN-ExAmPlE'))), 'Calling-Station-Id' => ?MSISDN, 'Charging-Rule-Base-Name' => <<"m2m0001">>, 'Diameter-Session-Id' => '_', diff --git a/apps/ergw_core/test/saegw_s11_SUITE.erl b/apps/ergw_core/test/saegw_s11_SUITE.erl index 4d54f53f..3b29c31a 100644 --- a/apps/ergw_core/test/saegw_s11_SUITE.erl +++ b/apps/ergw_core/test/saegw_s11_SUITE.erl @@ -1190,7 +1190,7 @@ session_options(Config) -> 'Multi-Session-Id' => '_', 'Diameter-Session-Id' => '_', 'Called-Station-Id' => - unicode:characters_to_binary(lists:join($., ?'APN-ExAmPlE')), + string:lowercase(iolist_to_binary(lists:join($., ?'APN-ExAmPlE'))), 'Calling-Station-Id' => ?MSISDN, 'Service-Type' => 'Framed-User', 'Framed-Protocol' => 'GPRS-PDP-Context', @@ -1648,7 +1648,7 @@ simple_ocs(Config) -> %% 'Acct-Interim-Interval' => '?????', %% 'Bearer-Operation' => '?????', 'Called-Station-Id' => - unicode:characters_to_binary(lists:join($., ?'APN-ExAmPlE')), + string:lowercase(iolist_to_binary(lists:join($., ?'APN-ExAmPlE'))), 'Calling-Station-Id' => ?MSISDN, 'Charging-Rule-Base-Name' => <<"m2m0001">>, 'Diameter-Session-Id' => '_', diff --git a/rebar.config b/rebar.config index d5a42c39..46d27be2 100644 --- a/rebar.config +++ b/rebar.config @@ -19,8 +19,8 @@ {xxhash, {git, "https://github.com/pierreis/erlang-xxhash.git", {branch, "master"}}}, {erlando, {git, "https://github.com/travelping/erlando.git", {tag, "1.0.3"}}}, {netdata, {git, "https://github.com/RoadRunnr/erl_netdata.git", {ref, "cbd6eaf"}}}, - {gtplib, "2.0.1"}, - {pfcplib, "2.0.1"}, + {gtplib, "2.1.0"}, + {pfcplib, "2.1.0"}, {ergw_aaa, {git, "https://github.com/travelping/ergw_aaa.git", {branch, "master"}}} ]}. diff --git a/rebar.lock b/rebar.lock index d8289ce2..102b4daf 100644 --- a/rebar.lock +++ b/rebar.lock @@ -15,7 +15,7 @@ 0}, {<<"fast_yaml">>,{pkg,<<"fast_yaml">>,<<"1.0.31">>},0}, {<<"gen_batch_server">>,{pkg,<<"gen_batch_server">>,<<"0.8.4">>},1}, - {<<"gtplib">>,{pkg,<<"gtplib">>,<<"2.0.1">>},0}, + {<<"gtplib">>,{pkg,<<"gtplib">>,<<"2.1.0">>},0}, {<<"gun">>, {git,"https://github.com/ninenines/gun.git", {ref,"3a3e56fb66edaaa1a7093744a0fd8303b993b3c8"}}, @@ -32,7 +32,7 @@ {git,"https://github.com/uwiger/parse_trans.git", {ref,"56f5c6cad48eaca8e0b2626e0df3587e6bf2da6e"}}, 0}, - {<<"pfcplib">>,{pkg,<<"pfcplib">>,<<"2.0.1">>},0}, + {<<"pfcplib">>,{pkg,<<"pfcplib">>,<<"2.1.0">>},0}, {<<"plists">>, {git,"https://github.com/silviucpp/plists", {ref,"be6c911bb9a007f083ba49cd296dc0da7a02e4ca"}}, @@ -74,12 +74,12 @@ {<<"eradius">>, <<"5F8A3857BE20E1759D96B46E7537F6031DC879FD609471546341E892DD115E54">>}, {<<"fast_yaml">>, <<"A66D0E678341DC20680AECE8E6FD566205A229981B5B3CFA698C66323B728DA2">>}, {<<"gen_batch_server">>, <<"20535E9DBD4DC234E63B3DF79BA65D8A770396B2CAD6B4068A1E37E3AE010900">>}, - {<<"gtplib">>, <<"2DFBE0EFEBE2DA11BF654036B0DBED6C56B4188F6E299494D10DE770395D20D3">>}, + {<<"gtplib">>, <<"FEC92685B40D337A21D6DB152B38E5F443862283D4A431EEE2F81EAE19AAF708">>}, {<<"jesse">>, <<"593B8CAD26AF3CC0E44C727BD8CBDE56E2B0DE4C8D2738B1C258B6936A40A6A3">>}, {<<"jobs">>, <<"B2F0071531C4A48575A096FEC428DCDD4555C64E5086FE521FCEAF581B1F51DC">>}, {<<"jsx">>, <<"20A170ABD4335FC6DB24D5FAD1E5D677C55DADF83D1B20A8A33B5FE159892A39">>}, {<<"p1_utils">>, <<"10A70FAA665D1F8F6995FA100D068B4D910EE2A0111FA3567E9D6232CBB86F21">>}, - {<<"pfcplib">>, <<"C843342532EADF80A4D5B887DB9C295FAF178E2CF0947B108AC25259C25E276B">>}, + {<<"pfcplib">>, <<"38D674436C050776883F928F1F50BE847F56FC3CB0A04733C4C4E849591028D8">>}, {<<"poolboy">>, <<"392B007A1693A64540CEAD79830443ABF5762F5D30CF50BC95CB2C1AAAFA006B">>}, {<<"ppplib">>, <<"F9EC2690532BAF590277A305A2276FCFAD0285557E1055552F8A2FCAF1BF081A">>}, {<<"prometheus_cowboy">>, <<"CFCE0BC7B668C5096639084FCD873826E6220EA714BF60A716F5BD080EF2A99C">>}, @@ -102,12 +102,12 @@ {<<"eradius">>, <<"EF3F8F2D33B63D56ACB5B60E1DFFDA53744239AAEAE489459C6172C9CA4166F0">>}, {<<"fast_yaml">>, <<"8AA129E3384C5AA9F5F1597A1E3321A63A44860F3951F23EEED950BF0EE59643">>}, {<<"gen_batch_server">>, <<"FF6B0ED0F7BE945F38B94DDD4784D128F35FF029C34DAD6CA0C6CB17AB7BC9C4">>}, - {<<"gtplib">>, <<"0EAFE8324BC005B78ACF6A2025B9AED30135584E5BE3B404016DF2E2E54C8FE4">>}, + {<<"gtplib">>, <<"CB5A1FF50F8EDBF8D43A06D9F204889C324A4E688F11EEE04FBE4D822F017D60">>}, {<<"jesse">>, <<"3F9475B0C5B242E09592604AABB03328501D7E3D8A528173B5A75396EEDB0060">>}, {<<"jobs">>, <<"4E50CC8EDD7B5A0AE6F4C17B25514470A772626A5F6C24E9BC06A62AEF618237">>}, {<<"jsx">>, <<"37BECA0435F5CA8A2F45F76A46211E76418FBEF80C36F0361C249FC75059DC6D">>}, {<<"p1_utils">>, <<"0E49FF5586515E3C44901D6FB06B1473BDA492D749F0B1705CBF9D96D4CD5A38">>}, - {<<"pfcplib">>, <<"FD62ABC8B89FF51D65349FB820C8BE505477640A6B8F1FDF91E1C2751466C1C2">>}, + {<<"pfcplib">>, <<"AAA024DB709870EB4EBE6824FA7259151F5926FBC5867CDE4C87ACF19BA541B4">>}, {<<"poolboy">>, <<"DAD79704CE5440F3D5A3681C8590B9DC25D1A561E8F5A9C995281012860901E3">>}, {<<"ppplib">>, <<"32440D630F55DD29F849847DD8F15F69175FDDC210AA88517AC8AD2854CD6FA1">>}, {<<"prometheus_cowboy">>, <<"BA286BECA9302618418892D37BCD5DC669A6CC001F4EB6D6AF85FF81F3F4F34C">>},