fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/40994?usp=email )
Change subject: s1ap_proxy: remove eNB-ID from erab_uid() ......................................................................
s1ap_proxy: remove eNB-ID from erab_uid()
XXX: commit description XXX: fix unit tests
Change-Id: I7277d19080795600252306dbfa0c733f996e026e --- M src/s1ap_proxy.erl 1 file changed, 8 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/94/40994/1
diff --git a/src/s1ap_proxy.erl b/src/s1ap_proxy.erl index 0195e39..6c14807 100644 --- a/src/s1ap_proxy.erl +++ b/src/s1ap_proxy.erl @@ -66,7 +66,8 @@ -type mme_ue_id() :: 0..16#ffffffff. -type enb_ue_id() :: 0..16#ffffff. -type erab_id() :: 0..16#ff. --type erab_uid() :: {mme_ue_id(), enb_ue_id(), erab_id()}. +-type erab_uid() :: {mme_ue_id(), erab_id()}. + -type plmn_id() :: {MCC :: nonempty_string(), MNC :: nonempty_string()}.
@@ -185,9 +186,8 @@
-spec erab_uid(erab_id(), proxy_state()) -> erab_uid(). -erab_uid(ERABId, #proxy_state{mme_ue_id = MmeUeId, - enb_ue_id = EnbUeId}) -> - {MmeUeId, EnbUeId, ERABId}. +erab_uid(ERABId, #proxy_state{mme_ue_id = MmeUeId}) -> + {MmeUeId, ERABId}.
-spec erab_for_each(UID, Fun, ERABs) -> ok @@ -1102,14 +1102,16 @@
-spec erab_fsm_start_reg(erab_id(), proxy_state()) -> {pid(), proxy_state()}. -erab_fsm_start_reg(RABId, #proxy_state{erabs = ERABs} = S) -> +erab_fsm_start_reg(RABId, #proxy_state{erabs = ERABs, + mme_ue_id = MmeUeId, + enb_ue_id = ENBUEId} = S) -> UID = erab_uid(RABId, S), case dict:find(UID, ERABs) of {ok, Pid} -> ?LOG_ERROR("E-RAB ~p is already registered?!?", [UID]), {Pid, S}; %% return Pid of the existing erab_fsm process error -> - {ok, Pid} = erab_fsm:start_link(UID), + {ok, Pid} = erab_fsm:start_link({MmeUeId, ENBUEId, RABId}), {Pid, S#proxy_state{erabs = dict:store(UID, Pid, ERABs)}} end.
-
fixeria