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

Add set_net_interface function and use the when setting up the multicast socket

This commit is contained in:
Isaac Connor 2020-02-19 14:27:36 -05:00
parent 258ae23fb9
commit 2315bed56d
1 changed files with 66 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
onvif/modules/lib/WSDiscovery/TransportUDP.pm
View File

@ -43,7 +43,7 @@ my %message_of :ATTR(:name<message> :default<()>);
my %is_success_of :ATTR(:name<is_success> :default<()>); my %is_success_of :ATTR(:name<is_success> :default<()>);
my %local_addr_of :ATTR(:name<local_addr> :init_arg<local_addr> :default<()>); my %local_addr_of :ATTR(:name<local_addr> :init_arg<local_addr> :default<()>);
my $net_interface;
# create methods normally inherited from SOAP::Client # create methods normally inherited from SOAP::Client
SUBFACTORY: { SUBFACTORY: {
@ -60,14 +60,22 @@ sub _notify_response
} }
sub set_net_interface {
my $self = shift;
$net_interface = shift;
}
sub send_multi() { sub send_multi() {
my ($self, $address, $port, $utf8_string) = @_; my ($self, $address, $port, $utf8_string) = @_;
my $destination = $address . ':' . $port; my $destination = $address . ':' . $port;
my $socket = IO::Socket::Multicast->new(PROTO => 'udp', my $socket = IO::Socket::Multicast->new(
LocalPort=>$port, PeerAddr=>$destination, ReuseAddr=>1) PROTO => 'udp',
LocalPort=>$port,
or die 'Cannot open multicast socket to ' . ${address} . ':' . ${port}; PeerAddr=>$destination,
ReuseAddr=>1
) or die 'Cannot open multicast socket to ' . ${address} . ':' . ${port};
$_ = $socket->mcast_if($net_interface) if $net_interface;
my $bytes = $utf8_string; my $bytes = $utf8_string;
utf8::encode($bytes); utf8::encode($bytes);
@ -80,14 +88,16 @@ sub receive_multi() {
my ($self, $address, $port) = @_; my ($self, $address, $port) = @_;
my $data = undef; my $data = undef;
my $socket = IO::Socket::Multicast->new(PROTO => 'udp', my $socket = IO::Socket::Multicast->new(
LocalPort=>$port, ReuseAddr=>1); PROTO => 'udp',
$socket->mcast_add($address); LocalPort=>$port,
ReuseAddr=>1);
$socket->mcast_add($address, $net_interface);
my $readbits = ''; my $readbits = '';
vec($readbits, $socket->fileno, 1) = 1; vec($readbits, $socket->fileno, 1) = 1;
if(select($readbits, undef, undef, WAIT_TIME/1000)) { if ( select($readbits, undef, undef, WAIT_TIME/1000) ) {
$socket->recv($data, 9999); $socket->recv($data, 9999);
return $data; return $data;
} }
@ -98,15 +108,19 @@ sub receive_uni() {
my ($self, $address, $port, $localaddr) = @_; my ($self, $address, $port, $localaddr) = @_;
my $data = undef; my $data = undef;
my $socket = IO::Socket::Multicast->new(PROTO => 'udp', my $socket = IO::Socket::Multicast->new(
LocalAddr => $localaddr, LocalPort=>$port, ReuseAddr=>1); PROTO => 'udp',
LocalAddr => $localaddr,
LocalPort=>$port,
ReuseAddr=>1
);
$socket->mcast_add($address); $socket->mcast_add($address, $net_interface);
my $readbits = ''; my $readbits = '';
vec($readbits, $socket->fileno, 1) = 1; vec($readbits, $socket->fileno, 1) = 1;
if(select($readbits, undef, undef, WAIT_TIME/1000)) { if ( select($readbits, undef, undef, WAIT_TIME/1000) ) {
$socket->recv($data, 9999); $socket->recv($data, 9999);
return $data; return $data;
} }
@ -114,50 +128,51 @@ sub receive_uni() {
} }
sub send_receive { sub send_receive {
my ($self, %parameters) = @_; my ($self, %parameters) = @_;
my ($envelope, $soap_action, $endpoint, $encoding, $content_type) = my ($envelope, $soap_action, $endpoint, $encoding, $content_type) =
@parameters{qw(envelope action endpoint encoding content_type)}; @parameters{qw(envelope action endpoint encoding content_type)};
my ($address,$port) = ($endpoint =~ /([^:\/]+):([0-9]+)/); my ($address,$port) = ($endpoint =~ /([^:\/]+):([0-9]+)/);
#warn "address = ${address}"; #warn "address = ${address}";
#warn "port = ${port}"; #warn "port = ${port}";
$self->send_multi($address, $port, $envelope); $self->send_multi($address, $port, $envelope);
my $localaddr = $self->get_local_addr(); my $localaddr = $self->get_local_addr();
#warn "localddr $localaddr";
my ($response, $last_response); my ($response, $last_response);
my $wait = WAIT_COUNT; my $wait = WAIT_COUNT;
while ( $wait >= 0 ) { while ( $wait >= 0 ) {
if($localaddr) { if ( $localaddr ) {
if($response = $self->receive_uni($address, $port, $localaddr)) { if ( $response = $self->receive_uni($address, $port, $localaddr) ) {
$last_response = $response; $last_response = $response;
$self->_notify_response($response); $self->_notify_response($response);
} }
$wait --; $wait --;
} }
if($response = $self->receive_multi($address, $port)) { if ( $response = $self->receive_multi($address, $port) ) {
$last_response = $response; $last_response = $response;
$self->_notify_response($response); $self->_notify_response($response);
} }
$wait --; $wait --;
} }
if($last_response) {
$self->set_code();
$self->set_message("");
$self->set_is_success(1);
$self->set_status('OK');
}
else{
$self->set_code();
$self->set_message("Timed out waiting for response");
$self->set_is_success(0);
$self->set_status('TIMEOUT');
}
return $last_response; if ( $last_response ) {
$self->set_code();
$self->set_message('');
$self->set_is_success(1);
$self->set_status('OK');
} else {
$self->set_code();
$self->set_message('Timed out waiting for response');
$self->set_is_success(0);
$self->set_status('TIMEOUT');
}
return $last_response;
} }
1; 1;
__END__