X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=blobdiff_plain;f=backends%2Firc%2F__init__.py;h=1f58f77f11675625f26607e1f5ad990d23711671;hp=0e7b7570e3bb262c82e6690fc490ada2a330fc09;hb=5fc9625300ebde3d56a89c6d2f72a599aa0c8d1d;hpb=c9c337a89a3f04d7a985a521ca552d421fd94fda diff --git a/backends/irc/__init__.py b/backends/irc/__init__.py index 0e7b757..1f58f77 100644 --- a/backends/irc/__init__.py +++ b/backends/irc/__init__.py @@ -39,11 +39,13 @@ class IrcThread(threading.Thread): if self.report_host: self.host = self.report_host if not self.nick: - self.nick = Hash(self.report_host)[:10] + self.nick = Hash(self.host)[:5].encode("hex") self.prepend = 'E_' if config.get('server', 'coin') == 'litecoin': self.prepend = 'EL_' self.pruning = config.get('server', 'backend') == 'leveldb' + if self.pruning: + self.pruning_limit = config.get('leveldb', 'pruning_limit') self.nick = self.prepend + self.nick def get_peers(self): @@ -52,64 +54,104 @@ class IrcThread(threading.Thread): def getname(self): s = 'v' + VERSION + ' ' if self.pruning: - s += 'p ' - 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 + ' ' + s += 'p' + self.pruning_limit + ' ' + + 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): ircname = self.getname() + print_log("joining IRC") while not self.processor.shared.stopped(): try: s = socket.socket() s.connect(('irc.freenode.net', 6667)) - s.settimeout(300) + s.settimeout(0.1) except: s.close() + print_log("IRC: reconnect in 10 s") time.sleep(10) continue + self.message = '' + out_msg = [] + try: s.send('USER electrum 0 * :' + self.host + ' ' + ircname + '\n') s.send('NICK ' + self.nick + '\n') s.send('JOIN #electrum\n') - sf = s.makefile('r', 0) t = 0 + while not self.processor.shared.stopped(): - line = sf.readline().rstrip('\r\n').split() - if not line: + try: + data = s.recv(2048) + except socket.timeout, e: + if out_msg: + m = out_msg.pop(0) + s.send(m) continue - if line[0] == 'PING': - s.send('PONG ' + line[1] + '\n') - elif '353' in line: # answer to /names - k = line.index('353') - for item in line[k+1:]: - if item.startswith(self.prepend): - 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 = socket.gethostbyname(line[k+4]) - name = line[k+6] - host = line[k+9] - ports = line[k+10:] - self.peers[name] = (ip, host, ports) + except: + print_log( "irc: socket error" ) + time.sleep(1) + break + + self.message += data + + while self.message.find('\n') != -1: + pos = self.message.find('\n') + line = self.message[0:pos] + self.message = self.message[pos+1:] + line = line.strip('\r') + if not line: + continue + # print_log("<--", line) + line = line.split() + if line[0] == 'PING': + out_msg.append('PONG ' + line[1] + '\n') + elif '353' in line: # answer to /names + k = line.index('353') + for item in line[k+1:]: + if item.startswith(self.prepend): + out_msg.append('WHO %s\n' % item) + elif '352' in line: # answer to /who + # warning: this is a horrible hack which apparently works + k = line.index('352') + try: + ip = socket.gethostbyname(line[k+4]) + except: + print_log("gethostbyname error", line[k+4]) + continue + name = line[k+6] + host = line[k+9] + ports = line[k+10:] + self.peers[name] = (ip, host, ports) + elif 'KICK' in line: + try: + print_log("KICK", line[3] + line[4]) + except: + print_log("KICK", "error") + if time.time() - t > 5*60: - self.processor.push_response({'method': 'server.peers', 'params': [self.get_peers()]}) + #self.processor.push_response({'method': 'server.peers', 'params': [self.get_peers()]}) s.send('NAMES #electrum\n') t = time.time() self.peers = {} except: traceback.print_exc(file=sys.stdout) + time.sleep(1) finally: - sf.close() s.close() print_log("quitting IRC") @@ -121,7 +163,6 @@ class ServerProcessor(Processor): Processor.__init__(self) self.daemon = True self.banner = config.get('server', 'banner') - self.password = config.get('server', 'password') if config.get('server', 'irc') == 'yes': self.irc = IrcThread(self, config) @@ -139,23 +180,11 @@ class ServerProcessor(Processor): self.irc.start() Processor.run(self) - def process(self, request): + def process(self, session, request): method = request['method'] params = request['params'] result = None - if method in ['server.stop', 'server.info']: - try: - password = request['params'][0] - except: - password = None - - if password != self.password: - self.push_response({'id': request['id'], - 'result': None, - 'error': 'incorrect password'}) - return - if method == 'server.banner': result = self.banner.replace('\\n', '\n') @@ -165,28 +194,8 @@ class ServerProcessor(Processor): elif method == 'server.version': result = VERSION - elif method == 'server.stop': - self.shared.stop() - result = 'stopping, please wait until all threads terminate.' - - elif method == 'server.info': - result = map(lambda s: {"time": s.time, - "name": s.name, - "address": s.address, - "version": s.version, - "subscriptions": len(s.subscriptions)}, - self.dispatcher.request_dispatcher.get_sessions()) - - elif method == 'server.cache': - p = self.dispatcher.request_dispatcher.processors['blockchain'] - result = len(repr(p.store.tx_cache)) - - elif method == 'server.load': - p = self.dispatcher.request_dispatcher.processors['blockchain'] - result = p.queue.qsize() - else: - print_log("unknown method", request) + print_log("unknown method", method) if result != '': - self.push_response({'id': request['id'], 'result': result}) + self.push_response(session, {'id': request['id'], 'result': result})