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

Merge branch 'zm_trigger_improvements' into storageareas

This commit is contained in:
Isaac Connor 2016-02-19 11:09:41 -05:00
parent afb0cf2a7e 826a22a2a8
commit 66e76e4c2e
4 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/File.pm
View File

@ -62,7 +62,10 @@ sub open
local *sfh; local *sfh;
#sysopen( *sfh, $conn->{path}, O_NONBLOCK|O_RDONLY ) or croak( "Can't sysopen: $!" ); #sysopen( *sfh, $conn->{path}, O_NONBLOCK|O_RDONLY ) or croak( "Can't sysopen: $!" );
#open( *sfh, "<".$conn->{path} ) or croak( "Can't open: $!" ); #open( *sfh, "<".$conn->{path} ) or croak( "Can't open: $!" );
open( *sfh, "+<", $self->{path} ) or croak( "Can't open: $!" ); if ( ! open( *sfh, "+<", $self->{path} ) ) {
Error( "Can't open file at $$self{path}: $!" );
croak( "Can't open file at $$self{path}: $!" );
}
$self->{state} = 'open'; $self->{state} = 'open';
$self->{handle} = *sfh; $self->{handle} = *sfh;
} }
@ -73,7 +76,7 @@ __END__
=head1 NAME =head1 NAME
ZoneMinder::Database - Perl extension for blah blah blah ZoneMinder::Trigger::Channel::File - ZOneMinder object for a file based trigger channel
=head1 SYNOPSIS =head1 SYNOPSIS

21
scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm
View File

@ -61,12 +61,21 @@ sub open
{ {
my $self = shift; my $self = shift;
local *sfh; local *sfh;
my $saddr = sockaddr_in( $self->{port}, INADDR_ANY ); if ( ! socket( *sfh, PF_INET, SOCK_STREAM, getprotobyname('tcp') ) ) {
socket( *sfh, PF_INET, SOCK_STREAM, getprotobyname('tcp') ) Error( "Can't open socket: $!" );
or croak( "Can't open socket: $!" ); croak( "Can't open socket: $!" );
}
setsockopt( *sfh, SOL_SOCKET, SO_REUSEADDR, 1 ); setsockopt( *sfh, SOL_SOCKET, SO_REUSEADDR, 1 );
bind( *sfh, $saddr ) or croak( "Can't bind: $!" );
listen( *sfh, SOMAXCONN ) or croak( "Can't listen: $!" ); my $saddr = sockaddr_in( $self->{port}, INADDR_ANY );
if ( ! bind( *sfh, $saddr ) ) {
Error( "Can't bind to port $$self{port}: $!" );
croak( "Can't bind to port $$self{port}: $!" );
}
if ( ! listen( *sfh, SOMAXCONN ) ) {
Error( "Can't listen: $!" );
croak( "Can't listen: $!" );
}
$self->{state} = 'open'; $self->{state} = 'open';
$self->{handle} = *sfh; $self->{handle} = *sfh;
} }
@ -95,7 +104,7 @@ __END__
=head1 NAME =head1 NAME
ZoneMinder::Database - Perl extension for blah blah blah ZoneMinder::Trigger::Channel::Inet
=head1 SYNOPSIS =head1 SYNOPSIS

20
scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Unix.pm
View File

@ -63,9 +63,18 @@ sub open
local *sfh; local *sfh;
unlink( $self->{path} ); unlink( $self->{path} );
my $saddr = sockaddr_un( $self->{path} ); my $saddr = sockaddr_un( $self->{path} );
socket( *sfh, PF_UNIX, SOCK_STREAM, 0 ) or croak( "Can't open socket: $!" ); if ( ! socket( *sfh, PF_UNIX, SOCK_STREAM, 0 ) ) {
bind( *sfh, $saddr ) or croak( "Can't bind: $!" ); Error( "Can't open unix socket at $$self{path}: $!" );
listen( *sfh, SOMAXCONN ) or croak( "Can't listen: $!" ); croak( "Can't open unix socket at $$self{path}: $!" );
}
if ( ! bind( *sfh, $saddr ) ) {
Error( "Can't bind unix socket at $$self{path}: $!" );
croak( "Can't bind unix socket at $$self{path}: $!" );
}
if ( ! listen( *sfh, SOMAXCONN ) ) {
Error( "Can't listen: $!" );
croak( "Can't listen: $!" );
}
$self->{handle} = *sfh; $self->{handle} = *sfh;
} }
@ -93,12 +102,11 @@ __END__
=head1 NAME =head1 NAME
ZoneMinder::Database - Perl extension for blah blah blah ZoneMinder::Trigger::Channel::Unix - Object for Unix socket channel
=head1 SYNOPSIS =head1 SYNOPSIS
use ZoneMinder::Database; See zmtrigger.pl
blah blah blah
=head1 DESCRIPTION =head1 DESCRIPTION

4
scripts/zmtrigger.pl.in
View File

@ -135,14 +135,14 @@ use ZoneMinder::Trigger::Connection;
my @connections; my @connections;
push( @connections, push( @connections,
ZoneMinder::Trigger::Connection->new( ZoneMinder::Trigger::Connection->new(
name=>"Chan1", name=>"Chan1 TCP on port 6802",
channel=>ZoneMinder::Trigger::Channel::Inet->new( port=>6802 ), channel=>ZoneMinder::Trigger::Channel::Inet->new( port=>6802 ),
mode=>"rw" mode=>"rw"
) )
); );
push( @connections, push( @connections,
ZoneMinder::Trigger::Connection->new( ZoneMinder::Trigger::Connection->new(
name=>"Chan2", name=>"Chan2 Unix Socket at " . $Config{ZM_PATH_SOCKS}.'/zmtrigger.sock',
channel=>ZoneMinder::Trigger::Channel::Unix->new( channel=>ZoneMinder::Trigger::Channel::Unix->new(
path=>$Config{ZM_PATH_SOCKS}.'/zmtrigger.sock' path=>$Config{ZM_PATH_SOCKS}.'/zmtrigger.sock'
), ),