Catch IPv4-only failure case

A eafnosupport error is returned if IPv4 is not supported at all,
but eaddrnotavail can also be returned if the system is not configured
to allow listening at 0::1.

zomp/etc/version.txt

@@ -1 +1 @@
-0.13.4
+0.13.5

zomp/lib/otpr/zx/0.13.5/ebin/zx.app

@@ -1,6 +1,6 @@
 {application,zx,
              [{description,"An Erlang development tool and Zomp user client"},
-              {vsn,"0.13.4"},
+              {vsn,"0.13.5"},
               {applications,[stdlib,kernel]},
               {modules,[zx,zx_auth,zx_conn,zx_conn_sup,zx_daemon,zx_key,
                         zx_lib,zx_local,zx_net,zx_peer,zx_peer_man,

zomp/lib/otpr/zx/0.13.5/src/zx.erl

@@ -24,7 +24,7 @@
 %%% @end
 
 -module(zx).
--vsn("0.13.4").
+-vsn("0.13.5").
 -behavior(application).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.13.5/src/zx_auth.erl

@@ -9,7 +9,7 @@
 %%% @end
 
 -module(zx_auth).
--vsn("0.13.4").
+-vsn("0.13.5").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.13.5/src/zx_conn.erl

@@ -7,7 +7,7 @@
 %%% @end
 
 -module(zx_conn).
--vsn("0.13.4").
+-vsn("0.13.5").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.13.5/src/zx_conn_sup.erl

@@ -5,7 +5,7 @@
 %%% @end
 
 -module(zx_conn_sup).
--vsn("0.13.4").
+-vsn("0.13.5").
 -behavior(supervisor).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.13.5/src/zx_daemon.erl

@@ -138,7 +138,7 @@
 %%% @end
 
 -module(zx_daemon).
--vsn("0.13.4").
+-vsn("0.13.5").
 -behavior(gen_server).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.13.5/src/zx_key.erl

@@ -8,7 +8,7 @@
 %%% @end
 
 -module(zx_key).
--vsn("0.13.4").
+-vsn("0.13.5").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.13.5/src/zx_lib.erl

@@ -10,7 +10,7 @@
 %%% @end
 
 -module(zx_lib).
--vsn("0.13.4").
+-vsn("0.13.5").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.13.5/src/zx_local.erl

@@ -6,7 +6,7 @@
 %%% @end
 
 -module(zx_local).
--vsn("0.13.4").
+-vsn("0.13.5").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.13.5/src/zx_net.erl

@@ -5,7 +5,7 @@
 %%% @end
 
 -module(zx_net).
--vsn("0.13.4").
+-vsn("0.13.5").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.13.5/src/zx_peer.erl

@@ -8,7 +8,7 @@
 %%% @end
 
 -module(zx_peer).
--vsn("0.13.4").
+-vsn("0.13.5").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.13.5/src/zx_peer_man.erl

@@ -9,7 +9,7 @@
 %%% @end
 
 -module(zx_peer_man).
--vsn("0.13.4").
+-vsn("0.13.5").
 -behavior(gen_server).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
@@ -223,28 +223,11 @@ terminate(_, _) ->
 %% The "doer" procedure called when a "listen" message is received.
 
 do_listen(State = #s{listener = none}) ->
-    Options =
-        [inet6,
-         {ip,        {0,0,0,0,0,0,0,1}},
-         {active,    true},
-         {mode,      binary},
-         {keepalive, true},
-         {reuseaddr, true},
-         {packet,    4}],
     {ok, Listener} = 
-        case gen_tcp:listen(0, Options) of
-            {ok, L} ->
-                {ok, L};
-            {error, eafnosupport} ->
-                AncientOptions =
-                    [inet,
-                     {ip,        {127,0,0,1}},
-                     {active,    true},
-                     {mode,      binary},
-                     {keepalive, true},
-                     {reuseaddr, true},
-                     {packet,    4}],
-                gen_tcp:listen(0, AncientOptions)
+        case gen_tcp:listen(0, ipv6_options()) of
+            {ok, L}                -> {ok, L};
+            {error, eafnosupport}  -> gen_tcp:listen(0, ipv4_options());
+            {error, eaddrnotavail} -> gen_tcp:listen(0, ipv4_options())
         end,
     {ok, Port} = inet:port(Listener),
     {ok, _} = zx_peer:start(Listener),
@@ -253,6 +236,24 @@ do_listen(State) ->
     ok = log(warning, "Already listening."),
     {error, State}.
 
+ipv6_options() ->
+    [inet6,
+     {ip,        {0,0,0,0,0,0,0,1}},
+     {active,    true},
+     {mode,      binary},
+     {keepalive, true},
+     {reuseaddr, true},
+     {packet,    4}].
+
+ipv4_options() ->
+    [inet,
+     {ip,        {127,0,0,1}},
+     {active,    true},
+     {mode,      binary},
+     {keepalive, true},
+     {reuseaddr, true},
+     {packet,    4}].
+
 
 -spec do_enroll(Pid, State) -> NewState
     when Pid      :: pid(),

zomp/lib/otpr/zx/0.13.5/src/zx_peer_sup.erl

@@ -6,7 +6,7 @@
 %%% @end
 
 -module(zx_peer_sup).
--vsn("0.13.4").
+-vsn("0.13.5").
 -behaviour(supervisor).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.13.5/src/zx_peers.erl

@@ -10,7 +10,7 @@
 %%% @end
 
 -module(zx_peers).
--vsn("0.13.4").
+-vsn("0.13.5").
 -behavior(supervisor).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.13.5/src/zx_proxy.erl

@@ -5,7 +5,7 @@
 %%% @end
 
 -module(zx_proxy).
--vsn("0.13.4").
+-vsn("0.13.5").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.13.5/src/zx_sup.erl

@@ -5,7 +5,7 @@
 %%% @end
 
 -module(zx_sup).
--vsn("0.13.4").
+-vsn("0.13.5").
 -behavior(supervisor).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.13.5/src/zx_tty.erl

@@ -6,7 +6,7 @@
 %%% @end
 
 -module(zx_tty).
--vsn("0.13.4").
+-vsn("0.13.5").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.13.5/src/zx_userconf.erl

@@ -5,7 +5,7 @@
 %%% @end
 
 -module(zx_userconf).
--vsn("0.13.4").
+-vsn("0.13.5").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.13.5/src/zx_zsp.erl

@@ -7,7 +7,7 @@
 %%% @end
 
 -module(zx_zsp).
--vsn("0.13.4").
+-vsn("0.13.5").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.13.5/zomp.meta

@@ -1,17 +1,17 @@
-{a_email,"zxq9@zxq9.com"}.
+{name,"zx"}.
+{type,app}.
+{modules,[]}.
+{prefix,"zx_"}.
 {author,"Craig Everett"}.
+{desc,"An Erlang development tool and Zomp user client"}.
+{package_id,{"otpr","zx",{0,13,5}}}.
+{deps,[]}.
+{key_name,none}.
+{a_email,"zxq9@zxq9.com"}.
 {c_email,"zxq9@zxq9.com"}.
 {copyright,"Craig Everett"}.
-{deps,[]}.
-{desc,"An Erlang development tool and Zomp user client"}.
 {file_exts,[]}.
-{key_name,none}.
 {license,"MIT"}.
-{modules,[]}.
-{name,"zx"}.
-{package_id,{"otpr","zx",{0,13,4}}}.
-{prefix,"zx_"}.
 {repo_url,"https://gitlab.com/zxq9/zx"}.
 {tags,["tools","package manager","erlang"]}.
-{type,app}.
 {ws_url,"https://zxq9.com/projects/zomp/"}.