From: ThomasV <thomasv@gitorious>
Date: Wed, 10 Apr 2013 11:12:11 +0000 (+0400)
Subject: do not send port numbers when they are default
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=1f28a49813efaaf2ff58d409710c205aefc2e82d

do not send port numbers when they are default
---

diff --git a/backends/irc/__init__.py b/backends/irc/__init__.py
index 77d179b..489e316 100644
--- a/backends/irc/__init__.py
+++ b/backends/irc/__init__.py
@@ -55,14 +55,19 @@ class IrcThread(threading.Thread):
         s = 'v' + VERSION + ' '
         if self.pruning:
             s += 'p' + self.pruning_limit + ' '
-        if self.stratum_tcp_port:
-            s += 't' + self.stratum_tcp_port + ' '
-        if self.stratum_http_port:
-            s += 'h' + self.stratum_http_port + ' '
-        if self.stratum_tcp_port:
-            s += 's' + self.stratum_tcp_ssl_port + ' '
-        if self.stratum_http_port:
-            s += 'g' + self.stratum_http_ssl_port + ' '
+
+        def add_port(letter, number):
+            DEFAULT_PORTS = {'t':'50001', 's':'50002', 'h':'8081', 'g':'8082'}
+            if not number: return ''
+            if DEFAULT_PORTS[letter] == number:
+                return letter + ' '
+            else:
+                return letter + number + ' '
+
+        s += add_port('t',self.stratum_tcp_port)
+        s += add_port('h',self.stratum_http_port)
+        s += add_port('s',self.stratum_tcp_ssl_port)
+        s += add_port('g',self.stratum_http_ssl_port)
         return s
 
     def run(self):