andreas/heartbeat
Public Access
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases 44 Wiki Activity

fixes

Browse Source
This commit is contained in:
Andreas Wrede
2016-04-25 04:51:14 +02:00
parent 4848e079a1
commit 7a62c3c61b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hbc
+1 -1
View File
@@ -327,7 +327,7 @@ def process():
# msg={'interval': interval, 'acks': conns[conn].ackcount, 'rtt': conns[conn].rtts[-1]} # msg={'interval': interval, 'acks': conns[conn].ackcount, 'rtt': conns[conn].rtts[-1]}
msg={'acks': conns[conn].ackcount, 'rtt': conns[conn].rtts[-1]} msg={'acks': conns[conn].ackcount, 'rtt': conns[conn].rtts[-1]}
conns[conn].sendto(msg) conns[conn].sendto(msg)
nextReport += interval nextReport = time.time() + interval
if verbose: print "process: done running" if verbose: print "process: done running"
hbd
+4 -3
View File
@@ -523,7 +523,7 @@ def dnsupdatethread():
def readsock(sock): def readsock(sock):
if DEBUG > 3: sys.stderr.write("readsock recfrom start") if DEBUG > 3: sys.stderr.write("readsock recfrom start")
data, addr = sock.recvfrom(MAXRECV) data, addr = sock.recvfrom(MAXRECV)
# now = time.time() now = time.time()
if DEBUG > 2: sys.stderr.write("readsock = %s, %s\n" % (data,addr)) if DEBUG > 2: sys.stderr.write("readsock = %s, %s\n" % (data,addr))
msg = stodict(data) msg = stodict(data)
if not msg: # Old hbc client if not msg: # Old hbc client
@@ -546,9 +546,10 @@ def readsock(sock):
host.connections[cid] = Connection(name, cid, addr) host.connections[cid] = Connection(name, cid, addr)
conn = host.connections[cid] conn = host.connections[cid]
host.doesack = msg.get('acks', -1) if msg['ID'] == 'HTB':
host.setcver(msg.get('ver', 0)) host.doesack = msg.get('acks', -1)
host.lastbeat = now host.lastbeat = now
host.setcver(msg.get('ver', 0))
interval = msg.get('interval', 0) interval = msg.get('interval', 0)
shutdown = msg.get('shutdown', 0) shutdown = msg.get('shutdown', 0)