FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 02:10:32 +00:00
Code Issues Releases Wiki Activity

dash_dhcp, fake_roku, plex: fixed ReusePort usage

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12922 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2016-12-31 14:53:02 +00:00
parent e804ebdae5
commit 47206ff4ac
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/FHEM/37_dash_dhcp.pm
View File

@ -77,7 +77,7 @@ dash_dhcp_startListener($)
$hash->{PORT} = AttrVal($name, 'port', $hash->{PORT}); $hash->{PORT} = AttrVal($name, 'port', $hash->{PORT});
Log3 $name, 4, "$name: using port $hash->{PORT}"; Log3 $name, 4, "$name: using port $hash->{PORT}";
if( my $socket = IO::Socket::INET->new(LocalPort=>$hash->{PORT}, Proto=>'udp', Broadcast=>1, ReuseAddr=>1, ReusePort=>defined(&ReusePort)?1:0) ) { if( my $socket = IO::Socket::INET->new(LocalPort=>$hash->{PORT}, Proto=>'udp', Broadcast=>1, ReuseAddr=>1, ReusePort=>defined(&SO_REUSEPORT)?1:0) ) {
readingsSingleUpdate($hash, 'state', 'listening', 1 ); readingsSingleUpdate($hash, 'state', 'listening', 1 );
Log3 $name, 3, "$name: listening"; Log3 $name, 3, "$name: listening";
$hash->{LAST_CONNECT} = FmtDateTime( gettimeofday() ); $hash->{LAST_CONNECT} = FmtDateTime( gettimeofday() );

4
fhem/FHEM/37_fakeRoku.pm
View File

@ -179,7 +179,7 @@ fakeRoku_startDiscovery($)
if( 1 ) { if( 1 ) {
# respond to multicast client discovery messages # respond to multicast client discovery messages
if( my $socket = IO::Socket::Multicast->new(Proto=>'udp', LocalPort=>1900, ReuseAddr=>1, ReusePort=>defined(&ReusePort)?1:0) ) { if( my $socket = IO::Socket::Multicast->new(Proto=>'udp', LocalPort=>1900, ReuseAddr=>1, ReusePort=>defined(&SO_REUSEPORT)?1:0) ) {
$socket->mcast_add('239.255.255.250'); $socket->mcast_add('239.255.255.250');
my $chash = fakeRoku_newChash( $hash, $socket, my $chash = fakeRoku_newChash( $hash, $socket,
@ -229,7 +229,7 @@ fakeRoku_startListener($)
return undef if( AttrVal($name, "disable", 0 ) == 1 ); return undef if( AttrVal($name, "disable", 0 ) == 1 );
my $port = AttrVal($name, 'httpPort', 0); my $port = AttrVal($name, 'httpPort', 0);
if( my $socket = IO::Socket::INET->new(LocalPort=>$port, Listen=>10, Blocking=>0, ReuseAddr=>1, ReusePort=>defined(&ReusePort)?1:0) ) { if( my $socket = IO::Socket::INET->new(LocalPort=>$port, Listen=>10, Blocking=>0, ReuseAddr=>1, ReusePort=>defined(&SO_REUSEPORT)?1:0) ) {
readingsSingleUpdate($hash, 'state', 'listening', 1 ); readingsSingleUpdate($hash, 'state', 'listening', 1 );

18
fhem/FHEM/37_plex.pm
View File

@ -260,7 +260,7 @@ plex_startDiscovery($)
return undef if( AttrVal($name, "disable", 0 ) == 1 ); return undef if( AttrVal($name, "disable", 0 ) == 1 );
# udp multicast for servers # udp multicast for servers
if( my $socket = IO::Socket::Multicast->new(Proto => 'udp', Timeout => 5, ReuseAddr=>1, ReusePort=>defined(&ReusePort)?1:0) ) { if( my $socket = IO::Socket::Multicast->new(Proto => 'udp', Timeout => 5, ReuseAddr=>1, ReusePort=>defined(&SO_REUSEPORT)?1:0) ) {
my $chash = plex_newChash( $hash, $socket, my $chash = plex_newChash( $hash, $socket,
{NAME=>"$name:serverDiscoveryMcast", STATE=>'discovering', multicast => 1} ); {NAME=>"$name:serverDiscoveryMcast", STATE=>'discovering', multicast => 1} );
@ -300,7 +300,7 @@ plex_startDiscovery($)
} }
# udp multicast for clients # udp multicast for clients
if( my $socket = IO::Socket::Multicast->new(Proto=>'udp', ReuseAddr=>1, ReusePort=>defined(&ReusePort)?1:0) ) { if( my $socket = IO::Socket::Multicast->new(Proto=>'udp', ReuseAddr=>1, ReusePort=>defined(&SO_REUSEPORT)?1:0) ) {
$socket->mcast_add('239.0.0.250'); $socket->mcast_add('239.0.0.250');
my $chash = plex_newChash( $hash, $socket, my $chash = plex_newChash( $hash, $socket,
@ -342,7 +342,7 @@ plex_startDiscovery($)
} }
# listen for udp mulicast HELLO and BYE messages from PHT # listen for udp mulicast HELLO and BYE messages from PHT
if( my $socket = IO::Socket::Multicast->new(Proto=>'udp', LocalPort=>32413, ReuseAddr=>1, ReusePort=>defined(&ReusePort)?1:0) ) { if( my $socket = IO::Socket::Multicast->new(Proto=>'udp', LocalPort=>32413, ReuseAddr=>1, ReusePort=>defined(&SO_REUSEPORT)?1:0) ) {
$socket->mcast_add('239.0.0.250'); $socket->mcast_add('239.0.0.250');
my $chash = plex_newChash( $hash, $socket, my $chash = plex_newChash( $hash, $socket,
@ -359,7 +359,7 @@ plex_startDiscovery($)
} }
# listen for udp multicast server UPDATE messages (playerAdd, playerDel) # listen for udp multicast server UPDATE messages (playerAdd, playerDel)
# if( my $socket = IO::Socket::Multicast->new(Proto=>'udp', LocalPort=>32415, ReuseAddr=>1, ReusePort=>defined(&ReusePort)?1:0) ) { # if( my $socket = IO::Socket::Multicast->new(Proto=>'udp', LocalPort=>32415, ReuseAddr=>1, ReusePort=>defined(&SO_REUSEPORT)?1:0) ) {
# $socket->mcast_add('239.0.0.250'); # $socket->mcast_add('239.0.0.250');
# #
# my $chash = plex_newChash( $hash, $socket, # my $chash = plex_newChash( $hash, $socket,
@ -377,7 +377,7 @@ plex_startDiscovery($)
if( AttrVal($name, 'responder', undef) ) { if( AttrVal($name, 'responder', undef) ) {
# respond to multicast client discovery messages # respond to multicast client discovery messages
if( my $socket = IO::Socket::Multicast->new(Proto=>'udp', LocalPort=>32412, ReuseAddr=>1, ReusePort=>defined(&ReusePort)?1:0) ) { if( my $socket = IO::Socket::Multicast->new(Proto=>'udp', LocalPort=>32412, ReuseAddr=>1, ReusePort=>defined(&SO_REUSEPORT)?1:0) ) {
$socket->mcast_add('239.0.0.250'); $socket->mcast_add('239.0.0.250');
my $chash = plex_newChash( $hash, $socket, my $chash = plex_newChash( $hash, $socket,
@ -394,7 +394,7 @@ plex_startDiscovery($)
} }
# respond to broadcast client discovery messages # respond to broadcast client discovery messages
#if( my $socket = new IO::Socket::INET ( Proto => 'udp', Broadcast => 1, LocalAddr => '0.0.0.0', LocalPort => 32412, ReuseAddr=>1, ReusePort=>defined(&ReusePort)?1:0) ) { #if( my $socket = new IO::Socket::INET ( Proto => 'udp', Broadcast => 1, LocalAddr => '0.0.0.0', LocalPort => 32412, ReuseAddr=>1, ReusePort=>defined(&SO_REUSEPORT)?1:0) ) {
# my $chash = plex_newChash( $hash, $socket, # my $chash = plex_newChash( $hash, $socket,
# {NAME=>"$name:clientDiscoveryResponderBcast", STATE=>'listening', broadcast => 1} ); # {NAME=>"$name:clientDiscoveryResponderBcast", STATE=>'listening', broadcast => 1} );
@ -605,7 +605,7 @@ plex_sendTimelines($$)
if( $hash->{helper}{subscriptionsFrom}{$key} ) { if( $hash->{helper}{subscriptionsFrom}{$key} ) {
$chash = $hash->{helper}{subscriptionsFrom}{$key}; $chash = $hash->{helper}{subscriptionsFrom}{$key};
} elsif( my $socket = IO::Socket::INET->new(PeerAddr=>$addr, Timeout=>2, Blocking=>1, ReuseAddr=>1, ReusePort=>defined(&ReusePort)?1:0) ) { } elsif( my $socket = IO::Socket::INET->new(PeerAddr=>$addr, Timeout=>2, Blocking=>1, ReuseAddr=>1, ReusePort=>defined(&SO_REUSEPORT)?1:0) ) {
$chash = plex_newChash( $hash, $socket, $chash = plex_newChash( $hash, $socket,
{NAME=>"$name:timelineSubscription:$addr", STATE=>'opened', timeline=>1} ); {NAME=>"$name:timelineSubscription:$addr", STATE=>'opened', timeline=>1} );
@ -743,7 +743,7 @@ plex_startTimelineListener($)
return undef if( AttrVal($name, "disable", 0 ) == 1 ); return undef if( AttrVal($name, "disable", 0 ) == 1 );
my $port = AttrVal($name, 'httpPort', 0); my $port = AttrVal($name, 'httpPort', 0);
if( my $socket = IO::Socket::INET->new(LocalPort=>$port, Listen=>10, Blocking=>0, ReuseAddr=>1, ReusePort=>defined(&ReusePort)?1:0) ) { if( my $socket = IO::Socket::INET->new(LocalPort=>$port, Listen=>10, Blocking=>0, ReuseAddr=>1, ReusePort=>defined(&SO_REUSEPORT)?1:0) ) {
my $chash = plex_newChash( $hash, $socket, my $chash = plex_newChash( $hash, $socket,
{NAME=>"$name:timelineListener", STATE=>'accepting'} ); {NAME=>"$name:timelineListener", STATE=>'accepting'} );
@ -2469,7 +2469,7 @@ plex_requestNotifications($$)
return if( $hash->{helper}{websockets}{$server->{machineIdentifier}} ); return if( $hash->{helper}{websockets}{$server->{machineIdentifier}} );
if( my $socket = IO::Socket::INET->new(PeerAddr=>"$server->{address}:$server->{port}", Timeout=>2, Blocking=>1, ReuseAddr=>1, ReusePort=>defined(&ReusePort)?1:0) ) { if( my $socket = IO::Socket::INET->new(PeerAddr=>"$server->{address}:$server->{port}", Timeout=>2, Blocking=>1, ReuseAddr=>1, ReusePort=>defined(&SO_REUSEPORT)?1:0) ) {
my $chash = plex_newChash( $hash, $socket, my $chash = plex_newChash( $hash, $socket,
{NAME=>"$name:websocket:$server->{machineIdentifier}", STATE=>'listening', websocket=>0} ); {NAME=>"$name:websocket:$server->{machineIdentifier}", STATE=>'listening', websocket=>0} );