Mercurial > lxmppd-hg-xmllex / changeset
changeset
Merge with 0.5
Sat, 19 Sep 2009 17:48:15 +0100
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Sat, 19 Sep 2009 17:48:15 +0100
- changeset 1794
- 218f720af304
- parent 1792
- 407f282f559e (current diff)
- parent 1793
- 1fc6c2822e6b (diff)
- child 1795
- 0e933d6f2c31
Merge with 0.5
| core/s2smanager.lua | file | annotate | diff | comparison | revisions |
--- a/core/s2smanager.lua Sat Sep 19 17:42:16 2009 +0100 +++ b/core/s2smanager.lua Sat Sep 19 17:48:15 2009 +0100 @@ -37,7 +37,7 @@ local dialback_secret = uuid_gen(); -local adns = require "net.adns"; +local adns, dns = require "net.adns", require "net.dns"; local dns_timeout = config.get("*", "core", "dns_timeout") or 60; @@ -241,6 +241,16 @@ handle = adns.lookup(function (reply) handle = nil; host_session.connecting = nil; + + -- COMPAT: This is a compromise for all you CNAME-(ab)users :) + if not (reply and reply[1] and reply[1].a) then + reply = dns.peek(connect_host, "CNAME", "IN"); + while reply and reply[1] and not reply[1].a and reply[1].cname do + reply = dns.peek(reply[1].cname, "A", "IN") or dns.peek(reply[1].cname, "CNAME", "IN"); + end + end + -- end of CNAME resolving + if reply and reply[1] and reply[1].a then log("debug", "DNS reply for %s gives us %s", connect_host, reply[1].a); return make_connect(host_session, reply[1].a, connect_port);
