dialog: fix a bug in local profiles counting

Fix the counting of local profiles with value when profile replication
is active. Altough the /b profiles were counted correctly, the same
mechanism would be aplied also for other profiles that were not shared,
resulting in a bad value.

modules/dialog/dlg_profile.c

@@ -665,7 +665,8 @@ static void destroy_linker(struct dlg_profile_link *l, struct dlg_cell *dlg,
 			dest = map_find( entry, l->value );
 			if( dest )
 			{
-				prof_val_local_dec(dest, dlg);
+				prof_val_local_dec(dest, dlg,
+					l->profile->repl_type==REPL_CACHEDB);
 
 				if( *dest == 0 )
 				{
@@ -799,7 +800,8 @@ static void link_dlg_profile(struct dlg_profile_link *linker,
 			}
 			/* if we accept replicated stuff, we have to allocate the
 			 * structure for it and treat the counter differently */
-			prof_val_local_inc(dest, dlg);
+			prof_val_local_inc(dest, dlg,
+				linker->profile->repl_type==REPL_PROTOBIN);
 		}
 		else {
 			cnt = get_local_counter(&linker->profile->noval_local_counters[hash], dlg);
@@ -1045,7 +1047,8 @@ unsigned int get_profile_size(struct dlg_profile_table *profile, str *value)
 							goto next_val;
 						}
 
-						n += prof_val_get_count(dest, 0);
+						n += prof_val_get_count(dest, 0,
+								profile->repl_type == REPL_PROTOBIN);
 next_val:
 						if (iterator_next(&it) < 0)
 							break;
@@ -1080,7 +1083,8 @@ unsigned int get_profile_size(struct dlg_profile_table *profile, str *value)
 
 				dest = map_find(entry,*value);
 				if( dest )
-					n = prof_val_get_count(dest, 0);
+					n = prof_val_get_count(dest, 0,
+							profile->repl_type == REPL_PROTOBIN);
 
 				lock_set_release( profile->locks, i);
 
@@ -1218,7 +1222,23 @@ static inline int add_val_to_rpl(void * param, str key, void * val)
 
 	if (add_mi_string(val_item, MI_SSTR("value"), key.s , key.len) < 0)
 		return -1;
-	if (add_mi_number(val_item, MI_SSTR("count"), prof_val_get_count(&val, 0)) < 0)
+	if (add_mi_number(val_item, MI_SSTR("count"), prof_val_get_count(&val, 0, 0)) < 0)
+		return -1;
+
+	return 0;
+}
+
+static inline int add_val_to_rpl_r(void * param, str key, void * val)
+{
+	mi_item_t *val_item;
+
+	val_item = add_mi_object((mi_item_t *)param, NULL, 0);
+	if (!val_item)
+		return -1;
+
+	if (add_mi_string(val_item, MI_SSTR("value"), key.s , key.len) < 0)
+		return -1;
+	if (add_mi_number(val_item, MI_SSTR("count"), prof_val_get_count(&val, 0, 1)) < 0)
 		return -1;
 
 	return 0;
@@ -1271,7 +1291,10 @@ mi_response_t *mi_get_profile_values(const mi_params_t *params,
 		for( i=0; i<profile->size; i++ )
 		{
 			lock_set_get( profile->locks, i);
-			ret |= map_for_each(profile->entries[i], add_val_to_rpl, resp_arr);
+			if (profile->repl_type == REPL_PROTOBIN)
+				ret |= map_for_each(profile->entries[i], add_val_to_rpl_r, resp_arr);
+			else
+				ret |= map_for_each(profile->entries[i], add_val_to_rpl, resp_arr);
 			lock_set_release( profile->locks, i);
 		}
 	}

modules/dialog/dlg_repl_profile.h

@@ -147,12 +147,13 @@ static inline void remove_local_counter(struct prof_local_count **list,
 	shm_free(cnt);
 }
 
-static inline void prof_val_local_inc(void **pv_info, struct dlg_cell *dlg)
+static inline void prof_val_local_inc(void **pv_info, struct dlg_cell *dlg,
+									int is_repl)
 {
 	prof_value_info_t *pvi;
 	struct prof_local_count *cnt;
 
-	if (profile_repl_cluster) {
+	if (is_repl && profile_repl_cluster) {
 		/* if info does not exist, create it */
 		if (!*pv_info) {
 			pvi = shm_malloc(sizeof(prof_value_info_t));
@@ -180,33 +181,30 @@ static inline void prof_val_local_inc(void **pv_info, struct dlg_cell *dlg)
 	}
 }
 
-/* @all - all counters(including dialogs tagged as backup) */
+/* This function is used only for /b profiles
+ * @all - all counters(including dialogs tagged as backup) */
 static inline int prof_val_get_local_count(void **pv_info, int all)
 {
 	prof_value_info_t *pvi;
 	struct prof_local_count *cnt;
 	int n = 0;
 
-	if (profile_repl_cluster) {
-		pvi = (prof_value_info_t *)(*pv_info);
-		for (cnt = pvi->local_counters; cnt; cnt = cnt->next)
-			if (!all && dialog_repl_cluster) {
-				/* don't count dialogs for which we have a backup role */
-				if (cnt->dlg && (get_shtag_state(cnt->dlg) != SHTAG_STATE_BACKUP))
-					n += cnt->n;
-			} else
+	pvi = (prof_value_info_t *)(*pv_info);
+	for (cnt = pvi->local_counters; cnt; cnt = cnt->next)
+		if (!all && dialog_repl_cluster) {
+			/* don't count dialogs for which we have a backup role */
+			if (cnt->dlg && (get_shtag_state(cnt->dlg) != SHTAG_STATE_BACKUP))
 				n += cnt->n;
-		return n;
-	} else {
-		return (int)(long)(*pv_info);
-	}
+		} else
+			n += cnt->n;
+	return n;
 }
 
 /* @all - all counters(including local dialogs tagged as backup) */
-static inline int prof_val_get_count(void **pv_info, int all)
+static inline int prof_val_get_count(void **pv_info, int all, int is_repl)
 {
 	prof_value_info_t *pvi;
-	if (profile_repl_cluster) {
+	if (is_repl && profile_repl_cluster) {
 		pvi = (prof_value_info_t *)(*pv_info);
 		return prof_val_get_local_count(pv_info, all) +
 				replicate_profiles_count(pvi->rcv_counters);
@@ -215,18 +213,19 @@ static inline int prof_val_get_count(void **pv_info, int all)
 	}
 }
 
-static inline void prof_val_local_dec(void **pv_info, struct dlg_cell *dlg)
+static inline void prof_val_local_dec(void **pv_info, struct dlg_cell *dlg,
+								int is_repl)
 {
 	prof_value_info_t *pvi;
 
-	if (profile_repl_cluster) {
+	if (is_repl	&& profile_repl_cluster) {
 		pvi = (prof_value_info_t *)(*pv_info);
 
 		remove_local_counter(&pvi->local_counters, dlg);
 
 		/* check all the other counters(local + received) to see if we should
 		 * delete the profile */
-		if (prof_val_get_count(pv_info, 1) == 0) {
+		if (prof_val_get_count(pv_info, 1, 1) == 0) {
 			free_profile_val_t(pvi);
 			*pv_info = 0;
 		}

modules/dialog/dlg_replication.c

@@ -1170,7 +1170,7 @@ static void clean_profiles(unsigned int ticks, void *param)
 					LM_ERR("[BUG] bogus map[%d] state\n", i);
 					goto next_val;
 				}
-				count = prof_val_get_count(dst, 1);
+				count = prof_val_get_count(dst, 1, 1);
 				if (!count) {
 					del = it;
 					if (iterator_next(&it) < 0)