- enhancement

- not forcing 5222 port

Changed files:
    gajim-SRV.patch -> 1.2

diff --git a/gajim-SRV.patch b/gajim-SRV.patch
index 66b77a716a42786e762abb0b66909d79a707f9a0..b5e2ed0ea394a124052c3157319a7a2ba22ec261 100644 (file)
--- a/gajim-SRV.patch
+++ b/gajim-SRV.patch
@@ -1,41 +1,45 @@
-diff -ur gajim-0.7-old/src/common/xmpp/transports.py gajim-0.7/src/common/xmpp/transports.py
---- gajim-0.7-old/src/common/xmpp/transports.py        2005-05-23 20:22:05.000000000 +0200
-+++ gajim-0.7/src/common/xmpp/transports.py    2005-06-03 22:29:02.045692744 +0200
-@@ -31,6 +31,7 @@
- from simplexml import ustr
+diff -urN gajim-0.7.1/src/common/xmpp/transports.py fix/gajim-0.7.1/src/common/xmpp/transports.py
+--- gajim-0.7.1/src/common/xmpp/transports.py  2005-06-05 12:56:36.000000000 +0200
++++ fix/gajim-0.7.1/src/common/xmpp/transports.py      2005-06-15 01:47:56.000000000 +0200
+@@ -32,6 +32,12 @@
  from client import PlugIn
  from protocol import *
-+import dns.resolver
  
++try:
++    import dns.resolver
++except:
++    pass
++        
++
  class error:
      """An exception to be raised in case of low-level errors in methods of 'transports' module."""
-@@ -50,6 +51,29 @@
+     def __init__(self,comment):
+@@ -50,6 +56,28 @@
          PlugIn.__init__(self)
          self.DBG_LINE='socket'
          self._exported_methods=[self.send,self.disconnect]
-+        
-+        # SRV resolver hacks
-+        host, port = server
-+        possible_queries = [
-+            "_xmpp-client._tcp." + host,
-+            "_jabber._tcp." + host,
-+          ]
-+        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)
-+              if port == 5223 and query[:5] == "_xmpp":
-+                # temporary hack
-+                port = 5222
-+              break
-+          except:
-+            pass
 +
-+        server = (host, port)
-+        # end of SRV resolver hacks
-+        
++        # SRV resolver
++        if 'dns' in globals(): # if dnspython is available support SRV
++            host, port = server
++            possible_queries = [
++                "_xmpp-client._tcp." + host,
++                "_jabber._tcp." + host,
++            ]
++
++            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
++                except:
++                    pass
++
++            server = (host, port)
++        # end of SRV resolver
++
          self._server = server
  
      def plugin(self, owner):