Network.erl use handle_continue

Cleaner, DRY code - and avoid any potential races.

Signed-off-by: Peter M <petermm@gmail.com>

Author: petermm

libs/eavmlib/src/network.erl

@@ -32,6 +32,7 @@
     init/1,
     handle_call/3,
     handle_cast/2,
+    handle_continue/2,
     handle_info/2,
     terminate/2
 ]).
@@ -270,31 +271,11 @@ wait_for_ap(ApConfig, Timeout) ->
 %%-----------------------------------------------------------------------------
 -spec start(Config :: network_config()) -> {ok, pid()} | {error, Reason :: term()}.
 start(Config) ->
-    case gen_server:start({local, ?MODULE}, ?MODULE, Config, []) of
-        {ok, Pid} = R ->
-            case gen_server:call(Pid, start) of
-                ok ->
-                    R;
-                Error ->
-                    Error
-            end;
-        Error ->
-            Error
-    end.
+    gen_server:start({local, ?MODULE}, ?MODULE, Config, []).
 
 -spec start_link(Config :: network_config()) -> {ok, pid()} | {error, Reason :: term()}.
 start_link(Config) ->
-    case gen_server:start_link({local, ?MODULE}, ?MODULE, Config, []) of
-        {ok, Pid} = R ->
-            case gen_server:call(Pid, start) of
-                ok ->
-                    R;
-                Error ->
-                    Error
-            end;
-        Error ->
-            Error
-    end.
+    gen_server:start_link({local, ?MODULE}, ?MODULE, Config, []).
 
 %%-----------------------------------------------------------------------------
 %% @returns ok, if the network interface was stopped, or {error, Reason} if
@@ -329,28 +310,23 @@ sta_rssi() ->
 
 %% @hidden
 init(Config) ->
-    {ok, #state{config = Config}}.
-
-%% @hidden
-handle_call(start, From, #state{config = Config} = State) ->
     Port = get_port(),
     Ref = make_ref(),
-    Port ! {self(), Ref, {start, Config}},
-    wait_start_reply(Ref, From, Port, State);
-handle_call(_Msg, _From, State) ->
-    {reply, {error, unknown_message}, State}.
+    {ok, #state{config = Config, port = Port, ref = Ref}, {continue, start_port}}.
 
-%% @private
-wait_start_reply(Ref, From, Port, State) ->
+handle_continue(start_port, #state{config = Config, port = Port, ref = Ref} = State) ->
+    Port ! {self(), Ref, {start, Config}},
     receive
         {Ref, ok} ->
-            gen_server:reply(From, ok),
-            {noreply, State#state{port = Port, ref = Ref}};
-        {Ref, {error, Reason} = ER} ->
-            gen_server:reply(From, {error, Reason}),
-            {stop, {start_failed, Reason}, ER, State}
+            {noreply, State};
+        {Ref, {error, Reason}} ->
+            {stop, {start_port_failed, Reason}, State}
     end.
 
+%% @hidden
+handle_call(_Msg, _From, State) ->
+    {reply, {error, unknown_message}, State}.
+
 %% @hidden
 handle_cast(_Msg, State) ->
     {noreply, State}.