X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Finet.c;h=84bee5bd99142970ece0b1e1a1e9c2a0be10c720;hb=389fbf04b41e2002be44a1e3392bfade2f1deeef;hp=32a16a690342976a68c4d84f6e5c94abd7ad6d14;hpb=475cd9fa36ab2ad108f94bb8292bdcdbbbc6e38f;p=lttng-tools.git diff --git a/src/common/sessiond-comm/inet.c b/src/common/sessiond-comm/inet.c index 32a16a690..84bee5bd9 100644 --- a/src/common/sessiond-comm/inet.c +++ b/src/common/sessiond-comm/inet.c @@ -15,7 +15,7 @@ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE +#define _LGPL_SOURCE #include #include #include @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include @@ -103,7 +103,7 @@ int lttcomm_bind_inet_sock(struct lttcomm_sock *sock) { int ret; - ret = bind(sock->fd, &sock->sockaddr.addr.sin, + ret = bind(sock->fd, (const struct sockaddr *) &sock->sockaddr.addr.sin, sizeof(sock->sockaddr.addr.sin)); if (ret < 0) { PERROR("bind inet"); @@ -159,7 +159,7 @@ int connect_with_timeout(struct lttcomm_sock *sock) return -1; } - ret = clock_gettime(CLOCK_MONOTONIC, &orig_time); + ret = lttng_clock_gettime(CLOCK_MONOTONIC, &orig_time); if (ret == -1) { PERROR("clock_gettime"); return -1; @@ -213,7 +213,7 @@ int connect_with_timeout(struct lttcomm_sock *sock) } } /* ret == 0: timeout */ - ret = clock_gettime(CLOCK_MONOTONIC, &cur_time); + ret = lttng_clock_gettime(CLOCK_MONOTONIC, &cur_time); if (ret == -1) { PERROR("clock_gettime"); connect_ret = ret; @@ -407,7 +407,7 @@ ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf, * Return the size of sent data. */ LTTNG_HIDDEN -ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, void *buf, +ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, const void *buf, size_t len, int flags) { struct msghdr msg; @@ -416,7 +416,7 @@ ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, void *buf, memset(&msg, 0, sizeof(msg)); - iov[0].iov_base = buf; + iov[0].iov_base = (void *) buf; iov[0].iov_len = len; msg.msg_iov = iov; msg.msg_iovlen = 1;