show hostnames

[electrum-server.git] / server.py

diff --git a/server.py b/server.py
index 272cb37..c22326a 100644 (file)
--- a/server.py
+++ b/server.py
@@ -22,7 +22,7 @@ Todo:
 """
 
 
-import time, socket, operator, thread, ast, sys
+import time, socket, operator, thread, ast, sys,re
 import psycopg2, binascii
 import bitcoinrpc
 
@@ -44,7 +44,7 @@ except:
 
 
 stopping = False
-
+block_number = -1
 sessions = {}
 sessions_last_time = {}
 dblock = thread.allocate_lock()
@@ -314,8 +314,7 @@ def client_thread(ipaddr,conn):
             return
 
         if cmd=='b':
-            out = "%d"%store.get_block_number(1)
-
+            out = "%d"%block_number
         elif cmd=='session':
             session_id = random_string(10)
             try:
@@ -348,7 +347,7 @@ def client_thread(ipaddr,conn):
                     if last_status != status:
                         sessions[session_id][addr] = status
                         ret[addr] = status
-                out = repr( (store.get_block_number(1), ret ) )
+                out = repr( (block_number, ret ) )
 
         elif cmd == 'h': 
             # history
@@ -420,7 +419,7 @@ def memorypool_update(store):
 
 def clean_session_thread():
     while not stopping:
-        time.sleep(30)
+        time.sleep(3)
         t = time.time()
         for k,t0 in sessions_last_time.items():
             if t - t0 > 60:
@@ -436,8 +435,8 @@ def irc_thread():
         try:
             s = socket.socket()
             s.connect(('irc.freenode.net', 6667))
-            s.send('USER '+NICK+' '+NICK+' bla :'+NICK+'\n') 
-            s.send('NICK '+NICK+'\n') 
+            s.send('USER '+HOST+' '+NICK+' bla :'+NICK+'\n') 
+            s.send('NICK '+NICK+'\n')
             s.send('JOIN #electrum\n')
             t = 0
             while not stopping:
@@ -448,15 +447,21 @@ def irc_thread():
                     s.send('PONG '+line[1]+'\n')
                 elif '353' in line: # answer to /names
                     k = line.index('353')
-                    k2 = line.index('366')
+                    try:
+                        k2 = line.index('366')
+                    except:
+                        continue
                     for item in line[k+1:k2]:
                         if item[0:2] == 'E_':
                             s.send('USERHOST %s\n'%item)
                 elif '302' in line: # answer to /userhost
                     k = line.index('302')
-                    name = line[k+1]
-                    host = line[k+2].split('@')[1]
-                    peer_list[name] = host
+                    m = re.match( "^:(.*?)=\+~(.*?)@(.*?)$", line[k+2] )
+                    if m:
+                        name = m.group(1)
+                        host = m.group(2)
+                        ip = m.group(3)
+                        peer_list[name] = (ip,host)
                 elif time.time() - t > 5*60:
                     s.send('NAMES #electrum\n')
                     t = time.time()
@@ -509,6 +514,7 @@ if __name__ == '__main__':
             dblock.acquire()
             store.catch_up()
             memorypool_update(store)
+            block_number = store.get_block_number(1)
             dblock.release()
         except:
             traceback.print_exc(file=sys.stdout)