/*
- * Copyright (C) 2012 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2012 David Goulet <dgoulet@efficios.com>
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
*
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#define _LGPL_SOURCE
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
-#include <errno.h>
#include <fcntl.h>
#include <common/compat/time.h>
#include <poll.h>
#include <common/common.h>
#include <common/time.h>
+#include <common/compat/errno.h>
#include "inet.h"
int lttcomm_bind_inet_sock(struct lttcomm_sock *sock)
{
return bind(sock->fd,
- (const struct sockaddr *) &sock->sockaddr.addr.sin,
+ (const struct sockaddr *) ALIGNED_CONST_PTR(
+ sock->sockaddr.addr.sin),
sizeof(sock->sockaddr.addr.sin));
}
static
int connect_no_timeout(struct lttcomm_sock *sock)
{
- return connect(sock->fd, (struct sockaddr *) &sock->sockaddr.addr.sin,
+ return connect(sock->fd,
+ (const struct sockaddr *) ALIGNED_CONST_PTR(
+ sock->sockaddr.addr.sin),
sizeof(sock->sockaddr.addr.sin));
}
-/*
- * Return time_a - time_b in milliseconds.
- */
-static
-unsigned long time_diff_ms(struct timespec *time_a,
- struct timespec *time_b)
-{
- time_t sec_diff;
- long nsec_diff;
- unsigned long result_ms;
-
- sec_diff = time_a->tv_sec - time_b->tv_sec;
- nsec_diff = time_a->tv_nsec - time_b->tv_nsec;
-
- result_ms = sec_diff * MSEC_PER_SEC;
- result_ms += nsec_diff / NSEC_PER_MSEC;
- return result_ms;
-}
-
static
int connect_with_timeout(struct lttcomm_sock *sock)
{
unsigned long timeout = lttcomm_get_network_timeout();
int ret, flags, connect_ret;
struct timespec orig_time, cur_time;
+ unsigned long diff_ms;
ret = fcntl(sock->fd, F_GETFL, 0);
if (ret == -1) {
}
connect_ret = connect(sock->fd,
- (struct sockaddr *) &sock->sockaddr.addr.sin,
- sizeof(sock->sockaddr.addr.sin));
- if (connect_ret == -1 && errno != EAGAIN
- && errno != EWOULDBLOCK
- && errno != EINPROGRESS) {
+ (const struct sockaddr *) ALIGNED_CONST_PTR(
+ sock->sockaddr.addr.sin),
+ sizeof(sock->sockaddr.addr.sin));
+ if (connect_ret == -1 && errno != EAGAIN && errno != EWOULDBLOCK &&
+ errno != EINPROGRESS) {
goto error;
} else if (!connect_ret) {
/* Connect succeeded */
connect_ret = ret;
goto error;
}
- } while (time_diff_ms(&cur_time, &orig_time) < timeout);
+ if (timespec_to_ms(timespec_abs_diff(cur_time, orig_time), &diff_ms) < 0) {
+ ERR("timespec_to_ms input overflows milliseconds output");
+ connect_ret = -1;
+ goto error;
+ }
+ } while (diff_ms < timeout);
/* Timeout */
errno = ETIMEDOUT;
socklen_t len;
struct lttcomm_sock *new_sock;
unsigned long timeout;
+ struct sockaddr_in new_addr = {};
if (sock->proto == LTTCOMM_SOCK_UDP) {
/*
goto error;
}
- len = sizeof(new_sock->sockaddr.addr.sin);
+ len = sizeof(new_addr);
/* Blocking call */
- new_fd = accept(sock->fd, (struct sockaddr *) &new_sock->sockaddr.addr.sin,
- &len);
+ new_fd = accept(sock->fd, (struct sockaddr *) &new_addr, &len);
if (new_fd < 0) {
PERROR("accept inet");
goto error;
}
+ new_sock->sockaddr.addr.sin = new_addr;
timeout = lttcomm_get_network_timeout();
if (timeout) {
int ret;
struct iovec iov[1];
ssize_t ret = -1;
size_t len_last;
+ struct sockaddr_in addr = sock->sockaddr.addr.sin;
memset(&msg, 0, sizeof(msg));
msg.msg_iov = iov;
msg.msg_iovlen = 1;
- msg.msg_name = (struct sockaddr *) &sock->sockaddr.addr.sin;
+ msg.msg_name = (struct sockaddr *) &addr;
msg.msg_namelen = sizeof(sock->sockaddr.addr.sin);
do {
} while ((ret > 0 && ret < len_last) || (ret < 0 && errno == EINTR));
if (ret < 0) {
+ if (errno == EAGAIN && flags & MSG_DONTWAIT) {
+ /*
+ * EAGAIN is expected in non-blocking mode and should
+ * not be reported as an error. Moreover, if no data
+ * was read, 0 must not be returned as it would be
+ * interpreted as an orderly shutdown of the socket.
+ */
+ goto end;
+ }
PERROR("recvmsg inet");
} else if (ret > 0) {
ret = len;
switch (sock->proto) {
case LTTCOMM_SOCK_UDP:
- msg.msg_name = (struct sockaddr *) &sock->sockaddr.addr.sin;
+ {
+ struct sockaddr_in addr = sock->sockaddr.addr.sin;
+
+ msg.msg_name = (struct sockaddr *) &addr;
msg.msg_namelen = sizeof(sock->sockaddr.addr.sin);
break;
+ }
default:
break;
}
projects / lttng-tools.git / blobdiff