Osmocom Open Build Service

commit_50c2fec5e4b0a2875c36da870adb417b24204c2b.txt Added

commit_9cfe95e6388116deeba48d389e3f258291daf626.txt Deleted

osmo-s1gw_0.2.0.142.9cfe.dsc -> osmo-s1gw_0.2.0.143.50c2.dsc Changed

osmo-s1gw_0.2.0.142.9cfe.tar.xz/.tarball-version -> osmo-s1gw_0.2.0.143.50c2.tar.xz/.tarball-version Changed

osmo-s1gw_0.2.0.142.9cfe.tar.xz/build_dep.tar.gz -> osmo-s1gw_0.2.0.143.50c2.tar.xz/build_dep.tar.gz Changed

osmo-s1gw_0.2.0.142.9cfe.tar.xz/debian/changelog -> osmo-s1gw_0.2.0.143.50c2.tar.xz/debian/changelog Changed

osmo-s1gw_0.2.0.142.9cfe.tar.xz/src/sctp_server.erl -> osmo-s1gw_0.2.0.143.50c2.tar.xz/src/sctp_server.erl Changed

@@ -69,7 +69,7 @@
                       }).
 
 -record(client_state, {addr_port :: addr_port(),
-                       pid :: pid()
+                       pid :: pid() | undefined
                       }).
 
 
@@ -153,10 +153,12 @@
             #server_state{sock = Sock, clients = Clients} = S0) ->
     ?LOG_DEBUG("Child process ~p terminated with reason ~p", Pid, Reason),
     case client_find(Pid, S0) of
-        {ok, {Aid, _Client}} ->
+        {ok, {Aid, C0}} ->
             %% gracefully close the eNB connection
             gen_sctp:eof(Sock, #sctp_assoc_change{assoc_id = Aid}),
-            S1 = S0#server_state{clients = dict:erase(Aid, Clients)},
+            %% invalidate pid in the client's state
+            C1 = C0#client_state{pid = undefined},
+            S1 = S0#server_state{clients = dict:store(Aid, C1, Clients)},
             {noreply, S1};
         error ->
             {noreply, S0}
@@ -207,6 +209,9 @@
     ?LOG_DEBUG("eNB connection (id=~p, ~p:~p) -> MME: ~p", Aid, FromAddr, FromPort, Data),
     s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_ENB_ALL_RX),
     case dict:find(Aid, Clients) of
+        {ok, #client_state{pid = undefined}} ->
+            ?LOG_NOTICE("eNB connection (id=~p, ~p:~p) -> MME data ignored (no handler)",
+                        Aid, FromAddr, FromPort);
         {ok, #client_state{pid = Pid}} ->
             Handler:send_data(Pid, Data);
         error ->
@@ -247,6 +252,7 @@
             s1gw_metrics:gauge_dec(?S1GW_GAUGE_S1AP_ENB_NUM_SCTP_CONNECTIONS),
             S#server_state{clients = dict:erase(Aid, Clients)};
         error ->
+            ?LOG_ERROR("eNB connection (id=~p) is not known to us?!?", Aid),
             S
     end.

Changes of Revision 33