X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.c;h=9a13f41488a9ef6deb61323cf403f7ed8688da1a;hb=618a6a28c0956fc6829c165a39ffec97f239096c;hp=8ced84734772bb213a70e9a0e5bf71d9a8515f50;hpb=32dd26fbc3c69fe677a7917535e10ace066e674c;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.c b/src/common/sessiond-comm/sessiond-comm.c
index 8ced84734..9a13f4148 100644
--- a/src/common/sessiond-comm/sessiond-comm.c
+++ b/src/common/sessiond-comm/sessiond-comm.c
@@ -27,8 +27,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <common/defaults.h>
-#include <common/error.h>
+#include <common/common.h>
 
 #include "sessiond-comm.h"
 
@@ -62,6 +61,10 @@ static const char *lttcomm_readable_code[] = {
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_CONSUMERD_SPLICE_EINVAL) ] = "consumerd splice EINVAL",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_CONSUMERD_SPLICE_ENOMEM) ] = "consumerd splice ENOMEM",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_CONSUMERD_SPLICE_ESPIPE) ] = "consumerd splice ESPIPE",
+	[ LTTCOMM_ERR_INDEX(LTTCOMM_CONSUMERD_ENOMEM) ] = "Consumer is out of memory",
+	[ LTTCOMM_ERR_INDEX(LTTCOMM_CONSUMERD_ERROR_METADATA) ] = "Error with metadata",
+	[ LTTCOMM_ERR_INDEX(LTTCOMM_CONSUMERD_FATAL) ] = "Fatal error",
+	[ LTTCOMM_ERR_INDEX(LTTCOMM_CONSUMERD_RELAYD_FAIL) ] = "Error on remote relayd",
 
 	/* Last element */
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_NR) ] = "Unknown error code"
@@ -73,12 +76,12 @@ static const char *lttcomm_readable_code[] = {
  *
  * These code MUST be negative in other to treat that as an error value.
  */
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
 const char *lttcomm_get_readable_code(enum lttcomm_return_code code)
 {
 	code = -code;
 
-	if (code < LTTCOMM_CONSUMERD_COMMAND_SOCK_READY && code > LTTCOMM_NR) {
+	if (code < LTTCOMM_CONSUMERD_COMMAND_SOCK_READY || code > LTTCOMM_NR) {
 		code = LTTCOMM_NR;
 	}
 
@@ -89,7 +92,7 @@ const char *lttcomm_get_readable_code(enum lttcomm_return_code code)
  * Create socket from an already allocated lttcomm socket structure and init
  * sockaddr in the lttcomm sock.
  */
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
 int lttcomm_create_sock(struct lttcomm_sock *sock)
 {
 	int ret, _sock_type, _sock_proto, domain;
@@ -129,7 +132,7 @@ error:
 /*
  * Return allocated lttcomm socket structure.
  */
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
 struct lttcomm_sock *lttcomm_alloc_sock(enum lttcomm_sock_proto proto)
 {
 	struct lttcomm_sock *sock;
@@ -154,7 +157,7 @@ end:
  * This is mostly useful when lttcomm_sock are passed between process where the
  * fd and ops have to be changed within the correct address space.
  */
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
 struct lttcomm_sock *lttcomm_alloc_copy_sock(struct lttcomm_sock *src)
 {
 	struct lttcomm_sock *sock;
@@ -179,7 +182,7 @@ alloc_error:
  * This is mostly useful when lttcomm_sock are passed between process where the
  * fd and ops have to be changed within the correct address space.
  */
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
 void lttcomm_copy_sock(struct lttcomm_sock *dst, struct lttcomm_sock *src)
 {
 	/* Safety net */
@@ -196,7 +199,7 @@ void lttcomm_copy_sock(struct lttcomm_sock *dst, struct lttcomm_sock *src)
 /*
  * Init IPv4 sockaddr structure.
  */
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
 int lttcomm_init_inet_sockaddr(struct lttcomm_sockaddr *sockaddr,
 		const char *ip, unsigned int port)
 {
@@ -227,7 +230,7 @@ error:
 /*
  * Init IPv6 sockaddr structure.
  */
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
 int lttcomm_init_inet6_sockaddr(struct lttcomm_sockaddr *sockaddr,
 		const char *ip, unsigned int port)
 {
@@ -256,7 +259,7 @@ error:
 /*
  * Return allocated lttcomm socket structure from lttng URI.
  */
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
 struct lttcomm_sock *lttcomm_alloc_sock_from_uri(struct lttng_uri *uri)
 {
 	int ret;
@@ -309,10 +312,59 @@ alloc_error:
 /*
  * Destroy and free lttcomm socket.
  */
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
 void lttcomm_destroy_sock(struct lttcomm_sock *sock)
 {
-	if (sock != NULL) {
-		free(sock);
+	free(sock);
+}
+
+/*
+ * Allocate and return a relayd socket object using a given URI to initialize
+ * it and the major/minor version of the supported protocol.
+ *
+ * On error, NULL is returned.
+ */
+LTTNG_HIDDEN
+struct lttcomm_relayd_sock *lttcomm_alloc_relayd_sock(struct lttng_uri *uri,
+		uint32_t major, uint32_t minor)
+{
+	int ret;
+	struct lttcomm_sock *tmp_sock = NULL;
+	struct lttcomm_relayd_sock *rsock = NULL;
+
+	assert(uri);
+
+	rsock = zmalloc(sizeof(*rsock));
+	if (!rsock) {
+		PERROR("zmalloc relayd sock");
+		goto error;
 	}
+
+	/* Allocate socket object from URI */
+	tmp_sock = lttcomm_alloc_sock_from_uri(uri);
+	if (tmp_sock == NULL) {
+		goto error_free;
+	}
+
+	/*
+	 * Create socket object which basically sets the ops according to the
+	 * socket protocol.
+	 */
+	lttcomm_copy_sock(&rsock->sock, tmp_sock);
+	/* Temporary socket pointer not needed anymore. */
+	lttcomm_destroy_sock(tmp_sock);
+	ret = lttcomm_create_sock(&rsock->sock);
+	if (ret < 0) {
+		goto error_free;
+	}
+
+	rsock->major = major;
+	rsock->minor = minor;
+
+	return rsock;
+
+error_free:
+	free(rsock);
+error:
+	return NULL;
 }