X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=backends%2Firc%2F__init__.py;h=1f8ca103981965c68c867332308e771aa243d816;hb=f67ae92c742e2583f61684f15899e973d45dc804;hp=19ed45183c9d256b55a47f0bb5a6968c7599d3bb;hpb=08cf934e360070582956a69ad0d077d6d6092025;p=electrum-server.git

diff --git a/backends/irc/__init__.py b/backends/irc/__init__.py
index 19ed451..1f8ca10 100644
--- a/backends/irc/__init__.py
+++ b/backends/irc/__init__.py
@@ -93,6 +93,17 @@ class ServerProcessor(Processor):
         params = request['params']
         result = None
 
+        if method in ['server.stop', 'server.info']:
+            try:
+                password = request['params'][0]
+            except:
+                password = None
+
+            if password != self.password:
+                response = { 'id':request['id'], 'result':None,  'error':'incorrect password'}
+                self.push_response(response)
+                return
+
         if method == 'server.banner':
             result = self.banner.replace('\\n','\n')
 
@@ -100,25 +111,24 @@ class ServerProcessor(Processor):
             result = self.get_peers()
 
         elif method == 'server.version':
-            pass
+            result = 'ok'
 
         elif method == 'server.stop':
-            print "stopping..."
-            try:
-                password = request['params'][0]
-            except:
-                password = None
-            if password == self.password:
-                self.shared.stop()
-                result = 'ok'
+            self.shared.stop()
+            result = 'ok'
 
         elif method == 'server.info':
-            result = map(lambda s: s.address, self.dispatcher.request_dispatcher.sessions)
+            result = map(lambda s: { "time":s.time, 
+                                     "name":s.name,
+                                     "address":s.address, 
+                                     "version":s.version, 
+                                     "subscriptions":len(s.subscriptions)}, 
+                         self.dispatcher.request_dispatcher.sessions)
 
         else:
             print "unknown method", request
 
         if result!='':
-            response = { 'id':request['id'], 'method':method, 'params':params, 'result':result }
+            response = { 'id':request['id'], 'result':result }
             self.push_response(response)