X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=f130f5ebfb17f74f10ec87b1d784359504e99d63;hb=df75acaceaceb383f558a251dca3703b6593ce40;hp=9ef1fde3694eddd90b67d18c3aa68d410d309a27;hpb=4f50c803f026f217d37588c46265b5c2fb9a1195;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 9ef1fde36..f130f5ebf 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -380,16 +380,20 @@ static int add_uri_to_consumer(struct consumer_output *consumer,
 	case LTTNG_DST_IPV6:
 		DBG2("Setting network URI to consumer");
 
-		consumer->type = CONSUMER_DST_NET;
-
-		if ((uri->stype == LTTNG_STREAM_CONTROL &&
+		if (consumer->type == CONSUMER_DST_NET) {
+			if ((uri->stype == LTTNG_STREAM_CONTROL &&
 				consumer->dst.net.control_isset) ||
 				(uri->stype == LTTNG_STREAM_DATA &&
 				consumer->dst.net.data_isset)) {
-			ret = LTTNG_ERR_URL_EXIST;
-			goto error;
+				ret = LTTNG_ERR_URL_EXIST;
+				goto error;
+			}
+		} else {
+			memset(&consumer->dst.net, 0, sizeof(consumer->dst.net));
 		}
 
+		consumer->type = CONSUMER_DST_NET;
+
 		/* Set URI into consumer output object */
 		ret = consumer_set_network_uri(consumer, uri);
 		if (ret < 0) {