Skip to content

Commit

Permalink
remove duplicated locking code created by bind_fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
connortechnology committed May 17, 2016
1 parent 0faa28d commit 435a1f7
Showing 1 changed file with 0 additions and 30 deletions.
30 changes: 0 additions & 30 deletions src/zm_stream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -291,36 +291,6 @@ void StreamBase::openComms()
if ( connkey > 0 )
{

snprintf( sock_path_lock, sizeof(sock_path_lock), "%s/zms-%06d.lock", config.path_socks, connkey);

lock_fd = open(sock_path_lock, O_CREAT|O_WRONLY, S_IRUSR | S_IWUSR);
if ( lock_fd <= 0 )
{
Error("Unable to open sock lock file %s: %s", sock_path_lock, strerror(errno) );
lock_fd = 0;
}
else if ( flock(lock_fd, LOCK_EX) != 0 )
{
Error("Unable to lock sock lock file %s: %s", sock_path_lock, strerror(errno) );

close(lock_fd);
lock_fd = 0;
}
else
{
Debug( 1, "We have obtained a lock on %s fd: %d", sock_path_lock, lock_fd);
}


sd = socket( AF_UNIX, SOCK_DGRAM, 0 );
if ( sd < 0 )
{
Fatal( "Can't create socket: %s", strerror(errno) );
}

snprintf( loc_sock_path, sizeof(loc_sock_path), "%s/zms-%06ds.sock", config.path_socks, connkey );
unlink( loc_sock_path );

unsigned int length = snprintf( sock_path_lock, sizeof(sock_path_lock), "%s/zms-%06d.lock", config.path_socks, connkey);
if ( length >= sizeof(sock_path_lock) ) {
Warning("Socket lock path was truncated.");
Expand Down

0 comments on commit 435a1f7

Please sign in to comment.