projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Backport: Fix: relayd streams can be leaked on connection error
[lttng-tools.git]
/
src
/
common
/
sessiond-comm
/
inet6.c
diff --git
a/src/common/sessiond-comm/inet6.c
b/src/common/sessiond-comm/inet6.c
index 1fd18a96258382e408df8c30fe8e250b456cd11d..a041038eb910c9af486fd89b4a15333883876ac4 100644
(file)
--- a/
src/common/sessiond-comm/inet6.c
+++ b/
src/common/sessiond-comm/inet6.c
@@
-370,6
+370,9
@@
ssize_t lttcomm_recvmsg_inet6_sock(struct lttcomm_sock *sock, void *buf,
len_last = iov[0].iov_len;
ret = recvmsg(sock->fd, &msg, flags);
if (ret > 0) {
len_last = iov[0].iov_len;
ret = recvmsg(sock->fd, &msg, flags);
if (ret > 0) {
+ if (flags & MSG_DONTWAIT) {
+ goto end;
+ }
iov[0].iov_base += ret;
iov[0].iov_len -= ret;
assert(ret <= len_last);
iov[0].iov_base += ret;
iov[0].iov_len -= ret;
assert(ret <= len_last);
@@
-381,7
+384,7
@@
ssize_t lttcomm_recvmsg_inet6_sock(struct lttcomm_sock *sock, void *buf,
ret = len;
}
/* Else ret = 0 meaning an orderly shutdown. */
ret = len;
}
/* Else ret = 0 meaning an orderly shutdown. */
-
+end:
return ret;
}
return ret;
}
This page took
0.02847 seconds
and
5
git commands to generate.