From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 7 Mar 2018 09:31:11 +0000 (+0100)
Subject: vici: Make sure to read all requested data from socket in Perl binding
X-Git-Tag: 5.6.3dr1~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70d99d67d69fc62c6cb271fa862038eec606a586;p=thirdparty%2Fstrongswan.git

vici: Make sure to read all requested data from socket in Perl binding

Closes strongswan/strongswan#91.
---

diff --git a/src/libcharon/plugins/vici/perl/Vici-Session/lib/Vici/Transport.pm b/src/libcharon/plugins/vici/perl/Vici-Session/lib/Vici/Transport.pm
index 6524bf76df..b0a7b62852 100644
--- a/src/libcharon/plugins/vici/perl/Vici-Session/lib/Vici/Transport.pm
+++ b/src/libcharon/plugins/vici/perl/Vici-Session/lib/Vici/Transport.pm
@@ -22,12 +22,27 @@ sub send {
 sub receive {
     my $self = shift;
     my $packet_header;
-    my $data;
 
-    $self->{'Socket'}->recv($packet_header, 4);
+    $packet_header = $self->_recv_all(4);
     my $packet_len = unpack('N', $packet_header);
-    $self->{'Socket'}->recv($data, $packet_len);
-	return $data;
+    return $self->_recv_all($packet_len);
+}
+
+sub _recv_all {
+    my ($self, $len) = @_;
+    my $data;
+
+    while ($len)
+    {
+        my $buf;
+        unless (defined $self->{'Socket'}->recv($buf, $len))
+        {
+            die "error reading from socket\n";
+        }
+        $len -= length($buf);
+        $data .= $buf;
+    }
+    return $data;
 }
 
 1;