Fixed 1.0 miss-merges
This commit is contained in:
parent
103543aa2c
commit
ffa1dc73dc
5 changed files with 6 additions and 65 deletions
|
|
@ -35,7 +35,7 @@
|
|||
static bool mykeyused = false;
|
||||
|
||||
void send_key_changed() {
|
||||
avl_node_t *node;
|
||||
splay_node_t *node;
|
||||
connection_t *c;
|
||||
|
||||
send_request(broadcast, "%d %x %s", KEY_CHANGED, rand(), myself->name);
|
||||
|
|
@ -257,7 +257,6 @@ bool ans_key_h(connection_t *c, char *request) {
|
|||
digest_set_key(&from->outdigest, key, keylen);
|
||||
|
||||
from->status.validkey = true;
|
||||
from->status.waitingforkey = false;
|
||||
from->sent_seqno = 0;
|
||||
|
||||
if(*address && *port) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue