int lttcomm_bind_inet6_sock(struct lttcomm_sock *sock)
{
return bind(sock->fd,
- (const struct sockaddr *) &sock->sockaddr.addr.sin6,
+ (const struct sockaddr *) ALIGNED_CONST_PTR(
+ sock->sockaddr.addr.sin6),
sizeof(sock->sockaddr.addr.sin6));
}
static
int connect_no_timeout(struct lttcomm_sock *sock)
{
- return connect(sock->fd, (struct sockaddr *) &sock->sockaddr.addr.sin6,
+ return connect(sock->fd,
+ (const struct sockaddr *) ALIGNED_CONST_PTR(
+ sock->sockaddr.addr.sin6),
sizeof(sock->sockaddr.addr.sin6));
}
-/*
- * 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.sin6,
- sizeof(sock->sockaddr.addr.sin6));
- if (connect_ret == -1 && errno != EAGAIN
- && errno != EWOULDBLOCK
- && errno != EINPROGRESS) {
+ (const struct sockaddr *) ALIGNED_CONST_PTR(
+ sock->sockaddr.addr.sin6),
+ sizeof(sock->sockaddr.addr.sin6));
+ 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;
int new_fd;
socklen_t len;
struct lttcomm_sock *new_sock;
+ struct sockaddr_in6 new_addr = {};
if (sock->proto == LTTCOMM_SOCK_UDP) {
/*
goto error;
}
- len = sizeof(new_sock->sockaddr.addr.sin6);
+ len = sizeof(new_addr);
/* Blocking call */
- new_fd = accept(sock->fd,
- (struct sockaddr *) &new_sock->sockaddr.addr.sin6, &len);
+ new_fd = accept(sock->fd, (struct sockaddr *) &new_addr, &len);
if (new_fd < 0) {
PERROR("accept inet6");
goto error;
}
-
+ new_sock->sockaddr.addr.sin6 = new_addr;
new_sock->fd = new_fd;
new_sock->ops = &inet6_ops;
struct iovec iov[1];
ssize_t ret = -1;
size_t len_last;
+ struct sockaddr_in6 addr = sock->sockaddr.addr.sin6;
memset(&msg, 0, sizeof(msg));
msg.msg_iov = iov;
msg.msg_iovlen = 1;
- msg.msg_name = (struct sockaddr *) &sock->sockaddr.addr.sin6;
+ msg.msg_name = (struct sockaddr *) &addr;
msg.msg_namelen = sizeof(sock->sockaddr.addr.sin6);
do {
switch (sock->proto) {
case LTTCOMM_SOCK_UDP:
- msg.msg_name = (struct sockaddr *) &sock->sockaddr.addr.sin6;
+ {
+ struct sockaddr_in6 addr = sock->sockaddr.addr.sin6;
+
+ msg.msg_name = (struct sockaddr *) &addr;
msg.msg_namelen = sizeof(sock->sockaddr.addr.sin6);
break;
+ }
default:
break;
}