summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-08-18 01:07:21 -0700
committerLance Stout <lancestout@gmail.com>2011-08-18 01:07:21 -0700
commit592c25f3528c51a601b2e449981d5b008aa274ac (patch)
tree9cb912f8f474a489545b14bbbbe45b319c976685
parent015f662249eec9a0504bea1d614ad1138d8e19ab (diff)
parentf75b6bf9557ffc9413a528649474478e9d98dfba (diff)
downloadslixmpp-592c25f3528c51a601b2e449981d5b008aa274ac.tar.gz
slixmpp-592c25f3528c51a601b2e449981d5b008aa274ac.tar.bz2
slixmpp-592c25f3528c51a601b2e449981d5b008aa274ac.tar.xz
slixmpp-592c25f3528c51a601b2e449981d5b008aa274ac.zip
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
-rw-r--r--sleekxmpp/clientxmpp.py8
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py16
2 files changed, 24 insertions, 0 deletions
diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py
index 2e81eb3b..170b35f0 100644
--- a/sleekxmpp/clientxmpp.py
+++ b/sleekxmpp/clientxmpp.py
@@ -141,6 +141,14 @@ class ClientXMPP(BaseXMPP):
use_tls=use_tls, reattempt=reattempt)
def get_dns_records(self, domain, port=None):
+ """
+ Get the DNS records for a domain.
+ Overridden XMLStream.get_dns_records to use SRV.
+
+ Arguments:
+ domain -- The domain in question.
+ port -- If the results don't include a port, use this one.
+ """
if port is None:
port = self.default_port
if DNSPYTHON:
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index 6c2c5aa5..ca8b5b6e 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -657,6 +657,13 @@ class XMLStream(object):
return False
def get_dns_records(self, domain, port=None):
+ """
+ Get the DNS records for a domain.
+
+ Arguments:
+ domain -- The domain in question.
+ port -- If the results don't include a port, use this one.
+ """
if port is None:
port = self.default_port
if DNSPYTHON:
@@ -673,6 +680,15 @@ class XMLStream(object):
return [((domain, port), 0, 0)]
def pick_dns_answer(self, domain, port=None):
+ """
+ Pick a server and port from DNS answers.
+ Gets DNS answers if none available.
+ Removes used answer from available answers.
+
+ Arguments:
+ domain -- The domain in question.
+ port -- If the results don't include a port, use this one.
+ """
if not self.dns_answers:
self.dns_answers = self.get_dns_records(domain, port)
addresses = {}