fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38780?usp=email ) Change subject: erab_fsm: add all-state event handler ...................................................................... erab_fsm: add all-state event handler This patch prepares for a follow-up commit adding a request (get_info) that must be handled in any state. Change-Id: I2673f18ddee0f1eee27bb0ed71ca9073d6dea3f2 --- M src/erab_fsm.erl 1 file changed, 16 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-s1gw refs/changes/80/38780/1 diff --git a/src/erab_fsm.erl b/src/erab_fsm.erl index ae661a1..9f9ca13 100644 --- a/src/erab_fsm.erl +++ b/src/erab_fsm.erl @@ -181,9 +181,9 @@ S#erab_state{from = From, u2c = U2C}}; +%% Catch-all handler for this state erab_wait_setup_req(Event, EventData, S) -> - ?LOG_ERROR("Unexpected event ~p: ~p", [Event, EventData]), - {keep_state, S}. + handle_event(?FUNCTION_NAME, Event, EventData, S). %% state SESSION_ESTABLISH :: PFCP session establishment @@ -231,9 +231,9 @@ {reply, From, {error, {unexp_pdu, ?FUNCTION_NAME}}}} end; +%% Catch-all handler for this state session_establish(Event, EventData, S) -> - ?LOG_ERROR("Unexpected event ~p: ~p", [Event, EventData]), - {keep_state, S}. + handle_event(?FUNCTION_NAME, Event, EventData, S). %% state WAIT_SETUP_RSP :: wait E-RAB SETUP Rsp from access @@ -255,8 +255,7 @@ %% Catch-all handler for this state erab_wait_setup_rsp(Event, EventData, S) -> - ?LOG_ERROR("Unexpected event ~p: ~p", [Event, EventData]), - {keep_state, S}. + handle_event(?FUNCTION_NAME, Event, EventData, S). %% state SESSION_MODIFY :: PFCP session modification @@ -292,9 +291,9 @@ {reply, From, {error, {unexp_pdu, ?FUNCTION_NAME}}}} end; +%% Catch-all handler for this state session_modify(Event, EventData, S) -> - ?LOG_ERROR("Unexpected event ~p: ~p", [Event, EventData]), - {keep_state, S}. + handle_event(?FUNCTION_NAME, Event, EventData, S). %% state SETUP :: E-RAB is fully setup @@ -320,8 +319,7 @@ %% Catch-all handler for this state erab_setup(Event, EventData, S) -> - ?LOG_ERROR("Unexpected event ~p: ~p", [Event, EventData]), - {keep_state, S}. + handle_event(?FUNCTION_NAME, Event, EventData, S). %% state SESSION_DELETE :: PFCP session deletion @@ -366,9 +364,9 @@ {reply, From, {error, {unexp_pdu, ?FUNCTION_NAME}}}} end; +%% Catch-all handler for this state session_delete(Event, EventData, S) -> - ?LOG_ERROR("Unexpected event ~p: ~p", [Event, EventData]), - {keep_state, S}. + handle_event(?FUNCTION_NAME, Event, EventData, S). %% state WAIT_RELEASE_RSP :: wait E-RAB RELEASE Rsp @@ -387,7 +385,12 @@ %% Catch-all handler for this state erab_wait_release_rsp(Event, EventData, S) -> - ?LOG_ERROR("Unexpected event ~p: ~p", [Event, EventData]), + handle_event(?FUNCTION_NAME, Event, EventData, S). + + +%% Event handler for all states +handle_event(State, Event, EventData, S) -> + ?LOG_ERROR("Unexpected event ~p in state ~p: ~p", [Event, State, EventData]), {keep_state, S}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/38780?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: I2673f18ddee0f1eee27bb0ed71ca9073d6dea3f2 Gerrit-Change-Number: 38780 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>