X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=modules%2Firc%2F__init__.py;h=4d3c448682b9fb3dea02cd900dfcf544194565d6;hb=036b0bc5d32a841a56c304a6da79668944d714a4;hp=908089adca64e3bbd37960ee87fab980e4bd2f95;hpb=7621dac937eba5352b245972d027d74c39722d5d;p=electrum-server.git

diff --git a/modules/irc/__init__.py b/modules/irc/__init__.py
index 908089a..4d3c448 100644
--- a/modules/irc/__init__.py
+++ b/modules/irc/__init__.py
@@ -1,6 +1,4 @@
-####################################################################
-
-import threading, socket, traceback, time
+import threading, socket, traceback, time, sys
 
 def random_string(N):
     import random, string
@@ -16,22 +14,44 @@ class ServerProcessor(Processor):
         self.peers = {}
         self.banner = config.get('server','banner')
         self.host = config.get('server','host')
-        self.nick = config.get('server','ircname')
-        self.irc = config.get('server','irc') == 'yes'
+        self.password = config.get('server','password')
+
+        self.native_port = config.get('server','native_port')
+        self.stratum_tcp_port = config.get('server','stratum_tcp_port')
+        self.stratum_http_port = config.get('server','stratum_http_port')
+
+        self.irc = config.get('server', 'irc') == 'yes'
+        self.nick = config.get('server', 'irc_nick') 
+        if not self.nick: self.nick = random_string(10)
+
 
     def get_peers(self):
         return self.peers.values()
 
+
+    def getname(self):
+        s = ''
+        if self.native_port:
+            s+= 'n' + self.native_port + ' '
+        if self.stratum_tcp_port:
+            s += 't' + self.stratum_tcp_port + ' ' 
+        if self.stratum_http_port:
+            s += 'h' + self.stratum_http_port + ' '
+        return s
+
+
     def run(self):
         if not self.irc: 
             return
-        NICK = 'E_'+random_string(10)
+
+        ircname = self.getname()
+
         while not self.shared.stopped():
             try:
                 s = socket.socket()
                 s.connect(('irc.freenode.net', 6667))
-                s.send('USER electrum 0 * :'+self.host+' '+self.nick+'\n')
-                s.send('NICK '+NICK+'\n')
+                s.send('USER electrum 0 * :' + self.host + ' ' + ircname + '\n')
+                s.send('NICK E_' + self.nick + '\n')
                 s.send('JOIN #electrum\n')
                 sf = s.makefile('r', 0)
                 t = 0
@@ -53,7 +73,8 @@ class ServerProcessor(Processor):
                         ip = socket.gethostbyname(ip)
                         name = line[k+6]
                         host = line[k+9]
-                        self.peers[name] = (ip,host)
+                        ports  = line[k+10:]
+                        self.peers[name] = (ip, host, ports)
                     if time.time() - t > 5*60:
                         self.push_response({'method':'server.peers', 'result':[self.get_peers()]})
                         s.send('NAMES #electrum\n')
@@ -69,18 +90,31 @@ class ServerProcessor(Processor):
 
     def process(self, request):
         method = request['method']
+        params = request['params']
+        result = None
 
-        result = ''
         if method == 'server.banner':
             result = self.banner.replace('\\n','\n')
+
         elif method == 'server.peers.subscribe':
             result = self.get_peers()
+
+        elif method == 'server.version':
+            pass
+
+        elif method == 'server.stop':
+            print "stopping..."
+            try:
+                password = request['params'][0]
+            except:
+                password = None
+            if password == self.password:
+                self.shared.stop()
+                result = 'ok'
         else:
             print "unknown method", request
 
         if result!='':
-            response = { 'id':request['id'], 'method':method, 'params':request['params'], 'result':result }
+            response = { 'id':request['id'], 'method':method, 'params':params, 'result':result }
             self.push_response(response)
 
-
-