diff options
| author | Kim Alvefur <zash@zash.se> | 2019-12-24 00:39:45 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-12-24 00:39:45 +0100 |
| commit | 929103b8672e1395eedd663fb172a91ce197ec33 (patch) | |
| tree | 94b4ebcb9443e8e6751e1903ade3c9dc8ec9d678 /net/connect.lua | |
| parent | b22125f0645b3281d99843dcdb7b44e92b9167cd (diff) | |
| parent | cf87960bda697b3727b5b62ab8c983a48b8c5314 (diff) | |
| download | prosody-929103b8672e1395eedd663fb172a91ce197ec33.tar.gz prosody-929103b8672e1395eedd663fb172a91ce197ec33.zip | |
Merge 0.11->trunk
Diffstat (limited to 'net/connect.lua')
| -rw-r--r-- | net/connect.lua | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/connect.lua b/net/connect.lua index b812ffcd..6d399dda 100644 --- a/net/connect.lua +++ b/net/connect.lua @@ -2,6 +2,13 @@ local server = require "net.server"; local log = require "util.logger".init("net.connect"); local new_id = require "util.id".short; +-- TODO Respect use_ipv4, use_ipv6 +-- TODO #1246 Happy Eyeballs +-- FIXME RFC 6724 +-- FIXME Error propagation from resolvers doesn't work +-- FIXME #1428 Reuse DNS resolver object between service and basic resolver +-- FIXME #1429 Close DNS resolver object when done + local pending_connection_methods = {}; local pending_connection_mt = { __name = "pending_connection"; @@ -38,7 +45,7 @@ local function attempt_connection(p) p:log("debug", "Next target to try is %s:%d", ip, port); local conn, err = server.addclient(ip, port, pending_connection_listeners, p.options.pattern or "*a", p.options.sslctx, conn_type, extra); if not conn then - log("debug", "Connection attempt failed immediately: %s", tostring(err)); + log("debug", "Connection attempt failed immediately: %s", err); p.last_error = err or "unknown reason"; return attempt_connection(p); end |