fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41476?usp=email )
Change subject: sctp_proxy: move catch-all for SCTP events to handle_event/4
......................................................................
sctp_proxy: move catch-all for SCTP events to handle_event/4
Reduce code duplication and prepare for handing of sctp_error.
Change-Id: I8f42a31fdf4a4e01106ace81d87188a340fe7c83
Related: SYS#7738
---
M src/sctp_proxy.erl
1 file changed, 6 insertions(+), 14 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw
refs/changes/76/41476/1
diff --git a/src/sctp_proxy.erl b/src/sctp_proxy.erl
index 4ed3cb8..594b286 100644
--- a/src/sctp_proxy.erl
+++ b/src/sctp_proxy.erl
@@ -149,13 +149,6 @@
{stop, {shutdown, conn_est_fail}}
end;
-%% Catch-all for other kinds of SCTP events
-connecting(info, {sctp, _Socket, MmeAddr, MmePort,
- {AncData, Data}}, S) ->
- ?LOG_DEBUG("Unhandled SCTP event (~p:~p): ~p, ~p",
- [MmeAddr, MmePort, AncData, Data]),
- {keep_state, S};
-
connecting(Event, EventData, S) ->
handle_event(?FUNCTION_NAME, Event, EventData, S).
@@ -213,13 +206,6 @@
end,
{keep_state, S};
-%% Catch-all for other kinds of SCTP events
-connected(info, {sctp, _Socket, MmeAddr, MmePort,
- {AncData, Data}}, S) ->
- ?LOG_DEBUG("Unhandled SCTP event (~p:~p): ~p, ~p",
- [MmeAddr, MmePort, AncData, Data]),
- {keep_state, S};
-
connected(Event, EventData, S) ->
handle_event(?FUNCTION_NAME, Event, EventData, S).
@@ -233,6 +219,12 @@
?LOG_ERROR("Unexpected call in state ~p: ~p", [State, EventData]),
{keep_state_and_data, {reply, From, {error, {unexpected_call, State}}}};
+%% Catch-all for unhandled SCTP events
+handle_event(State, info, {sctp, _Socket, MmeAddr, MmePort, {AncData, Data}},
_S) ->
+ ?LOG_DEBUG("Unhandled SCTP event in state ~p (~p:~p): ~p, ~p",
+ [State, MmeAddr, MmePort, AncData, Data]),
+ keep_state_and_data;
+
handle_event(State, Event, EventData, _S) ->
?LOG_ERROR("Unexpected event ~p in state ~p: ~p", [Event, State,
EventData]),
keep_state_and_data.
--
To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41476?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: erlang/osmo-s1gw
Gerrit-Branch: master
Gerrit-Change-Id: I8f42a31fdf4a4e01106ace81d87188a340fe7c83
Gerrit-Change-Number: 41476
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <[email protected]>
