From 7a62c3c61b1ef6d530807945b9221a56f7ee4bd9 Mon Sep 17 00:00:00 2001 From: Andreas Wrede Date: Mon, 25 Apr 2016 04:51:14 +0200 Subject: [PATCH] fixes --- hbc | 2 +- hbd | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hbc b/hbc index a51fcc4..bcfba93 100755 --- a/hbc +++ b/hbc @@ -327,7 +327,7 @@ def process(): # msg={'interval': interval, 'acks': conns[conn].ackcount, 'rtt': conns[conn].rtts[-1]} msg={'acks': conns[conn].ackcount, 'rtt': conns[conn].rtts[-1]} conns[conn].sendto(msg) - nextReport += interval + nextReport = time.time() + interval if verbose: print "process: done running" diff --git a/hbd b/hbd index b24cf27..b9b910f 100755 --- a/hbd +++ b/hbd @@ -523,7 +523,7 @@ def dnsupdatethread(): def readsock(sock): if DEBUG > 3: sys.stderr.write("readsock recfrom start") data, addr = sock.recvfrom(MAXRECV) -# now = time.time() + now = time.time() if DEBUG > 2: sys.stderr.write("readsock = %s, %s\n" % (data,addr)) msg = stodict(data) if not msg: # Old hbc client @@ -546,9 +546,10 @@ def readsock(sock): host.connections[cid] = Connection(name, cid, addr) conn = host.connections[cid] - host.doesack = msg.get('acks', -1) - host.setcver(msg.get('ver', 0)) + if msg['ID'] == 'HTB': + host.doesack = msg.get('acks', -1) host.lastbeat = now + host.setcver(msg.get('ver', 0)) interval = msg.get('interval', 0) shutdown = msg.get('shutdown', 0)