Fix: Silence warning by casting *sin_addr to *sockaddr

[lttng-tools.git] / src / common / sessiond-comm / inet.c

diff --git a/src/common/sessiond-comm/inet.c b/src/common/sessiond-comm/inet.c
index fa9218769b31c1d903e9cd33e6c12c0e3fbe0bd5..35ce3b6b5c9ca2a720a509d3d95aa172931a221a 100644 (file)
--- 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.
  */
 
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 

-#define _GNU_SOURCE
+#define _LGPL_SOURCE

 #include <assert.h>
 #include <limits.h>
 #include <stdio.h>
 #include <assert.h>
 #include <limits.h>
 #include <stdio.h>


@@ -103,7 +103,7 @@ int lttcomm_bind_inet_sock(struct lttcomm_sock *sock)
 {
        int ret;
 
 {
        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");
                        sizeof(sock->sockaddr.addr.sin));
        if (ret < 0) {
                PERROR("bind inet");


@@ -275,6 +275,7 @@ struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
        int new_fd;
        socklen_t len;
        struct lttcomm_sock *new_sock;
        int new_fd;
        socklen_t len;
        struct lttcomm_sock *new_sock;

+       unsigned long timeout;

 
        if (sock->proto == LTTCOMM_SOCK_UDP) {
                /*
 
        if (sock->proto == LTTCOMM_SOCK_UDP) {
                /*


@@ -298,6 +299,19 @@ struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
                PERROR("accept inet");
                goto error;
        }
                PERROR("accept inet");
                goto error;
        }

+       timeout = lttcomm_get_network_timeout();
+       if (timeout) {
+               int ret;
+
+               ret = lttcomm_setsockopt_rcv_timeout(new_fd, timeout);
+               if (ret) {
+                       goto error_close;
+               }
+               ret = lttcomm_setsockopt_snd_timeout(new_fd, timeout);
+               if (ret) {
+                       goto error_close;
+               }
+       }

 
        new_sock->fd = new_fd;
        new_sock->ops = &inet_ops;
 
        new_sock->fd = new_fd;
        new_sock->ops = &inet_ops;


@@ -305,6 +319,11 @@ struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
 end:
        return new_sock;
 
 end:
        return new_sock;
 

+error_close:
+       if (close(new_fd) < 0) {
+               PERROR("accept inet close fd");
+       }
+

 error:
        free(new_sock);
        return NULL;
 error:
        free(new_sock);
        return NULL;


@@ -457,6 +476,7 @@ int lttcomm_close_inet_sock(struct lttcomm_sock *sock)
 static unsigned long read_proc_value(const char *path)
 {
        int ret, fd;
 static unsigned long read_proc_value(const char *path)
 {
        int ret, fd;

+       ssize_t size_ret;

        long r_val;
        unsigned long val = 0;
        char buf[64];
        long r_val;
        unsigned long val = 0;
        char buf[64];


@@ -466,11 +486,16 @@ static unsigned long read_proc_value(const char *path)
                goto error;
        }
 
                goto error;
        }
 

-       ret = read(fd, buf, sizeof(buf));
-       if (ret < 0) {
+       size_ret = lttng_read(fd, buf, sizeof(buf));
+       /*
+        * Allow reading a file smaller than buf, but keep space for
+        * final \0.
+        */
+       if (size_ret < 0 || size_ret >= sizeof(buf)) {

                PERROR("read proc failed");
                goto error_close;
        }
                PERROR("read proc failed");
                goto error_close;
        }

+       buf[size_ret] = '\0';

 
        errno = 0;
        r_val = strtol(buf, NULL, 10);
 
        errno = 0;
        r_val = strtol(buf, NULL, 10);