Port: Remove _GNU_SOURCE, defined in config.h

[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 2c959c5fe81ee08d21cca8f0ac42a62d0dfecb6c..5727c91199a2cfb3244041444d6cfa374052c276 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.
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <limits.h>
 #include <stdio.h>
@@ -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;
+       unsigned long timeout;
 
        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;
        }
+       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;
@@ -305,6 +319,11 @@ struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
 end:
        return new_sock;
 
+error_close:
+       if (close(new_fd) < 0) {
+               PERROR("accept inet close fd");
+       }
+
 error:
        free(new_sock);
        return NULL;