Change in ...osmo_dia2gsup[master]: switch back to use the master branch of osmo_ss7

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/26698 ) Change subject: switch back to use the master branch of osmo_ss7 ...................................................................... switch back to use the master branch of osmo_ss7 Add the missing ipa_ccm_options record to use the new api Change-Id: I89ff055ed84e394d0f25bc6389d1f4d757f7b92b --- M rebar.config M src/gsup_client.erl 2 files changed, 13 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/rebar.config b/rebar.config index 0803ccd..66db6b5 100644 --- a/rebar.config +++ b/rebar.config @@ -3,7 +3,7 @@ {deps, [ {setup, "2.0.2"}, {lager, {git, "https://github.com/erlang-lager/lager", {tag, "3.9.1"}}}, - {osmo_ss7, {git, "git://git.osmocom.org/erlang/osmo_ss7", {branch, "laforge/wip"}}}, + {osmo_ss7, {git, "git://git.osmocom.org/erlang/osmo_ss7", {branch, "master"}}}, {osmo_gsup, {git, "git://git.osmocom.org/erlang/osmo_gsup", {branch, "master"}}} ]}. diff --git a/src/gsup_client.erl b/src/gsup_client.erl index 361864f..6a583e0 100644 --- a/src/gsup_client.erl +++ b/src/gsup_client.erl @@ -36,6 +36,7 @@ -behaviour(gen_server). -include_lib("osmo_gsup/include/gsup_protocol.hrl"). +-include_lib("osmo_ss7/include/ipa.hrl"). -define(IPAC_PROTO_EXT_GSUP, {osmo, 5}). @@ -65,8 +66,19 @@ % register the GSUP codec with the IPA core; ignore result as we mgiht be doing this multiple times ipa_proto:register_codec(?IPAC_PROTO_EXT_GSUP, fun gsup_protocol:encode/1, fun gsup_protocol:decode/1), lager:info("Connecting to GSUP HLR on IP ~s port ~p~n", [Address, Port]), + CcmOptions = #ipa_ccm_options{ + serial_number="HSS-00-00-00-00-00-00", + unit_id="0/0/0", + mac_address="00:00:00:00:00:00", + location="00:00:00:00:00:00", + unit_type="00:00:00:00:00:00", + equipment_version="00:00:00:00:00:00", + sw_version="00:00:00:00:00:00", + unit_name="HSS-00-00-00-00-00-00" + }, case ipa_proto:connect(Address, Port, Options) of {ok, {Socket, IpaPid}} -> + ipa_proto:set_ccm_options(Socket, CcmOptions), lager:info("connected!~n", []), true = ipa_proto:register_stream(Socket, ?IPAC_PROTO_EXT_GSUP, {process_id, self()}), ipa_proto:unblock(Socket), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/26698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: I89ff055ed84e394d0f25bc6389d1f4d757f7b92b Gerrit-Change-Number: 26698 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged