From 1d7594451319b353650c87cb5451c7ed7293cd92 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Thu, 16 Aug 2018 09:45:06 +0500 Subject: fixes #656 Don't connect/remove IPC sockets unless bind fails --- src/platform/posix/posix_ipclisten.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/platform') diff --git a/src/platform/posix/posix_ipclisten.c b/src/platform/posix/posix_ipclisten.c index 4e33a08f..7134c4e3 100644 --- a/src/platform/posix/posix_ipclisten.c +++ b/src/platform/posix/posix_ipclisten.c @@ -281,15 +281,20 @@ nni_ipc_listener_listen(nni_ipc_listener *l, const nni_sockaddr *sa) return (rv); } - if (((rv = ipc_remove_stale(path)) != 0) || - ((rv = nni_posix_pfd_init(&pfd, fd)) != 0)) { + if ((rv = nni_posix_pfd_init(&pfd, fd)) != 0) { nni_mtx_unlock(&l->mtx); nni_strfree(path); (void) close(fd); return (rv); } - if (bind(fd, (struct sockaddr *) &ss, len) < 0) { + if ((rv = bind(fd, (struct sockaddr *) &ss, len)) != 0) { + if ((errno == EEXIST) || (errno == EADDRINUSE)) { + ipc_remove_stale(path); + rv = bind(fd, (struct sockaddr *) &ss, len); + } + } + if (rv != 0) { rv = nni_plat_errno(errno); nni_mtx_unlock(&l->mtx); nni_strfree(path); -- cgit v1.2.3-70-g09d2