b2b: add support for pass-legs-upstream flag

Author: razvancrainea

modules/b2b_entities/b2b_entities.c

@@ -774,8 +774,8 @@ str *b2b_get_b2bl_key(str* callid, str* from_tag, str* to_tag, str* entity_key)
 		tuple_key->len = dlg->logic_key.len;
 		if (entity_key) {
 			if (table == server_htable) {
-				entity_key->s = to_tag->s;
-				entity_key->len = to_tag->len;
+				*entity_key = *to_tag;
+				b2b_get_server_entity_key(entity_key);
 			} else {
 				entity_key->s = callid->s;
 				entity_key->len = callid->len;
@@ -836,6 +836,7 @@ int b2b_entities_bind(b2b_api_t* api)
 	api->get_b2bl_key       = b2b_get_b2bl_key;
 	api->apply_lumps        = b2b_apply_lumps;
 	api->get_context		= b2b_get_context;
+	api->get_reply_leg      = b2b_get_reply_leg;
 
 	return 0;
 }
@@ -1057,4 +1058,3 @@ static mi_response_t *mi_b2be_list(const mi_params_t *params,
 	free_mi_response(resp);
 	return NULL;
 }
-

modules/b2b_entities/b2be_load.h

@@ -100,6 +100,7 @@ typedef struct b2b_req_data
 	unsigned int maxfwd;
 	unsigned int no_cb;
 	str *contact_hdr_params;
+	int leg_idx;
 }b2b_req_data_t;
 
 typedef struct b2b_rpl_data
@@ -114,6 +115,7 @@ typedef struct b2b_rpl_data
 	str* contact_hdr_params;
 	str* contact;
 	b2b_dlginfo_t* dlginfo;
+	int leg_idx;
 }b2b_rpl_data_t;
 
 
@@ -169,6 +171,8 @@ typedef str *(*b2b_get_b2bl_key_t)(str* callid, str* from_tag, str* to_tag,
 typedef int (*b2b_apply_lumps_t)(struct sip_msg* msg);
 
 typedef void* (*b2b_get_context_t)(void);
+typedef int (*b2b_get_reply_leg_t)(enum b2b_entity_type et, str *b2b_key,
+		str *to_tag);
 
 typedef struct b2b_api
 {
@@ -185,6 +189,7 @@ typedef struct b2b_api
 	b2b_get_b2bl_key_t        get_b2bl_key;
 	b2b_apply_lumps_t         apply_lumps;
 	b2b_get_context_t		  get_context;
+	b2b_get_reply_leg_t       get_reply_leg;
 }b2b_api_t;
 
 typedef int(*load_b2b_f) (b2b_api_t* api);