Force usage of assert() condition when NDEBUG is defined

[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 7a27f708c84bd91840784c518052656bb39bebec..ed185b1ea8934dd39af312258e9c858b984d8b85 100644 (file)
--- a/src/common/sessiond-comm/sessiond-comm.c
+++ b/src/common/sessiond-comm/sessiond-comm.c
@@ -1,23 +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 _LGPL_SOURCE
-#include <assert.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,14 +14,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 */
@@ -101,7 +91,7 @@ int lttcomm_create_sock(struct lttcomm_sock *sock)
 {
        int ret, _sock_type, _sock_proto, domain;
 
-       assert(sock);
+       LTTNG_ASSERT(sock);
 
        domain = sock->sockaddr.type;
        if (domain != LTTCOMM_INET && domain != LTTCOMM_INET6) {
@@ -167,7 +157,7 @@ struct lttcomm_sock *lttcomm_alloc_copy_sock(struct lttcomm_sock *src)
        struct lttcomm_sock *sock;
 
        /* Safety net */
-       assert(src);
+       LTTNG_ASSERT(src);
 
        sock = lttcomm_alloc_sock(src->proto);
        if (sock == NULL) {
@@ -190,8 +180,8 @@ LTTNG_HIDDEN
 void lttcomm_copy_sock(struct lttcomm_sock *dst, struct lttcomm_sock *src)
 {
        /* Safety net */
-       assert(dst);
-       assert(src);
+       LTTNG_ASSERT(dst);
+       LTTNG_ASSERT(src);
 
        dst->proto = src->proto;
        dst->fd = src->fd;
@@ -209,9 +199,9 @@ int lttcomm_init_inet_sockaddr(struct lttcomm_sockaddr *sockaddr,
 {
        int ret;
 
-       assert(sockaddr);
-       assert(ip);
-       assert(port > 0 && port <= 65535);
+       LTTNG_ASSERT(sockaddr);
+       LTTNG_ASSERT(ip);
+       LTTNG_ASSERT(port > 0 && port <= 65535);
 
        memset(sockaddr, 0, sizeof(struct lttcomm_sockaddr));
 
@@ -240,9 +230,9 @@ int lttcomm_init_inet6_sockaddr(struct lttcomm_sockaddr *sockaddr,
 {
        int ret;
 
-       assert(sockaddr);
-       assert(ip);
-       assert(port > 0 && port <= 65535);
+       LTTNG_ASSERT(sockaddr);
+       LTTNG_ASSERT(ip);
+       LTTNG_ASSERT(port > 0 && port <= 65535);
 
        memset(sockaddr, 0, sizeof(struct lttcomm_sockaddr));
 
@@ -271,7 +261,7 @@ struct lttcomm_sock *lttcomm_alloc_sock_from_uri(struct lttng_uri *uri)
        struct lttcomm_sock *sock = NULL;
 
        /* Safety net */
-       assert(uri);
+       LTTNG_ASSERT(uri);
 
        /* Check URI protocol */
        if (uri->proto == LTTNG_TCP) {
@@ -336,7 +326,7 @@ struct lttcomm_relayd_sock *lttcomm_alloc_relayd_sock(struct lttng_uri *uri,
        struct lttcomm_sock *tmp_sock = NULL;
        struct lttcomm_relayd_sock *rsock = NULL;
 
-       assert(uri);
+       LTTNG_ASSERT(uri);
 
        rsock = zmalloc(sizeof(*rsock));
        if (!rsock) {
@@ -413,6 +403,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)
+{
+       LTTNG_ASSERT(sock);
+       LTTNG_ASSERT(port);
+       LTTNG_ASSERT(sock->sockaddr.type == LTTCOMM_INET ||
+                       sock->sockaddr.type == LTTCOMM_INET6);
+       LTTNG_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)
+{
+       LTTNG_ASSERT(sock);
+       LTTNG_ASSERT(sock->sockaddr.type == LTTCOMM_INET ||
+                       sock->sockaddr.type == LTTCOMM_INET6);
+       LTTNG_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)
 {