connectd: unlink any old socket when we use --bind-addr.

They don't clean up after themselves, so best we do it here (by this point we've already done the pid check to make sure we're the only lightningd here anyway). Signed-off-by: Rusty Russell <[email protected]>
docallag · Apr 8, 2019 · ede7d05 · ede7d05
1 parent b85340e
commit ede7d05
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/connectd/connectd.c b/connectd/connectd.c
@@ -988,6 +988,8 @@ static struct wireaddr_internal *setup_listeners(const tal_t *ctx,
 			addrun.sun_family = AF_UNIX;
 			memcpy(addrun.sun_path, wa.u.sockname,
 			       sizeof(addrun.sun_path));
+			/* Remove any existing one. */
+			unlink(wa.u.sockname);
 			fd = make_listen_fd(AF_UNIX, &addrun, sizeof(addrun),
 					    false);
 			status_trace("Created socket listener on file %s",

diff --git a/tests/test_misc.py b/tests/test_misc.py
@@ -566,7 +566,6 @@ def test_io_logging(node_factory, executor):
     assert any(l['type'] == 'IO_IN' for l in peerlog)
 
 
-@pytest.mark.xfail(strict=True)
 def test_address(node_factory):
     if DEVELOPER:
         opts = {'dev-allow-localhost': None}