struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
{
int new_fd;
- socklen_t len = 0;
+ socklen_t len;
struct lttcomm_sock *new_sock;
if (sock->proto == LTTCOMM_SOCK_UDP) {
goto error;
}
+ len = sizeof(new_sock->sockaddr.addr.sin);
+
/* Blocking call */
new_fd = accept(sock->fd, (struct sockaddr *) &new_sock->sockaddr.addr.sin,
&len);
struct msghdr msg;
struct iovec iov[1];
ssize_t ret = -1;
+ size_t len_last;
memset(&msg, 0, sizeof(msg));
msg.msg_name = (struct sockaddr *) &sock->sockaddr.addr.sin;
msg.msg_namelen = sizeof(sock->sockaddr.addr.sin);
- if (flags == 0) {
- flags = MSG_WAITALL;
- }
-
do {
+ len_last = iov[0].iov_len;
ret = recvmsg(sock->fd, &msg, flags);
- } while (ret < 0 && errno == EINTR);
+ if (ret > 0) {
+ iov[0].iov_base += ret;
+ iov[0].iov_len -= ret;
+ assert(ret <= len_last);
+ }
+ } while ((ret > 0 && ret < len_last) || (ret < 0 && errno == EINTR));
if (ret < 0) {
PERROR("recvmsg inet");
+ } else if (ret > 0) {
+ ret = len;
}
+ /* Else ret = 0 meaning an orderly shutdown. */
return ret;
}