X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.c;h=9f00ae181afd42aabd18fc9b0320a35e7569e95a;hp=9a13f41488a9ef6deb61323cf403f7ed8688da1a;hb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;hpb=618a6a28c0956fc6829c165a39ffec97f239096c

diff --git a/src/common/sessiond-comm/sessiond-comm.c b/src/common/sessiond-comm/sessiond-comm.c
index 9a13f4148..9f00ae181 100644
--- a/src/common/sessiond-comm/sessiond-comm.c
+++ b/src/common/sessiond-comm/sessiond-comm.c
@@ -1,22 +1,12 @@
 /*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * 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.
- * 
- * 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 _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <limits.h>
 #include <stdio.h>
@@ -26,18 +16,21 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <errno.h>
+#include <inttypes.h>
 
 #include <common/common.h>
 
 #include "sessiond-comm.h"
 
 /* For Unix socket */
-#include "unix.h"
+#include <common/unix.h>
 /* For Inet socket */
 #include "inet.h"
 /* For Inet6 socket */
 #include "inet6.h"
 
+#define NETWORK_TIMEOUT_ENV	"LTTNG_NETWORK_SOCKET_TIMEOUT"
+
 static struct lttcomm_net_family net_families[] = {
 	{ LTTCOMM_INET, lttcomm_create_inet_sock },
 	{ LTTCOMM_INET6, lttcomm_create_inet6_sock },
@@ -70,6 +63,8 @@ static const char *lttcomm_readable_code[] = {
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_NR) ] = "Unknown error code"
 };
 
+static unsigned long network_timeout;
+
 /*
  * Return ptr to string representing a human readable error code from the
  * lttcomm_return_code enum.
@@ -368,3 +363,117 @@ error_free:
 error:
 	return NULL;
 }
+
+/*
+ * Set socket receiving timeout.
+ */
+LTTNG_HIDDEN
+int lttcomm_setsockopt_rcv_timeout(int sock, unsigned int msec)
+{
+	int ret;
+	struct timeval tv;
+
+	tv.tv_sec = msec / 1000;
+	tv.tv_usec = (msec % 1000) * 1000;
+
+	ret = setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
+	if (ret < 0) {
+		PERROR("setsockopt SO_RCVTIMEO");
+	}
+
+	return ret;
+}
+
+/*
+ * Set socket sending timeout.
+ */
+LTTNG_HIDDEN
+int lttcomm_setsockopt_snd_timeout(int sock, unsigned int msec)
+{
+	int ret;
+	struct timeval tv;
+
+	tv.tv_sec = msec / 1000;
+	tv.tv_usec = (msec % 1000) * 1000;
+
+	ret = setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
+	if (ret < 0) {
+		PERROR("setsockopt SO_SNDTIMEO");
+	}
+
+	return ret;
+}
+
+LTTNG_HIDDEN
+int lttcomm_sock_get_port(const struct lttcomm_sock *sock, uint16_t *port)
+{
+	assert(sock);
+	assert(port);
+	assert(sock->sockaddr.type == LTTCOMM_INET ||
+			sock->sockaddr.type == LTTCOMM_INET6);
+	assert(sock->proto == LTTCOMM_SOCK_TCP ||
+			sock->proto == LTTCOMM_SOCK_UDP);
+
+	switch (sock->sockaddr.type) {
+	case LTTCOMM_INET:
+		*port = ntohs(sock->sockaddr.addr.sin.sin_port);
+		break;
+	case LTTCOMM_INET6:
+		*port = ntohs(sock->sockaddr.addr.sin6.sin6_port);
+		break;
+	default:
+		abort();
+	}
+
+	return 0;
+}
+
+LTTNG_HIDDEN
+int lttcomm_sock_set_port(struct lttcomm_sock *sock, uint16_t port)
+{
+	assert(sock);
+	assert(sock->sockaddr.type == LTTCOMM_INET ||
+			sock->sockaddr.type == LTTCOMM_INET6);
+	assert(sock->proto == LTTCOMM_SOCK_TCP ||
+			sock->proto == LTTCOMM_SOCK_UDP);
+
+	switch (sock->sockaddr.type) {
+	case LTTCOMM_INET:
+		sock->sockaddr.addr.sin.sin_port = htons(port);
+		break;
+	case LTTCOMM_INET6:
+		sock->sockaddr.addr.sin6.sin6_port = htons(port);
+		break;
+	default:
+		abort();
+	}
+
+	return 0;
+}
+
+LTTNG_HIDDEN
+void lttcomm_init(void)
+{
+	const char *env;
+
+	env = getenv(NETWORK_TIMEOUT_ENV);
+	if (env) {
+		long timeout;
+
+		errno = 0;
+		timeout = strtol(env, NULL, 0);
+		if (errno != 0 || timeout < -1L) {
+			PERROR("Network timeout");
+		} else {
+			if (timeout > 0) {
+				network_timeout = timeout;
+			}
+		}
+	}
+}
+
+LTTNG_HIDDEN
+unsigned long lttcomm_get_network_timeout(void)
+{
+	return network_timeout;
+}