|
 |
04bfb0 |
From f1000aa2d58fbed2741dbb2887b668f872ef0cb8 Mon Sep 17 00:00:00 2001
|
|
|
04bfb0 |
From: Tony Cook <tony@develop-help.com>
|
|
|
04bfb0 |
Date: Mon, 18 Mar 2019 15:05:32 +1100
|
|
|
04bfb0 |
Subject: [PATCH] (perl #133936) ensure TO is honoured for UDP $sock->send()
|
|
|
04bfb0 |
MIME-Version: 1.0
|
|
|
04bfb0 |
Content-Type: text/plain; charset=UTF-8
|
|
|
04bfb0 |
Content-Transfer-Encoding: 8bit
|
|
|
04bfb0 |
|
|
|
04bfb0 |
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
04bfb0 |
---
|
|
|
04bfb0 |
dist/IO/lib/IO/Socket.pm | 7 ++++---
|
|
|
04bfb0 |
dist/IO/t/io_udp.t | 31 +++++++++++++++++++++++++++----
|
|
|
04bfb0 |
2 files changed, 31 insertions(+), 7 deletions(-)
|
|
|
04bfb0 |
|
|
|
04bfb0 |
diff --git a/dist/IO/lib/IO/Socket.pm b/dist/IO/lib/IO/Socket.pm
|
|
|
04bfb0 |
index 1bf57ab826..a34a10b232 100644
|
|
|
04bfb0 |
--- a/dist/IO/lib/IO/Socket.pm
|
|
|
04bfb0 |
+++ b/dist/IO/lib/IO/Socket.pm
|
|
|
04bfb0 |
@@ -282,9 +282,10 @@ sub send {
|
|
|
04bfb0 |
croak 'send: Cannot determine peer address'
|
|
|
04bfb0 |
unless(defined $peer);
|
|
|
04bfb0 |
|
|
|
04bfb0 |
- my $r = defined(getpeername($sock))
|
|
|
04bfb0 |
- ? send($sock, $_[1], $flags)
|
|
|
04bfb0 |
- : send($sock, $_[1], $flags, $peer);
|
|
|
04bfb0 |
+ my $type = $sock->socktype;
|
|
|
04bfb0 |
+ my $r = $type == SOCK_DGRAM || $type == SOCK_RAW
|
|
|
04bfb0 |
+ ? send($sock, $_[1], $flags, $peer)
|
|
|
04bfb0 |
+ : send($sock, $_[1], $flags);
|
|
|
04bfb0 |
|
|
|
04bfb0 |
# remember who we send to, if it was successful
|
|
|
04bfb0 |
${*$sock}{'io_socket_peername'} = $peer
|
|
|
04bfb0 |
diff --git a/dist/IO/t/io_udp.t b/dist/IO/t/io_udp.t
|
|
|
04bfb0 |
index d7e95a8829..571e4303bb 100644
|
|
|
04bfb0 |
--- a/dist/IO/t/io_udp.t
|
|
|
04bfb0 |
+++ b/dist/IO/t/io_udp.t
|
|
|
04bfb0 |
@@ -15,6 +15,8 @@ BEGIN {
|
|
|
04bfb0 |
skip_all($reason) if $reason;
|
|
|
04bfb0 |
}
|
|
|
04bfb0 |
|
|
|
04bfb0 |
+use strict;
|
|
|
04bfb0 |
+
|
|
|
04bfb0 |
sub compare_addr {
|
|
|
04bfb0 |
no utf8;
|
|
|
04bfb0 |
my $a = shift;
|
|
|
04bfb0 |
@@ -36,18 +38,18 @@ sub compare_addr {
|
|
|
04bfb0 |
"$a[0]$a[1]" eq "$b[0]$b[1]";
|
|
|
04bfb0 |
}
|
|
|
04bfb0 |
|
|
|
04bfb0 |
-plan(7);
|
|
|
04bfb0 |
+plan(15);
|
|
|
04bfb0 |
watchdog(15);
|
|
|
04bfb0 |
|
|
|
04bfb0 |
use Socket;
|
|
|
04bfb0 |
use IO::Socket qw(AF_INET SOCK_DGRAM INADDR_ANY);
|
|
|
04bfb0 |
|
|
|
04bfb0 |
-$udpa = IO::Socket::INET->new(Proto => 'udp', LocalAddr => 'localhost')
|
|
|
04bfb0 |
+my $udpa = IO::Socket::INET->new(Proto => 'udp', LocalAddr => 'localhost')
|
|
|
04bfb0 |
|| IO::Socket::INET->new(Proto => 'udp', LocalAddr => '127.0.0.1')
|
|
|
04bfb0 |
or die "$! (maybe your system does not have a localhost at all, 'localhost' or 127.0.0.1)";
|
|
|
04bfb0 |
ok(1);
|
|
|
04bfb0 |
|
|
|
04bfb0 |
-$udpb = IO::Socket::INET->new(Proto => 'udp', LocalAddr => 'localhost')
|
|
|
04bfb0 |
+my $udpb = IO::Socket::INET->new(Proto => 'udp', LocalAddr => 'localhost')
|
|
|
04bfb0 |
|| IO::Socket::INET->new(Proto => 'udp', LocalAddr => '127.0.0.1')
|
|
|
04bfb0 |
or die "$! (maybe your system does not have a localhost at all, 'localhost' or 127.0.0.1)";
|
|
|
04bfb0 |
ok(1);
|
|
|
04bfb0 |
@@ -56,6 +58,7 @@ $udpa->send('BORK', 0, $udpb->sockname);
|
|
|
04bfb0 |
|
|
|
04bfb0 |
ok(compare_addr($udpa->peername,$udpb->sockname, 'peername', 'sockname'));
|
|
|
04bfb0 |
|
|
|
04bfb0 |
+my $buf;
|
|
|
04bfb0 |
my $where = $udpb->recv($buf="", 4);
|
|
|
04bfb0 |
is($buf, 'BORK');
|
|
|
04bfb0 |
|
|
|
04bfb0 |
@@ -69,7 +72,27 @@ $udpb->send('FOObar', @xtra);
|
|
|
04bfb0 |
$udpa->recv($buf="", 6);
|
|
|
04bfb0 |
is($buf, 'FOObar');
|
|
|
04bfb0 |
|
|
|
04bfb0 |
-ok(! $udpa->connected);
|
|
|
04bfb0 |
+{
|
|
|
04bfb0 |
+ # check the TO parameter passed to $sock->send() is honoured for UDP sockets
|
|
|
04bfb0 |
+ # [perl #133936]
|
|
|
04bfb0 |
+ my $udpc = IO::Socket::INET->new(Proto => 'udp', LocalAddr => 'localhost')
|
|
|
04bfb0 |
+ || IO::Socket::INET->new(Proto => 'udp', LocalAddr => '127.0.0.1')
|
|
|
04bfb0 |
+ or die "$! (maybe your system does not have a localhost at all, 'localhost' or 127.0.0.1)";
|
|
|
04bfb0 |
+ pass("created C socket");
|
|
|
04bfb0 |
+
|
|
|
04bfb0 |
+ ok($udpc->connect($udpa->sockname), "connect C to A");
|
|
|
04bfb0 |
+
|
|
|
04bfb0 |
+ ok($udpc->connected, "connected a UDP socket");
|
|
|
04bfb0 |
+
|
|
|
04bfb0 |
+ ok($udpc->send("fromctoa"), "send to a");
|
|
|
04bfb0 |
+
|
|
|
04bfb0 |
+ ok($udpa->recv($buf = "", 8), "recv it");
|
|
|
04bfb0 |
+ is($buf, "fromctoa", "check value received");
|
|
|
04bfb0 |
+
|
|
|
04bfb0 |
+ ok($udpc->send("fromctob", 0, $udpb->sockname), "send to non-connected socket");
|
|
|
04bfb0 |
+ ok($udpb->recv($buf = "", 8), "recv it");
|
|
|
04bfb0 |
+ is($buf, "fromctob", "check value received");
|
|
|
04bfb0 |
+}
|
|
|
04bfb0 |
|
|
|
04bfb0 |
exit(0);
|
|
|
04bfb0 |
|
|
|
04bfb0 |
--
|
|
|
04bfb0 |
2.20.1
|
|
|
04bfb0 |
|