X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.c;h=6c00a71bcddb8529a872bec96ec6895a3a055c1a;hb=44635d77b591f83a80d48cd93497bd1cd6aa788d;hp=65952b273eaf49c52a17955ab6bda441bd65f554;hpb=783a3b9aa609d6805e1463655d25c7ae176c4859;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.c b/src/common/sessiond-comm/sessiond-comm.c
index 65952b273..6c00a71bc 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>
@@ -25,14 +15,15 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <errno.h>
+#include <inttypes.h>
 
 #include <common/common.h>
+#include <common/compat/errno.h>
 
 #include "sessiond-comm.h"
 
 /* For Unix socket */
-#include "unix.h"
+#include <common/unix.h>
 /* For Inet socket */
 #include "inet.h"
 /* For Inet6 socket */
@@ -413,6 +404,53 @@ int lttcomm_setsockopt_snd_timeout(int sock, unsigned int msec)
 	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)
 {