Optionally react to grisp_netman network events to determin if there is connectivity.

Author: ziopio

src/grisp_connect_app.erl

@@ -18,6 +18,12 @@
 
 start(_StartType, _StartArgs) ->
     logger:add_handlers(grisp_connect),
+    case grisp_connect_utils:using_grisp_netman() of
+        true ->
+            grisp_connect_netman:add_handler();
+        false ->
+            ok
+    end,
     grisp_connect_sup:start_link().
 
 stop(_State) ->

src/grisp_connect_client.erl

@@ -19,6 +19,8 @@
 
 % Internal API
 -export([reboot/0]).
+-export([lan_connected/0]).
+-export([lan_disconnected/0]).
 
 % Behaviour gen_statem callback functions
 -export([init/1, terminate/3, code_change/4, callback_mode/0]).
@@ -106,6 +108,11 @@ notify(Method, Type, Params) ->
 reboot() ->
     erlang:send_after(1000, ?MODULE, reboot).
 
+lan_connected() ->
+    gen_statem:cast(?MODULE, ?FUNCTION_NAME).
+
+lan_disconnected() ->
+    gen_statem:cast(?MODULE, ?FUNCTION_NAME).
 
 %--- Behaviour gen_statem Callback Functions -----------------------------------
 
@@ -134,8 +141,7 @@ init([]) ->
 
 terminate(Reason, _State, Data) ->
     conn_close(Data, Reason),
-    persistent_term:erase({?MODULE, self()}),
-    ok.
+    persistent_term:erase({?MODULE, self()}).
 
 code_change(_Vsn, State, Data, _Extra) -> {ok, State, Data}.
 
@@ -160,8 +166,23 @@ idle(cast, connect, Data) ->
 % If the device do not have an IP address, it will wait a fixed amount of time
 % and check again, without incrementing the retry counter.
 waiting_network(enter, _OldState, _Data) ->
-    % First IP check do not have any delay
-    {keep_state_and_data, [{state_timeout, 0, check_ip}]};
+    Actions = case grisp_connect_utils:using_grisp_netman() of
+        true ->
+            case grisp_netman:connection_status() of
+                S when S =:= lan orelse S =:= internet ->
+                    ?MODULE:lan_connected();
+                disconnected ->
+                    ok
+            end,
+            [];
+        _ ->
+            [{state_timeout, 0, check_ip}]
+    end,
+    {keep_state_and_data, Actions};
+waiting_network(cast, lan_connected, Data) ->
+    ?LOG_DEBUG(#{description => <<"Connected to LAN">>,
+                 event => lan_connected}),
+    {next_state, connecting, Data};
 waiting_network(state_timeout, check_ip, Data) ->
     case grisp_connect_utils:check_inet_ipv4() of
         {ok, IP} ->
@@ -225,6 +246,15 @@ connected(cast, {notify, Method, Type, Params}, Data) ->
 % Common event handling appended as last match case to each state_function
 handle_common(cast, connect, State, _Data) when State =/= idle ->
     keep_state_and_data;
+handle_common(cast, lan_connected, State, _Data)
+when State =/= waiting_network ->
+    keep_state_and_data;
+handle_common(cast, lan_disconnected, State, Data)
+when State =/= idle, State =/= waiting_network ->
+    Reason = lan_disconnected,
+    ?LOG_WARNING(#{description => <<"LAN connection lost">>,
+                   event => lan_disconnected}),
+    reconnect(conn_close(Data, Reason), Reason);
 handle_common({call, From}, is_connected, State, _) when State =/= connected ->
     {keep_state_and_data, [{reply, From, false}]};
 handle_common({call, From}, wait_connected, _State,

src/grisp_connect_netman.erl

@@ -0,0 +1,40 @@
+-module(grisp_connect_netman).
+
+-behaviour(gen_event).
+
+-export([add_handler/0, remove_handler/0]).
+-export([init/1, handle_event/2, handle_call/2]).
+
+-include_lib("kernel/include/logger.hrl").
+
+add_handler() ->
+    gen_event:add_handler(grisp_netman_event, ?MODULE, []).
+
+remove_handler() ->
+    gen_event:delete_handler(grisp_netman_event, ?MODULE, []).
+
+% Behaviour gen_event callbacks ------------------------------------------------
+
+init([]) ->
+    {ok, #{}}.
+
+handle_event({connection_status, _IfName, Status}, State) ->
+    case Status of
+        S when S =:= lan orelse S =:= internet ->
+            grisp_connect_client:lan_connected();
+        disconnected ->
+            % If one interface went down,
+            % check if the global connectivity is still maintained
+            % by any other interface
+            case grisp_netman:connection_status() of
+                S when S =:= lan orelse S =:= internet ->
+                    ok;
+                disconnected ->
+                    grisp_connect_client:lan_disconnected()
+            end
+    end,
+    {ok, State}.
+
+handle_call(Request, State) ->
+    ?LOG_WARNING("Unexpected grisp_netman_event call: ~p", [Request]),
+    {reply, unexpected_call, State}.

src/grisp_connect_utils.erl

@@ -4,12 +4,17 @@
 %--- Exports -------------------------------------------------------------------
 
 % API functions
+-export([using_grisp_netman/0]).
 -export([retry_delay/1]).
 -export([check_inet_ipv4/0]).
 
 
 %--- API Functions -------------------------------------------------------------
 
+using_grisp_netman() ->
+    RunningApps = application:which_applications(),
+    lists:keymember(grisp_netman, 1, RunningApps).
+
 check_inet_ipv4() ->
     case get_ip_of_valid_interfaces() of
         {ok, {IP1, _, _, _} = IP} when IP1 =/= 127 -> {ok, IP};

test/grisp_connect_reconnect_SUITE.erl

@@ -87,7 +87,7 @@ reconnect_on_closed_frame_test(_) ->
 %--- Internal Functions --------------------------------------------------------
 
 connection_gun_pid() ->
-    {_, {data, _, _, _, _, ConnPid, _, _, _, _}} = sys:get_state(grisp_connect_client),
+    {_, {data, _, _, _, _, ConnPid, _, _, _, _, _}} = sys:get_state(grisp_connect_client),
     % Depends on the internal state of jarl_connection
     {_, {data, _, _, _, _, _, _, _, _, _, _, _, _, GunPid, _, _, _}} = sys:get_state(ConnPid),
     GunPid.