generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-07 14:37:36 +01:00
Code Issues Projects Releases Wiki Activity

Problem: close always fails with wildcard bind, since directory is not empty

Browse Source 
Solution: unlink the socket file first
This commit is contained in:
Simon Giesecke
2019-02-04 05:33:28 -05:00
parent b14bb2d8f8
commit 8d784f26ab
4 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ipc_listener.cpp
View File

@@ -249,11 +249,17 @@ int zmq::ipc_listener_t::close ()
_s = retired_fd;
if (_has_file && options.use_fd == -1) {
rc = 0;
if (!_tmp_socket_dirname.empty ()) {
// TODO review this behaviour, it is inconsistent with the use of
// unlink in open since 656cdb959a7482c45db979c1d08ede585d12e315;
// however, we must at least remove the file before removing the
// directory, otherwise it will always fail
rc = ::unlink (_filename.c_str ());
if (rc == 0 && !_tmp_socket_dirname.empty ()) {
rc = ::rmdir (_tmp_socket_dirname.c_str ());
_tmp_socket_dirname.clear ();
if (rc == 0) {
rc = ::rmdir (_tmp_socket_dirname.c_str ());
_tmp_socket_dirname.clear ();
}
}
if (rc != 0) {