1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
|
Description: Fix GnuTLS send/recv when returning a lower value than expected
gnutls_record_send() / gnutls_record_recv() may be interrupted after some data
transmission but before the message was completely read/written. When this
happen, the value returned by the function is positive but lower that the size
of the read/write. In this case, we should not return an error, but rather
loop to recv/send the missing data.
Author: Romain Tartière <romain@blogreen.org>
Forwarded: https://git.madhouse-project.org/algernon/riemann-c-client/pulls/14
---
--- riemann-c-client-1.10.4.orig/lib/riemann/client/tls-gnutls.c
+++ riemann-c-client-1.10.4/lib/riemann/client/tls-gnutls.c
@@ -202,13 +202,18 @@ _riemann_client_send_message_tls (rieman
if (!buffer)
return -errno;
- do {
- sent = gnutls_record_send (client->tls.session, buffer, len);
- } while (sent == GNUTLS_E_AGAIN || sent == GNUTLS_E_INTERRUPTED);
- if (sent < 0 || (size_t)sent != len)
+ size_t left = len;
+ while (left > 0)
{
- free (buffer);
- return -EPROTO;
+ do {
+ sent = gnutls_record_send (client->tls.session, buffer + len - left, left);
+ } while (sent == GNUTLS_E_AGAIN || sent == GNUTLS_E_INTERRUPTED);
+ if (sent < 0)
+ {
+ free (buffer);
+ return -EPROTO;
+ }
+ left -= sent;
}
free (buffer);
return 0;
@@ -220,28 +225,41 @@ _riemann_client_recv_message_tls (rieman
uint32_t header, len;
uint8_t *buffer;
ssize_t received;
+ size_t left;
riemann_message_t *message;
- do {
- received = gnutls_record_recv (client->tls.session, &header, sizeof (header));
- } while (received == GNUTLS_E_AGAIN || received == GNUTLS_E_INTERRUPTED);
- if (received != sizeof (header))
+ len = sizeof (header);
+ left = len;
+ while (left > 0)
{
- errno = EPROTO;
- return NULL;
+ do {
+ received = gnutls_record_recv (client->tls.session, &header + len - left, left);
+ } while (received == GNUTLS_E_AGAIN || received == GNUTLS_E_INTERRUPTED);
+ if (received <= 0)
+ {
+ errno = EPROTO;
+ return NULL;
+ }
+ left -= received;
}
+
len = ntohl (header);
buffer = (uint8_t *) malloc (len);
- do {
- received = gnutls_record_recv (client->tls.session, buffer, len);
- } while (received == GNUTLS_E_AGAIN || received == GNUTLS_E_INTERRUPTED);
- if (received != len)
+ left = len;
+ while (left > 0)
{
- free (buffer);
- errno = EPROTO;
- return NULL;
+ do {
+ received = gnutls_record_recv (client->tls.session, buffer + len - left, left);
+ } while (received == GNUTLS_E_AGAIN || received == GNUTLS_E_INTERRUPTED);
+ if (received <= 0)
+ {
+ free (buffer);
+ errno = EPROTO;
+ return NULL;
+ }
+ left -= received;
}
message = riemann_message_from_buffer (buffer, len);
|
