diff options
| author | Diego Nehab <diego.nehab@gmail.com> | 2015-08-25 15:43:48 -0300 |
|---|---|---|
| committer | Diego Nehab <diego.nehab@gmail.com> | 2015-08-25 15:43:48 -0300 |
| commit | 4110e4125dace9df3a744067066e5dee62670561 (patch) | |
| tree | 10927b57ea5c543054d01bd2bd538a4f97128678 /src/socket.lua | |
| parent | 46d7e75f3e71d75bf07ae83d7df4aa276e484473 (diff) | |
| parent | 77bba625d7aaa0f9e118879163687fcbcb0b5a7b (diff) | |
| download | luasocket-4110e4125dace9df3a744067066e5dee62670561.tar.gz luasocket-4110e4125dace9df3a744067066e5dee62670561.tar.bz2 luasocket-4110e4125dace9df3a744067066e5dee62670561.zip | |
Merge branch 'agnostic'
Seems safe to move to master.
Diffstat (limited to 'src/socket.lua')
| -rw-r--r-- | src/socket.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/socket.lua b/src/socket.lua index 3913e6f..d1c0b16 100644 --- a/src/socket.lua +++ b/src/socket.lua | |||
| @@ -32,23 +32,23 @@ function _M.bind(host, port, backlog) | |||
| 32 | err = "no info on address" | 32 | err = "no info on address" |
| 33 | for i, alt in base.ipairs(addrinfo) do | 33 | for i, alt in base.ipairs(addrinfo) do |
| 34 | if alt.family == "inet" then | 34 | if alt.family == "inet" then |
| 35 | sock, err = socket.tcp() | 35 | sock, err = socket.tcp4() |
| 36 | else | 36 | else |
| 37 | sock, err = socket.tcp6() | 37 | sock, err = socket.tcp6() |
| 38 | end | 38 | end |
| 39 | if not sock then return nil, err end | 39 | if not sock then return nil, err end |
| 40 | sock:setoption("reuseaddr", true) | 40 | sock:setoption("reuseaddr", true) |
| 41 | res, err = sock:bind(alt.addr, port) | 41 | res, err = sock:bind(alt.addr, port) |
| 42 | if not res then | 42 | if not res then |
| 43 | sock:close() | 43 | sock:close() |
| 44 | else | 44 | else |
| 45 | res, err = sock:listen(backlog) | 45 | res, err = sock:listen(backlog) |
| 46 | if not res then | 46 | if not res then |
| 47 | sock:close() | 47 | sock:close() |
| 48 | else | 48 | else |
| 49 | return sock | 49 | return sock |
| 50 | end | 50 | end |
| 51 | end | 51 | end |
| 52 | end | 52 | end |
| 53 | return nil, err | 53 | return nil, err |
| 54 | end | 54 | end |
