Commit 598e58ce authored by Juliusz Chroboczek's avatar Juliusz Chroboczek

Don't discard reboot time from babel-state when ids mismatch.

parent afd85bc0
...@@ -261,12 +261,13 @@ main(int argc, char **argv) ...@@ -261,12 +261,13 @@ main(int argc, char **argv)
rc = parse_address(buf2, sid); rc = parse_address(buf2, sid);
if(rc < 0) { if(rc < 0) {
fprintf(stderr, "Couldn't parse babel-state.\n"); fprintf(stderr, "Couldn't parse babel-state.\n");
} else if(memcmp(sid, myid, 16) != 0) {
fprintf(stderr, "ID mismatch in babel-state.\n");
} else { } else {
debugf("Got %s %d %ld from babel-state.\n", debugf("Got %s %d %ld from babel-state.\n",
format_address(sid), s, t); format_address(sid), s, t);
if(memcmp(sid, myid, 16) == 0)
myseqno = seqno_plus(s, 1); myseqno = seqno_plus(s, 1);
else
fprintf(stderr, "ID mismatch in babel-state.\n");
if(t >= 1176800000L && t <= now.tv_sec) if(t >= 1176800000L && t <= now.tv_sec)
reboot_time = t; reboot_time = t;
} }
...@@ -277,6 +278,10 @@ main(int argc, char **argv) ...@@ -277,6 +278,10 @@ main(int argc, char **argv)
close(fd); close(fd);
} }
if(reboot_time + silent_time > now.tv_sec)
fprintf(stderr, "Respecting %ld second silent time.\n",
(long int)(reboot_time + silent_time - now.tv_sec));
rc = kernel_setup(1); rc = kernel_setup(1);
if(rc < 0) { if(rc < 0) {
fprintf(stderr, "kernel_setup failed.\n"); fprintf(stderr, "kernel_setup failed.\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment