b2b_logic: determine entity type if not explicit

Author: razvancrainea

modules/b2b_logic/b2b_load.h

@@ -87,7 +87,7 @@ typedef int (*b2bl_bridge_2calls_t)(str* key1, str* key2);
 int b2bl_bridge_msg(struct sip_msg* msg, str* key, int entity_no,
 	unsigned int flags, str *adv_ct);
 int b2bl_get_tuple_key(str *key, unsigned int *hash_index,
-		unsigned int *local_index);
+		unsigned int *local_index, str *entity_str);
 typedef int (*b2bl_bridge_msg_t)(struct sip_msg* msg, str* key, int entity_no);
 
 int b2bl_get_stats(str* key, b2bl_dlg_stat_t* stat);

modules/b2b_logic/b2b_logic.c

@@ -1304,7 +1304,7 @@ static mi_response_t *mi_b2b_terminate_call(const mi_params_t *params,
 	if (get_mi_string_param(params, "key", &key.s, &key.len) < 0)
 		return init_mi_param_error();
 
-	if (b2bl_get_tuple_key(&key, &hash_index, &local_index) < 0)
+	if (b2bl_get_tuple_key(&key, &hash_index, &local_index, NULL) < 0)
 		return init_mi_error(404, MI_SSTR("B2B session not found"));
 
 	B2BL_LOCK_GET(hash_index);
@@ -1349,7 +1349,7 @@ static mi_response_t *mi_b2b_bridge_f(const mi_params_t *params,
 	if (get_mi_int_param(params, "flag", &flag) < 0)
 		return init_mi_param_error();
 
-	return mi_b2b_bridge(params, flag, NULL);
+	return mi_b2b_bridge(params, &flag, NULL);
 }
 
 static mi_response_t *mi_b2b_bridge_pmu(const mi_params_t *params,
@@ -1377,7 +1377,7 @@ static mi_response_t *mi_b2b_bridge_4(const mi_params_t *params,
 		&prov_media.s, &prov_media.len) < 0)
 		return init_mi_param_error();
 
-	return mi_b2b_bridge(params, flag, &prov_media);
+	return mi_b2b_bridge(params, &flag, &prov_media);
 }
 
 static inline int internal_mi_print_b2bl_entity_id(mi_item_t *item, b2bl_entity_id_t *c)

modules/b2b_logic/bridging.c

@@ -65,7 +65,7 @@ int retry_init_bridge(struct sip_msg *msg, b2bl_tuple_t* tuple,
 	b2bl_entity_id_t *entity, struct b2bl_new_entity *new_entity);
 
 mi_response_t *mi_b2b_bridge(const mi_params_t *params,
-							int entity_no, str *prov_media)
+							int *_entity_no, str *prov_media)
 {
 	str key;
 	b2bl_tuple_t* tuple;
@@ -79,6 +79,9 @@ mi_response_t *mi_b2b_bridge(const mi_params_t *params,
 	b2b_req_data_t req_data;
 	b2b_rpl_data_t rpl_data;
 	int ret;
+	int entity_no;
+	str entity_str = str_init("");
+	b2bl_entity_id_t **head;
 
 	if (get_mi_string_param(params, "dialog_id", &key.s, &key.len) < 0)
 		return init_mi_param_error();
@@ -95,8 +98,13 @@ mi_response_t *mi_b2b_bridge(const mi_params_t *params,
 	/* if 'flag' parameter is 1 - >
 	 * means that destination from the current call must be
 	 * bridged to the new destination */
-	if (entity_no != 0 && entity_no != 1)
-		return init_mi_error(404, MI_SSTR("Invalid 'flag' parameter"));
+	if (_entity_no) {
+		entity_no = *_entity_no;
+		if (entity_no != 0 && entity_no != 1)
+			return init_mi_error(404, MI_SSTR("Invalid 'flag' parameter"));
+	} else {
+		entity_no = 0;
+	}
 
 	if (prov_media) {
 		/* parse new uri */
@@ -114,7 +122,7 @@ mi_response_t *mi_b2b_bridge(const mi_params_t *params,
 		}
 	}
 
-	ret = b2bl_get_tuple_key(&key, &hash_index, &local_index);
+	ret = b2bl_get_tuple_key(&key, &hash_index, &local_index, &entity_str);
 	if(ret < 0)
 	{
 		if (ret == -1)
@@ -143,6 +151,18 @@ mi_response_t *mi_b2b_bridge(const mi_params_t *params,
 	}
 
 	local_ctx_tuple = tuple;
+	if (!_entity_no && entity_str.len) {
+		old_entity = b2bl_search_entity(tuple, &entity_str, B2B_SERVER, &head);
+		if (!old_entity) {
+			old_entity = b2bl_search_entity(tuple, &entity_str, B2B_CLIENT, &head);
+			if (!old_entity) {
+				LM_ERR("Can not determine entity to bridge [%.*s]\n",
+					entity_str.len, entity_str.s);
+				goto error;
+			}
+		}
+		entity_no = old_entity->no;
+	}
 
 	if (!tuple->bridge_entities[entity_no] ||
 	tuple->bridge_entities[entity_no]->disconnected)
@@ -2162,7 +2182,7 @@ int b2bl_bridge_msg(struct sip_msg* msg, str* key, int entity_no,
 		return -1;
 	}
 
-	ret = b2bl_get_tuple_key(key, &hash_index, &local_index);
+	ret = b2bl_get_tuple_key(key, &hash_index, &local_index, NULL);
 	if(ret < 0)
 	{
 		if (ret == -1)

modules/b2b_logic/bridging.h

@@ -19,7 +19,7 @@
  */
 
 mi_response_t *mi_b2b_bridge(const mi_params_t *params,
-	int entity_no, str *prov_media);
+	int *_entity_no, str *prov_media);
 int b2b_script_bridge(struct sip_msg *msg, str *br_ent1_str, str *br_ent2_str,
 	str *provmedia_uri, struct b2b_bridge_params *params);
 int b2b_script_bridge_retry(struct sip_msg *msg, str *new_ent_str);

modules/b2b_logic/doc/b2b_logic_admin.xml

@@ -1226,7 +1226,9 @@ if(is_method("REFER") && !has_totag()) {
 			</listitem>
 			<listitem>
 				<para><emphasis>flag</emphasis> (optional) - used to specify that the callee must be bridged to the new destination. If not present the caller will be bridged. Possible values are
-				'0' or '1'.</para>
+				'0' or '1'.</para>. If missing and the <emphasis>b2b_logic key</emphasis> is in the
+				<emphasis>callid;from-tag;to-tag</emphasis> form, the module determines the entity
+				based on the key used.
 			</listitem>
 			<listitem>
 				<para><emphasis>prov_media_uri</emphasis> (optional) - the uri of a media server able to play 

modules/b2b_logic/logic.c

@@ -3530,7 +3530,7 @@ int script_trigger_scenario(struct sip_msg* msg, str *id, str * params,
 
 	if (tuple->bridge_flags & B2BL_BR_FLAG_NOTIFY) {
 		if (remote_tuple) {
-			ret = b2bl_get_tuple_key(remote_tuple, &remote_tuple_hash_index, &local_index);
+			ret = b2bl_get_tuple_key(remote_tuple, &remote_tuple_hash_index, &local_index, NULL);
 			if(ret < 0)
 			{
 				if (ret == -1)
@@ -3839,7 +3839,7 @@ int b2bl_get_stats(str* key, b2bl_dlg_stat_t* stat)
 }
 
 int b2bl_get_tuple_key(str *key, unsigned int *hash_index,
-		unsigned int *local_index)
+		unsigned int *local_index, str *entity_str)
 {
 	int ret;
 	str callid, from_tag, to_tag, *tuple;
@@ -3865,7 +3865,7 @@ int b2bl_get_tuple_key(str *key, unsigned int *hash_index,
 	to_tag.len = key->s + key->len - to_tag.s;
 
 	/* we've got the entity's coordinates, try to find the entity now */
-	tuple = b2b_api.get_b2bl_key(&callid, &from_tag, &to_tag, NULL);
+	tuple = b2b_api.get_b2bl_key(&callid, &from_tag, &to_tag, entity_str);
 	if(!tuple) {
 		LM_DBG("cannot find entity [%.*s]\n", key->len, key->s);
 		return -2;