BTCPrivate
/
-WIP-electrum-btcp
mirror of https://github.com/BTCPrivate/-WIP-electrum-btcp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

sessions: store client version

This commit is contained in:
ThomasV 2011-12-09 21:29:14 +03:00
parent d69b9ca2ec
commit 558597aaaf
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
server/server.py
View File

@ -57,7 +57,6 @@ except:
stopping = False stopping = False
block_number = -1 block_number = -1
sessions = {} sessions = {}
sessions_last_time = {}
dblock = thread.allocate_lock() dblock = thread.allocate_lock()
peer_list = {} peer_list = {}
@ -258,7 +257,7 @@ class MyStore(Datastore_class):
#"chain_id": 1, #"chain_id": 1,
"height": 0, "height": 0,
"is_in": int(is_in), "is_in": int(is_in),
"blk_hash": 'mempool', "blk_hash": 'mempool', #':%s'%tx_hash,
"tx_hash": tx_hash, "tx_hash": tx_hash,
"tx_id": int(tx_id), "tx_id": int(tx_id),
"pos": int(pos), "pos": int(pos),
@ -362,22 +361,26 @@ def client_thread(ipaddr,conn):
if cmd=='b': if cmd=='b':
out = "%d"%block_number out = "%d"%block_number
elif cmd=='session': elif cmd in ['session','new_session']:
session_id = random_string(10) session_id = random_string(10)
try: try:
addresses = ast.literal_eval(data) if cmd == 'session':
addresses = ast.literal_eval(data)
version = "old"
else:
version, addresses = ast.literal_eval(data)
except: except:
print "error" print "error"
conn.close() conn.close()
return return
print time.asctime(), "new session", ipaddr, session_id, addresses[0] if addresses else addresses, len(addresses) print time.asctime(), "new session", version, ipaddr, session_id, addresses[0] if addresses else addresses, len(addresses)
sessions[session_id] = {} sessions[session_id] = { 'addresses':{}, 'version':version }
for a in addresses: for a in addresses:
sessions[session_id][a] = '' sessions[session_id]['addresses'][a] = ''
out = repr( (session_id, config.get('server','banner').replace('\\n','\n') ) ) out = repr( (session_id, config.get('server','banner').replace('\\n','\n') ) )
sessions_last_time[session_id] = time.time() sessions[session_id]['last_time'] = time.time()
elif cmd=='update_session': elif cmd=='update_session':
try: try:
@ -389,21 +392,22 @@ def client_thread(ipaddr,conn):
print time.asctime(), "update session", ipaddr, session_id, addresses[0] if addresses else addresses, len(addresses) print time.asctime(), "update session", ipaddr, session_id, addresses[0] if addresses else addresses, len(addresses)
sessions[session_id] = {} sessions[session_id]['addresses'] = {}
for a in addresses: for a in addresses:
sessions[session_id][a] = '' sessions[session_id]['addresses'][a] = ''
out = 'ok' out = 'ok'
sessions_last_time[session_id] = time.time() sessions[session_id]['last_time'] = time.time()
elif cmd=='poll': elif cmd=='poll':
session_id = data session_id = data
addresses = sessions.get(session_id) session = sessions.get(session_id)
if addresses is None: if session is None:
print time.asctime(), "session not found", session_id, ipaddr print time.asctime(), "session not found", session_id, ipaddr
out = repr( (-1, {})) out = repr( (-1, {}))
else: else:
t1 = time.time() t1 = time.time()
sessions_last_time[session_id] = time.time() addresses = session['addresses']
session['last_time'] = time.time()
ret = {} ret = {}
k = 0 k = 0
for addr in addresses: for addr in addresses:
@ -414,7 +418,7 @@ def client_thread(ipaddr,conn):
addresses[addr] = status addresses[addr] = status
ret[addr] = status ret[addr] = status
if ret: if ret:
sessions[session_id] = addresses sessions[session_id]['addresses'] = addresses
out = repr( (block_number, ret ) ) out = repr( (block_number, ret ) )
t2 = time.time() - t1 t2 = time.time() - t1
if t2 > 10: if t2 > 10:
@ -433,6 +437,7 @@ def client_thread(ipaddr,conn):
elif cmd =='tx': elif cmd =='tx':
out = send_tx(data) out = send_tx(data)
print "sent tx:", out
elif cmd =='clear_cache': elif cmd =='clear_cache':
if config.get('server','password') == data: if config.get('server','password') == data:
@ -497,13 +502,11 @@ def memorypool_update(store):
ds.clear() ds.clear()
ds.write(hextx.decode('hex')) ds.write(hextx.decode('hex'))
tx = deserialize.parse_Transaction(ds) tx = deserialize.parse_Transaction(ds)
#print "new tx",tx
tx['hash'] = util.double_sha256(tx['tx']) tx['hash'] = util.double_sha256(tx['tx'])
if store.tx_find_id_and_value(tx): if store.tx_find_id_and_value(tx):
pass pass
else: else:
#print "new tx", tx['hash'][::-1].encode('hex')
store.import_tx(tx, False) store.import_tx(tx, False)
store.commit() store.commit()
@ -515,11 +518,11 @@ def clean_session_thread():
while not stopping: while not stopping:
time.sleep(30) time.sleep(30)
t = time.time() t = time.time()
for k,t0 in sessions_last_time.items(): for k,s in sessions.items():
t0 = s['last_time']
if t - t0 > 5*60: if t - t0 > 5*60:
print time.asctime(), "lost session",k print time.asctime(), "lost session",k
sessions.pop(k) sessions.pop(k)
sessions_last_time.pop(k)
def irc_thread(): def irc_thread():