aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-02-02 20:54:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

dev_disconnect: don't permfail more than once.

Browse Source 
The coming tests trigger this latent bug under travis.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2017-10-12 10:55:28 +10:30
committed by Christian Decker
parent ebba5f85a2
commit f83ee6d5ea
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lightningd/subd.c
View File

@@ -645,7 +645,11 @@ bool dev_disconnect_permanent(struct lightningd *ld)
r = read(ld->dev_disconnect_fd, permfail, sizeof(permfail));
if (r < 0)
fatal("Reading dev_disconnect file: %s", strerror(errno));
lseek(ld->dev_disconnect_fd, -r, SEEK_CUR);
return memeq(permfail, r, "permfail", strlen("permfail"));
if (memeq(permfail, r, "permfail", strlen("permfail")))
return true;
/* Nope, restore. */
lseek(ld->dev_disconnect_fd, -r, SEEK_CUR);
return false;
}