Fix: unprivilieged sessiond agent port clashes with root sessiond

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

diff --git a/src/common/sessiond-comm/sessiond-comm.c b/src/common/sessiond-comm/sessiond-comm.c
index a985dc7fe790994fe37b3d95af93f6bbf0b071f6..0067be1636ecca662e52e5eb569adfbd0cd5fa98 100644 (file)
--- a/src/common/sessiond-comm/sessiond-comm.c
+++ b/src/common/sessiond-comm/sessiond-comm.c
@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <assert.h>
 #include <limits.h>
@@ -27,13 +26,14 @@
 #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 */
@@ -414,6 +414,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)
 {