fixeria has uploaded this change for review.

View Change

sctp_server: cosmetic: rename State -> S

Using a shorter name makes the code more compact and beings it
in consistency with other modules.

Change-Id: I8dde744ac8b8798cdeed5d4eac47d4f650fe03f9
---
M src/sctp_server.erl
1 file changed, 35 insertions(+), 34 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/87/38787/1

diff --git a/src/sctp_server.erl b/src/sctp_server.erl
index 7722436..3c7917e 100644
--- a/src/sctp_server.erl
+++ b/src/sctp_server.erl
@@ -104,51 +104,52 @@
                        priv = Priv}}.
 
 
-handle_call(Info, From, State) ->
+handle_call(Info, From, S) ->
     ?LOG_ERROR("unknown ~p() from ~p: ~p", [?FUNCTION_NAME, From, Info]),
-    {reply, {error, not_implemented}, State}.
+    {reply, {error, not_implemented}, S}.
 
 
-handle_cast({send_data, Aid, Data}, State) ->
-    gen_sctp:send(State#server_state.sock,
+handle_cast({send_data, Aid, Data}, S) ->
+    gen_sctp:send(S#server_state.sock,
                   #sctp_sndrcvinfo{stream = ?S1AP_SCTP_STREAM,
                                    ppid = ?S1AP_SCTP_PPID,
                                    assoc_id = Aid}, Data),
-    {noreply, State};
+    {noreply, S};
 
-handle_cast(Info, State) ->
+handle_cast(Info, S) ->
     ?LOG_ERROR("unknown ~p(): ~p", [?FUNCTION_NAME, Info]),
-    {noreply, State}.
+    {noreply, S}.
 
 
 %% Handle SCTP events coming from gen_sctp module
-handle_info({sctp, _Socket, FromAddr, FromPort, {AncData, Data}}, State) ->
-    NewState = sctp_recv(State, {FromAddr, FromPort, AncData, Data}),
-    {noreply, NewState};
+handle_info({sctp, _Socket, FromAddr, FromPort, {AncData, Data}}, S0) ->
+    S1 = sctp_recv(S0, {FromAddr, FromPort, AncData, Data}),
+    {noreply, S1};
 
 %% Handle termination events of the child processes
 handle_info({'EXIT', Pid, Reason},
-            #server_state{sock = Sock, clients = Clients} = State) ->
+            #server_state{sock = Sock, clients = Clients} = S0) ->
     ?LOG_DEBUG("Child process ~p terminated with reason ~p", [Pid, Reason]),
-    case client_find(State, Pid) of
+    case client_find(S0, Pid) of
         {ok, {Aid, _Client}} ->
             %% gracefully close the eNB connection
             gen_sctp:eof(Sock, #sctp_assoc_change{assoc_id = Aid}),
-            {noreply, State#server_state{clients = dict:erase(Aid, Clients)}};
+            S1 = S0#server_state{clients = dict:erase(Aid, Clients)},
+            {noreply, S1};
         error ->
-            {noreply, State}
+            {noreply, S0}
     end;
 
 %% Catch-all for unknown messages
-handle_info(Info, State) ->
+handle_info(Info, S) ->
     ?LOG_ERROR("unknown ~p(): ~p", [?FUNCTION_NAME, Info]),
-    {noreply, State}.
+    {noreply, S}.
 
 
-terminate(Reason, State) ->
+terminate(Reason, S) ->
     ?LOG_NOTICE("Terminating, reason ~p", [Reason]),
-    close_conns(State),
-    gen_sctp:close(State#server_state.sock),
+    close_conns(S),
+    gen_sctp:close(S#server_state.sock),
     ok.
 
 %% ------------------------------------------------------------------
@@ -156,33 +157,33 @@
 %% ------------------------------------------------------------------
 
 %% Handle an #sctp_assoc_change event (connection state)
-sctp_recv(State, {FromAddr, FromPort, [],
-                  #sctp_assoc_change{state = ConnState,
-                                     assoc_id = Aid}}) ->
+sctp_recv(S, {FromAddr, FromPort, [],
+              #sctp_assoc_change{state = ConnState,
+                                 assoc_id = Aid}}) ->
     case ConnState of
         comm_up ->
             ?LOG_NOTICE("eNB connection (id=~p, ~p:~p) established", [Aid, FromAddr, FromPort]),
-            Clients = client_add(State#server_state.clients, Aid, FromAddr, FromPort,
-                                 State#server_state.priv);
+            Clients = client_add(S#server_state.clients, Aid, FromAddr, FromPort,
+                                 S#server_state.priv);
         shutdown_comp ->
             ?LOG_NOTICE("eNB connection (id=~p, ~p:~p) closed", [Aid, FromAddr, FromPort]),
-            Clients = client_del(State#server_state.clients, Aid);
+            Clients = client_del(S#server_state.clients, Aid);
         comm_lost ->
             ?LOG_NOTICE("eNB connection (id=~p, ~p:~p) lost", [Aid, FromAddr, FromPort]),
-            Clients = client_del(State#server_state.clients, Aid);
+            Clients = client_del(S#server_state.clients, Aid);
         _ ->
             ?LOG_NOTICE("eNB connection (id=~p, ~p:~p) state ~p",
                         [Aid, FromAddr, FromPort, ConnState]),
-            Clients = State#server_state.clients
+            Clients = S#server_state.clients
     end,
-    State#server_state{clients = Clients};
+    S#server_state{clients = Clients};
 
 %% Handle an #sctp_sndrcvinfo event (incoming data)
-sctp_recv(State, {FromAddr, FromPort,
-                  [#sctp_sndrcvinfo{assoc_id = Aid}], Data}) ->
+sctp_recv(S, {FromAddr, FromPort,
+              [#sctp_sndrcvinfo{assoc_id = Aid}], Data}) ->
     ?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, State#server_state.clients) of
+    case dict:find(Aid, S#server_state.clients) of
         {ok, #client_state{pid = Pid}} ->
             sctp_proxy:send_data(Pid, Data);
         error ->
@@ -190,13 +191,13 @@
                        [Aid, FromAddr, FromPort]),
             s1gw_metrics:ctr_inc(?S1GW_CTR_S1AP_ENB_ALL_RX_UNKNOWN_ENB)
     end,
-    State;
+    S;
 
 %% Catch-all for other kinds of SCTP events
-sctp_recv(State, {FromAddr, FromPort, AncData, Data}) ->
+sctp_recv(S, {FromAddr, FromPort, AncData, Data}) ->
     ?LOG_DEBUG("Unhandled SCTP event (~p:~p): ~p, ~p",
                [FromAddr, FromPort, AncData, Data]),
-    State.
+    S.
 
 
 %% Add a new client to the list, spawning a proxy process

To view, visit change 38787. To unsubscribe, or for help writing mail filters, visit settings.