ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'zms_socket_lock' into multi-server

This commit is contained in:
Isaac Connor 2015-12-04 15:39:51 -05:00
parent 3c86965760 e637915823
commit 6d605362fc
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/zm_stream.cpp
View File

@ -286,6 +286,23 @@ void StreamBase::openComms()
{ {
if ( connkey > 0 ) 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 || flock(lock_fd, LOCK_SH|LOCK_NB) != 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 read lock on %s fd: %d", sock_path_lock, lock_fd);
}
sd = socket( AF_UNIX, SOCK_DGRAM, 0 ); sd = socket( AF_UNIX, SOCK_DGRAM, 0 );
if ( sd < 0 ) if ( sd < 0 )
{ {
@ -321,6 +338,11 @@ void StreamBase::closeComms()
{ {
unlink( loc_sock_path ); unlink( loc_sock_path );
} }
if (lock_fd > 0)
{
loc_sock_path[0] = '\0';
close(lock_fd); //close it rather than unlock it incase it got deleted.
}
} }
} }

3
src/zm_stream.h
View File

@ -78,6 +78,8 @@ protected:
struct sockaddr_un loc_addr; struct sockaddr_un loc_addr;
char rem_sock_path[PATH_MAX]; char rem_sock_path[PATH_MAX];
struct sockaddr_un rem_addr; struct sockaddr_un rem_addr;
char sock_path_lock[PATH_MAX];
int lock_fd;
protected: protected:
bool paused; bool paused;
@ -127,6 +129,7 @@ public:
connkey = 0; connkey = 0;
sd = -1; sd = -1;
lock_fd = 0;
memset( &loc_sock_path, 0, sizeof(loc_sock_path) ); memset( &loc_sock_path, 0, sizeof(loc_sock_path) );
memset( &loc_addr, 0, sizeof(loc_addr) ); memset( &loc_addr, 0, sizeof(loc_addr) );
memset( &rem_sock_path, 0, sizeof(rem_sock_path) ); memset( &rem_sock_path, 0, sizeof(rem_sock_path) );