socket.bind also tries all addresses returned by getaddrinfo.

1 files changed, 23 insertions, 13 deletions

diff --git a/src/socket.lua b/src/socket.lua
index 9035443..8c5f231 100644
--- a/src/socket.lua
+++ b/src/socket.lua
@@ -19,8 +19,8 @@ function connect(address, port, laddress, lport)
     if address == "*" then address = "0.0.0.0" end
     local addrinfo, err = socket.dns.getaddrinfo(address);
     if not addrinfo then return nil, err end
-    local err = "no info on address"
     local sock, res
+    err = "no info on address"
     for i, alt in base.ipairs(addrinfo) do 
         if alt.family == "inet" then
             sock, err = socket.tcp()
@@ -49,19 +49,29 @@ function bind(host, port, backlog)
     if host == "*" then host = "0.0.0.0" end
     local addrinfo, err = socket.dns.getaddrinfo(host);
     if not addrinfo then return nil, err end
-    local sock, err;
-    if addrinfo[1].family == "inet" then
-        sock, err = socket.tcp()
-    else
-        sock, err = socket.tcp6()
+    local sock, res
+    err = "no info on address"
+    for i, alt in base.ipairs(addrinfo) do
+        if alt.family == "inet" then
+            sock, err = socket.tcp()
+        else
+            sock, err = socket.tcp6()
+        end
+        if not sock then return nil, err end
+        sock:setoption("reuseaddr", true)
+        res, err = sock:bind(alt.addr, port)
+        if not res then 
+            sock:close()
+        else 
+            res, err = sock:listen(backlog)
+            if not res then 
+                sock:close()
+            else
+                return sock
+            end
+        end 
     end
-    if not sock then return nil, err end
-    sock:setoption("reuseaddr", true)
-    local res, err = sock:bind(host, port)
-    if not res then return nil, err end
-    res, err = sock:listen(backlog)
-    if not res then return nil, err end
-    return sock
+    return nil, err
 end
 
 try = newtry()