Changeset 3448 for branches/gajim_0.8.2

Timestamp:

09/06/05 13:30:12 (3 years ago)

Author:

nk

Message:

overwtie transports.py [srv stuff]

Files:

• branches/gajim_0.8.2/src/common/xmpp/transports.py (modified) (3 diffs)

branches/gajim_0.8.2/src/common/xmpp/transports.py

@@ -33 +33 @@
 from protocol import *
 
+# determine which DNS resolution library is available
+HAVE_DNSPYTHON = False
+HAVE_PYDNS = False
 try:
-    import dns.resolver
-except:
-    pass
+    import dns.resolver # http://dnspython.org/
+    HAVE_DNSPYTHON = True
+except ImportError:
+    try:
+        import DNS # http://pydns.sf.net/
+        HAVE_PYDNS = True
+    except ImportError:
+        print "Could not load one of the supported DNS libraries (dnspython or pydns). SRV records will not be queried and you may need to set custom hostname/port for some servers to be accessible."
 
 DATA_RECEIVED='DATA RECEIVED'
@@ -61 +69 @@
 
         # SRV resolver
-        if 'dns' in globals(): # if dnspython is available support SRV
+        if HAVE_DNSPYTHON or HAVE_PYDNS:
             host, port = server
             possible_queries = ['_xmpp-client._tcp.' + host]
@@ -67 +75 @@
             for query in possible_queries:
                 try:
-                    answers = [x for x in dns.resolver.query(query, 'SRV')]
-                    if answers:
-                        host = str (answers[0].target)
-                        port = int (answers[0].port)
-                        break
+                    if HAVE_DNSPYTHON:
+                        answers = [x for x in dns.resolver.query(query, 'SRV')]
+                        if answers:
+                            host = str (answers[0].target)
+                            port = int (answers[0].port)
+                            break
+                    elif HAVE_PYDNS:
+                        # ensure we haven't cached an old configuration
+                        DNS.ParseResolvConf()
+                        response = DNS.Request().req(query, qtype='SRV')
+                        answers = response.answers
+                        if len(answers) > 0:
+                            # ignore the priority and weight for now
+                            _, _, port, host = answers[0]['data']
+                            del _
+                            port = int(port)
+                            break
                 except:
-                    pass
-
+                    print 'An error occurred while looking up %s' % query
             server = (host, port)
         # end of SRV resolver