Osmocom Open Build Service

commit_5a497b3d9da4698d38ef00f3049350d8c4403ad0.txt Added

commit_949f7d105b10b01ce2ff8b67285a89d483354c85.txt Deleted

osmo-s1gw_0.3.0.201.949f.dsc Deleted

osmo-s1gw_0.3.0.204.5a49.dsc Added

osmo-s1gw_0.3.0.201.949f.tar.xz/.tarball-version -> osmo-s1gw_0.3.0.204.5a49.tar.xz/.tarball-version Changed

osmo-s1gw_0.3.0.201.949f.tar.xz/build_dep.tar.gz -> osmo-s1gw_0.3.0.204.5a49.tar.xz/build_dep.tar.gz Changed

osmo-s1gw_0.3.0.201.949f.tar.xz/debian/changelog -> osmo-s1gw_0.3.0.204.5a49.tar.xz/debian/changelog Changed

osmo-s1gw_0.3.0.201.949f.tar.xz/src/s1ap_proxy.erl -> osmo-s1gw_0.3.0.204.5a49.tar.xz/src/s1ap_proxy.erl Changed

@@ -66,12 +66,14 @@
 -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()}.
 
 -record(proxy_state, {conn_info :: sctp_server:conn_info(),
-                      erabs :: dict:dict(),
+                      erabs :: dict:dict(K :: erab_uid(),
+                                         V :: pid()),
                       enb_id :: undefined | non_neg_integer(),
                       plmn_id :: undefined | plmn_id(),
                       genb_id_str :: undefined | string(),
@@ -185,30 +187,24 @@
 
 
 -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
-    when UID :: {mme_ue_id(), enb_ue_id()} | {mme_ue_id()},
+-spec erab_for_each(MMEUeId, Fun, ERABs) -> ok
+    when MMEUeId :: mme_ue_id(),
          Fun :: fun((pid()) -> term()),
          ERABs :: {erab_uid(), pid()}.
-erab_for_each({MMEUEId, ENBUEId} = UID, Fun,
-              {{MMEUEId, ENBUEId, _}, Pid} | ERABs) ->
-    Fun(Pid), %% matched by a pair of {MME,eNB}-UE-S1AP-ID
-    erab_for_each(UID, Fun, ERABs);
-
-erab_for_each({MMEUEId} = UID, Fun,
-              {{MMEUEId, _, _}, Pid} | ERABs) ->
-    Fun(Pid), %% matched by an MME-UE-S1AP-ID
-    erab_for_each(UID, Fun, ERABs);
+erab_for_each(MMEUEId, Fun,
+              {{MMEUEId, _}, Pid} | ERABs) ->
+    Fun(Pid), %% it's a match!
+    erab_for_each(MMEUEId, Fun, ERABs);
 
-erab_for_each(UID, Fun,
+erab_for_each(MMEUeId, Fun,
               _ERAB | ERABs) ->
-    erab_for_each(UID, Fun, ERABs);
+    erab_for_each(MMEUeId, Fun, ERABs);
 
-erab_for_each(_UID, _Fun, ) ->
+erab_for_each(_MMEUeId, _Fun, ) ->
     ok.
 
 
@@ -585,13 +581,11 @@
            #proxy_state{erabs = ERABs} = S) ->
     ?LOG_DEBUG("Processing UE CONTEXT RELEASE REQUEST"),
     ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_REQ, S),
-    %% fetch {MME,eNB}-UE-S1AP-ID values (mandatory IEs)
+    %% fetch MME-UE-S1AP-ID value (mandatory IE)
     #'ProtocolIE-Field'{id = ?'id-MME-UE-S1AP-ID',
                         value = MMEUEId} = lists:nth(1, IEs),
-    #'ProtocolIE-Field'{id = ?'id-eNB-UE-S1AP-ID',
-                        value = ENBUEId} = lists:nth(2, IEs),
-    %% poke E-RAB FSMs with the matching {MME,eNB}-UE-S1AP-ID
-    erab_for_each({MMEUEId, ENBUEId},
+    %% poke E-RAB FSMs with the matching MME-UE-S1AP-ID
+    erab_for_each(MMEUEId,
                   fun erab_fsm:erab_release_ind/1,
                   dict:to_list(ERABs)),
     {forward, S}; %% forward as-is, there's nothing to patch
@@ -603,21 +597,17 @@
            #proxy_state{erabs = ERABs} = S) ->
     ?LOG_DEBUG("Processing UE CONTEXT RELEASE COMMAND"),
     ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_CMD, S),
+    %% fetch MME-UE-S1AP-ID value from UE-S1AP-IDs (mandatory IE)
     #'ProtocolIE-Field'{id = ?'id-UE-S1AP-IDs',
                         value = S1APIDs} = lists:nth(1, IEs),
-    case S1APIDs of
-        {'uE-S1AP-ID-pair', #'UE-S1AP-ID-pair'{'mME-UE-S1AP-ID' = MMEUEId,
-                                               'eNB-UE-S1AP-ID' = ENBUEId}} ->
-            %% poke E-RAB FSMs with the matching {MME,eNB}-UE-S1AP-ID
-            erab_for_each({MMEUEId, ENBUEId},
-                          fun erab_fsm:erab_release_cmd/1,
-                          dict:to_list(ERABs));
-        {'mME-UE-S1AP-ID', MMEUEId} ->
-            %% poke E-RAB FSMs with the matching MME-UE-S1AP-ID
-            erab_for_each({MMEUEId},
-                          fun erab_fsm:erab_release_cmd/1,
-                          dict:to_list(ERABs))
+    MMEUEId = case S1APIDs of
+        {'uE-S1AP-ID-pair', #'UE-S1AP-ID-pair'{'mME-UE-S1AP-ID' = Val}} -> Val;
+        {'mME-UE-S1AP-ID', Val} -> Val
     end,
+    %% poke E-RAB FSMs with the matching MME-UE-S1AP-ID
+    erab_for_each(MMEUEId,
+                  fun erab_fsm:erab_release_cmd/1,
+                  dict:to_list(ERABs)),
     {forward, S}; %% forward as-is, there's nothing to patch
 
 %% 9.1.4.7 UE CONTEXT RELEASE COMPLETE
@@ -627,13 +617,11 @@
            #proxy_state{erabs = ERABs} = S) ->
     ?LOG_DEBUG("Processing UE CONTEXT RELEASE COMPLETE"),
     ctr_inc(?S1GW_CTR_S1AP_PROXY_IN_PKT_RELEASE_CTX_COMPL, S),
-    %% fetch {MME,eNB}-UE-S1AP-ID values (mandatory IEs)
+    %% fetch MME-UE-S1AP-ID value (mandatory IE)
     #'ProtocolIE-Field'{id = ?'id-MME-UE-S1AP-ID',
                         value = MMEUEId} = lists:nth(1, IEs),
-    #'ProtocolIE-Field'{id = ?'id-eNB-UE-S1AP-ID',
-                        value = ENBUEId} = lists:nth(2, IEs),
-    %% poke E-RAB FSMs with the matching {MME,eNB}-UE-S1AP-ID
-    erab_for_each({MMEUEId, ENBUEId},
+    %% poke E-RAB FSMs with the matching MME-UE-S1AP-ID
+    erab_for_each(MMEUEId,
                   fun erab_fsm:erab_release_rsp/1,
                   dict:to_list(ERABs)),
     {forward, S}; %% forward as-is, there's nothing to patch
@@ -1079,7 +1067,7 @@
                                                enb_ue_id = EnbUeId}) ->
     %% FIXME: Currently we respond with E-RAB-ID of the first E-RAB in the registry.
     %% Instead, we need to iterate over E-RABs in the REQUEST and reject them all.
-    {_, _, FirstERABid}|_ = dict:fetch_keys(ERABs),
+    {_, FirstERABid}|_ = dict:fetch_keys(ERABs),
     Cause = {transport, 'transport-resource-unavailable'},
     ERABitem = #'E-RABItem'{'e-RAB-ID' = FirstERABid,
                             cause = Cause},
@@ -1104,8 +1092,14 @@
 -spec erab_fsm_start_reg(erab_id(), proxy_state()) -> {pid(), proxy_state()}.
 erab_fsm_start_reg(RABId, #proxy_state{erabs = ERABs} = S) ->
     UID = erab_uid(RABId, S),
-    {ok, Pid} = erab_fsm:start_link(UID),
-    {Pid, S#proxy_state{erabs = dict:store(UID, Pid, ERABs)}}.
+    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),
+            {Pid, S#proxy_state{erabs = dict:store(UID, Pid, ERABs)}}
+    end.
 
 
 -spec erab_fsm_find(erab_id(), proxy_state()) -> {ok, pid()} | error.

osmo-s1gw_0.3.0.201.949f.tar.xz/test/s1ap_proxy_test.erl -> osmo-s1gw_0.3.0.204.5a49.tar.xz/test/s1ap_proxy_test.erl Changed

@@ -52,6 +52,8 @@
       ?TC(fun test_e_rab_setup/1)},
      {"E-RAB SETUP REQUEST (failure)",
       ?TC(fun test_e_rab_setup_req_fail/1)},
+     {"E-RAB SETUP REQUEST (duplicate)",
+      ?TC(fun test_e_rab_setup_dup/1)},
      {"E-RAB RELEASE COMMAND/RESPONSE",
       ?TC(fun test_e_rab_release_cmd/1)},
      {"E-RAB RELEASE INDICATION",
@@ -68,6 +70,8 @@
       ?TC(fun test_e_rab_modify_ind_cnf_release/1)},
      {"INITIAL CONTEXT SETUP REQUEST/RESPONSE",
       ?TC(fun test_initial_context_setup/1)},
+     {"INITIAL CONTEXT SETUP REQUEST/RESPONSE (duplicate)",
+      ?TC(fun test_initial_context_setup_dup/1)},
      {"UE CONTEXT RELEASE REQUEST",
       ?TC(fun test_ue_ctx_release_req/1)},
      {"UE CONTEXT RELEASE COMMAND/COMPLETE",
@@ -124,7 +128,7 @@
      ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_ALL, 2 + 2),
      ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_PROC, 2),
      ?_assertMetricENB(?S1GW_CTR_S1AP_PROXY_OUT_PKT_FWD_UNMODIFIED, 2),
-     ?_assertMatch({ok, _}, s1ap_proxy:fetch_erab(Pid, {7, 9, 6})),
+     ?_assertMatch({ok, _}, s1ap_proxy:fetch_erab(Pid, {7, 6})),
      ?_assertMatch(_, s1ap_proxy:fetch_erab_list(Pid)).
 
 
@@ -147,6 +151,23 @@
      ?_assertEqual(, s1ap_proxy:fetch_erab_list(Pid)).
 
 
+test_e_rab_setup_dup(#{handler := Pid}) ->
+    %% eNB <- MME E-RAB SETUP REQUEST
+    SetupReqIn = e_rab_setup_req_pdu(?ADDR_U2C, ?TEID_U2C),
+    %% eNB -> MME E-RAB SETUP RESPONSE
+    SetupRspIn = e_rab_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A),
+    %% eNB <- S1GW <- MME E-RAB SETUP REQUEST (duplicate)
+    %% eNB -- S1GW -> MME E-RAB SETUP RESPONSE (failure)
+    SetupRspExp = e_rab_setup_rsp_fail_pdu(),
+
+    ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupReqIn)),
+     ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, SetupRspIn)),
+     %% duplicate E-RAB SETUP REQUEST triggers a reply
+     ?_assertEqual({reply, SetupRspExp}, s1ap_proxy:process_pdu(Pid, SetupReqIn)),
+     ?_assertMatch({ok, _}, s1ap_proxy:fetch_erab(Pid, {7, 6})),
+     ?_assertMatch(_, s1ap_proxy:fetch_erab_list(Pid)).
+
+
 test_e_rab_release_cmd(#{handler := Pid}) ->
     %% eNB <- MME E-RAB SETUP REQUEST
     SetupReq = e_rab_setup_req_pdu(?ADDR_U2C, ?TEID_U2C),
@@ -357,6 +378,19 @@
      ?_assertMatch(_, s1ap_proxy:fetch_erab_list(Pid)).
 
 
+test_initial_context_setup_dup(#{handler := Pid}) ->
+    %% eNB <- MME INITIAL CONTEXT SETUP REQUEST
+    InitCtxSetupReqIn = initial_context_setup_req_pdu(?ADDR_U2C, ?TEID_U2C),
+    %% eNB -> MME INITIAL CONTEXT SETUP RESPONSE
+    InitCtxSetupRspIn = initial_context_setup_rsp_pdu(?ADDR_U2A, ?TEID_U2A),
+
+    ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, InitCtxSetupReqIn)),
+     ?_assertMatch({forward, _}, s1ap_proxy:process_pdu(Pid, InitCtxSetupRspIn)),
+     %% duplicate INITIAL CONTEXT SETUP REQUEST results in the PDU being dropped
+     ?_assertEqual({drop, InitCtxSetupReqIn}, s1ap_proxy:process_pdu(Pid, InitCtxSetupReqIn)),
+     ?_assertMatch(_, s1ap_proxy:fetch_erab_list(Pid)).
+
+
 test_ue_ctx_release_req(#{handler := Pid}) ->
     %% eNB <- MME INITIAL CONTEXT SETUP REQUEST
     InitCtxSetupReq = initial_context_setup_req_pdu(?ADDR_U2C, ?TEID_U2C),

Changes of Revision 60