Merge branch 'redis-onekey-concept-improvements' of https://github.com/1and1/rtpengine

daemon/call.c

@@ -595,11 +595,7 @@ static void callmaster_timer(void *ptr) {
 		rwlock_unlock_r(&sfd->call->master_lock);
 
 		if (update) {
-			if (m->conf.redis_multikey) {
-				redis_update(ps->call, m->conf.redis_write);
-			} else {
 				redis_update_onekey(ps->call, m->conf.redis_write);
-			}
 		}
 
 next:

daemon/call.h

@@ -463,7 +463,6 @@ struct callmaster_config {
 	GQueue		        *redis_subscribed_keyspaces;
 	struct redisAsyncContext *redis_notify_async_context;
 	unsigned int        redis_expires_secs;
-	unsigned int		redis_multikey;
 	char			*b2b_url;
 	unsigned char		default_tos;
 	enum xmlrpc_format	fmt;

daemon/call_interfaces.c

@@ -186,11 +186,7 @@ static str *call_update_lookup_udp(char **out, struct callmaster *m, enum call_o
 			sp.index, sp.index, out[RE_UDP_COOKIE], SAF_UDP);
 	rwlock_unlock_w(&c->master_lock);
 
-	if (m->conf.redis_multikey) {
-		redis_update(c, m->conf.redis_write);
-	} else {
-		redis_update_onekey(c, m->conf.redis_write);
-	}
+	redis_update_onekey(c, m->conf.redis_write);
 
 	gettimeofday(&(monologue->started), NULL);
 
@@ -338,11 +334,7 @@ out2:
 	rwlock_unlock_w(&c->master_lock);
 	streams_free(&s);
 
-	if (m->conf.redis_multikey) {
-		redis_update(c, m->conf.redis_write);
-	} else {
-		redis_update_onekey(c, m->conf.redis_write);
-	}
+	redis_update_onekey(c, m->conf.redis_write);
 
 	ilog(LOG_INFO, "Returning to SIP proxy: "STR_FORMAT"", STR_FMT0(ret));
 	obj_put(c);
@@ -774,11 +766,7 @@ static const char *call_offer_answer_ng(bencode_item_t *input, struct callmaster
 	rwlock_unlock_w(&call->master_lock);
 
 	if (!flags.no_redis_update) {
-		if (m->conf.redis_multikey) {
-			redis_update(call, m->conf.redis_write);
-		} else {
 			redis_update_onekey(call,m->conf.redis_write);
-		}
 	} else {
 		ilog(LOG_DEBUG, "Not updating Redis due to present no-redis-update flag");
 	}

daemon/main.c

@@ -62,7 +62,6 @@ static unsigned int timeout;
 static unsigned int silent_timeout;
 static unsigned int final_timeout;
 static unsigned int redis_expires = 86400;
-static unsigned int redis_multikey = 0;
 static int port_min = 30000;
 static int port_max = 40000;
 static int max_sessions = -1;
@@ -299,7 +298,6 @@ static void options(int *argc, char ***argv) {
 		{ "redis-write",'w', 0, G_OPTION_ARG_STRING,    &redisps_write, "Connect to Redis write database",      "[PW@]IP:PORT/INT"       },
 		{ "redis-num-threads", 0, 0, G_OPTION_ARG_INT, &redis_num_threads, "Number of Redis restore threads",      "INT"       },
 		{ "redis-expires", 0, 0, G_OPTION_ARG_INT, &redis_expires, "Expire time in seconds for redis keys",      "INT"       },
-		{ "redis-multikey", 0, 0, G_OPTION_ARG_NONE, &redis_multikey, "Use multiple redis keys for storing the call (old behaviour) DEPRECATED", NULL },
 		{ "no-redis-required", 'q', 0, G_OPTION_ARG_NONE, &no_redis_required, "Start no matter of redis connection state", NULL },
 		{ "b2b-url",	'b', 0, G_OPTION_ARG_STRING,	&b2b_url,	"XMLRPC URL of B2B UA"	,	"STRING"	},
 		{ "log-facility",0,  0,	G_OPTION_ARG_STRING, &log_facility_s, "Syslog facility to use for logging", "daemon|local0|...|local7"},
@@ -628,7 +626,6 @@ no_kernel:
 	}
 
 	mc.redis_expires_secs = redis_expires;
-	mc.redis_multikey = redis_multikey;
 
 	ctx->m->conf = mc;
 

daemon/media_socket.c

@@ -1472,11 +1472,7 @@ out:
 	ca = sfd->call ? : NULL;
 
 	if (ca && update) {
-		if (ca->callmaster->conf.redis_multikey) {
-			redis_update(ca, ca->callmaster->conf.redis_write);
-		} else {
-			redis_update_onekey(ca, ca->callmaster->conf.redis_write);
-		}
+		redis_update_onekey(ca, ca->callmaster->conf.redis_write);
 	}
 done:
 	log_info_clear();

daemon/redis.h

@@ -13,6 +13,7 @@
 #include <sys/types.h>
 #include <hiredis/hiredis.h>
 #include "call.h"
+#include "str.h"
 
 
 #define REDIS_RESTORE_NUM_THREADS 4
@@ -61,10 +62,11 @@ struct redis {
 	int		state;
 	int		no_redis_required;
 };
+
 struct redis_hash {
-	redisReply *rr;
 	GHashTable *ht;
 };
+
 struct redis_list {
 	unsigned int len;
 	struct redis_hash *rh;
@@ -72,12 +74,6 @@ struct redis_list {
 };
 
 
-
-
-
-
-
-
 #if !GLIB_CHECK_VERSION(2,40,0)
 INLINE gboolean g_hash_table_insert_check(GHashTable *h, gpointer k, gpointer v) {
 	gboolean ret = TRUE;
@@ -129,12 +125,12 @@ int redis_notify_subscribe_action(struct callmaster *cm, enum subscribe_action a
 
 #define define_get_int_type(name, type, func)								\
 	static int redis_hash_get_ ## name(type *out, const struct redis_hash *h, const char *k) {	\
-		redisReply *r;										\
+		str* s;										\
 													\
-		r = g_hash_table_lookup(h->ht, k);							\
-		if (!r)											\
+		s = g_hash_table_lookup(h->ht, k);							\
+		if (!s)											\
 			return -1;									\
-		*out = func(r->str, NULL, 10);								\
+		*out = func(s->s, NULL, 10);								\
 		return 0;										\
 	}