From a0fa8cd663f8fb14b1126aa7e26f96ed16813cd9 Mon Sep 17 00:00:00 2001
From: Stefan Mititelu <stefan.mititelu@onem.com>
Date: Wed, 8 Mar 2017 13:53:56 +0200
Subject: [PATCH] rabbitmq: replace anonymous reply-to queue with
 'kamailio-uuid'

In order to better identify reply-to queues, when direct reply-to is not used.
Also rabbitmq is known to be slower, working with anonymous queues.
---
 src/modules/rabbitmq/Makefile   |  6 +++---
 src/modules/rabbitmq/rabbitmq.c | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/modules/rabbitmq/Makefile b/src/modules/rabbitmq/Makefile
index 69805063097..b9a839b8481 100644
--- a/src/modules/rabbitmq/Makefile
+++ b/src/modules/rabbitmq/Makefile
@@ -7,8 +7,8 @@ LIBS=
 
 ifeq ($(CROSS_COMPILE),)
 RMQ_BUILDER=$(shell \
-	if pkg-config --exists librabbitmq; then \
-		echo 'pkg-config librabbitmq'; \
+	if pkg-config --exists librabbitmq && pkg-config --exists uuid; then \
+		echo 'pkg-config librabbitmq uuid'; \
 	fi)
 endif
 
@@ -17,7 +17,7 @@ ifneq ($(RMQ_BUILDER),)
 	LIBS += $(shell $(RMQ_BUILDER) --libs)
 else
 	DEFS+=-I$(LOCALBASE)/include
-	LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -lrabbitmq
+	LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -lrabbitmq -luuid
 endif
 
 DEFS+=-DKAMAILIO_MOD_INTERFACE
diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c
index af7cb98cf9f..ad6c62b7b24 100644
--- a/src/modules/rabbitmq/rabbitmq.c
+++ b/src/modules/rabbitmq/rabbitmq.c
@@ -48,6 +48,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <uuid/uuid.h>
 
 #include <stdint.h>
 #include <amqp_tcp_socket.h>
@@ -289,6 +290,10 @@ static int rabbitmq_publish_consume(struct sip_msg* msg, char* in_exchange, char
 
 	amqp_queue_declare_ok_t *reply_to;
 
+	uuid_t uuid;
+	char uuid_buffer[40];
+	char reply_to_buffer[64];
+
 	// sanity checks
 	if (get_str_fparam(&exchange, msg, (fparam_t*)in_exchange) < 0) {
 		LM_ERR("failed to get exchange\n");
@@ -347,7 +352,13 @@ static int rabbitmq_publish_consume(struct sip_msg* msg, char* in_exchange, char
 	if (direct_reply_to == 1) {
 		reply_to = amqp_queue_declare(conn, 1, amqp_cstring_bytes("amq.rabbitmq.reply-to"), 0, 0, 0, 1, amqp_empty_table);
 	} else {
-		reply_to = amqp_queue_declare(conn, 1, amqp_empty_bytes, 0, 0, 0, 1, amqp_empty_table);
+		uuid_generate_random(uuid);
+		uuid_unparse(uuid, uuid_buffer);
+
+		strcpy(reply_to_buffer, "kamailio-");
+		strcat(reply_to_buffer, uuid_buffer);
+
+		reply_to = amqp_queue_declare(conn, 1, amqp_cstring_bytes(reply_to_buffer), 0, 0, 0, 1, amqp_empty_table);
 	}
 
 	if (log_on_amqp_error(amqp_get_rpc_reply(conn), "amqp_queue_declare()") != AMQP_RESPONSE_NORMAL) {