AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge commit 'refs/merge-requests/6' of git://gitorious.org/electrum/electrum into merge-requests/6

Browse Source
This commit is contained in:
ThomasV
2011-12-01 19:41:56 +03:00
parent b61ec6ec7c b513536fb1
commit 55d9502184
3 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
server/server.py
View File

@@ -40,6 +40,7 @@ config.set('server', 'host', 'ecdsa.org')
config.set('server', 'port', 50000)
config.set('server', 'password', '')
config.set('server', 'irc', 'yes')
config.set('server', 'ircname', 'Electrum server')
config.add_section('database')
config.set('database', 'type', 'psycopg2')
config.set('database', 'database', 'abe')
@@ -443,39 +444,37 @@ def irc_thread():
try:
s = socket.socket()
s.connect(('irc.freenode.net', 6667))
s.send('USER '+config.get('server','host')+' '+NICK+' bla :'+NICK+'\n')
s.send('USER electrum 0 * :'+config.get('server','host')+' '+config.get('server','ircname')+'\n')
s.send('NICK '+NICK+'\n')
s.send('JOIN #electrum\n')
sf = s.makefile('r', 0)
t = 0
while not stopping:
line = s.recv(2048)
line = sf.readline()
line = line.rstrip('\r\n')
line = line.split()
if line[0]=='PING':
s.send('PONG '+line[1]+'\n')
elif '353' in line: # answer to /names
k = line.index('353')
try:
k2 = line.index('366')
except:
continue
for item in line[k+1:k2]:
for item in line[k+1:]:
if item[0:2] == 'E_':
s.send('USERHOST %s\n'%item)
elif '302' in line: # answer to /userhost
k = line.index('302')
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)
s.send('WHO %s\n'%item)
elif '352' in line: # answer to /who
# warning: this is a horrible hack which apparently works
k = line.index('352')
ip = line[k+4]
ip = socket.gethostbyname(ip)
name = line[k+6]
host = line[k+9]
peer_list[name] = (ip,host)
elif time.time() - t > 5*60:
s.send('NAMES #electrum\n')
t = time.time()
except:
traceback.print_exc(file=sys.stdout)
finally:
sf.close()
s.close()