b2b: add custom_contact_header_params support

Author: razvancrainea

modules/b2b_entities/b2be_load.h

@@ -73,6 +73,7 @@ typedef struct client_info
 	str* body;
 	str* from_tag;
 	str local_contact;
+	str *contact_hdr_params;
 	unsigned int cseq;
 	unsigned int maxfwd;
 	const struct socket_info* send_sock;
@@ -98,6 +99,7 @@ typedef struct b2b_req_data
 	b2b_dlginfo_t* dlginfo;
 	unsigned int maxfwd;
 	unsigned int no_cb;
+	str *contact_hdr_params;
 }b2b_req_data_t;
 
 typedef struct b2b_rpl_data
@@ -109,6 +111,7 @@ typedef struct b2b_rpl_data
 	str* text;
 	str* body;
 	str* extra_headers;
+	str* contact_hdr_params;
 	str* contact;
 	b2b_dlginfo_t* dlginfo;
 }b2b_rpl_data_t;

modules/b2b_entities/client.c

@@ -170,7 +170,7 @@ str* _client_new(client_info_t* ci,b2b_notify_t b2b_cback,
 	}
 
 	if(b2breq_complete_ehdr(ci->extra_headers, ci->client_headers,
-			&ehdr, ci->body, &ci->local_contact)< 0)
+			&ehdr, ci->body, &ci->local_contact, ci->contact_hdr_params)< 0)
 	{
 		LM_ERR("Failed to complete extra headers\n");
 		goto error;

modules/b2b_entities/dlg.c

@@ -1941,7 +1941,8 @@ int _b2b_send_reply(b2b_dlg_t* dlg, b2b_rpl_data_t* rpl_data)
 		bin_free_packet(&storage);
 
 	if((extra_headers?extra_headers->len:0) + 14 + local_contact.len
-			+ 20 + CRLF_LEN > BUF_LEN)
+			+ 20 + CRLF_LEN > BUF_LEN +
+			(rpl_data->contact_hdr_params?rpl_data->contact_hdr_params->len:0))
 	{
 		LM_ERR("Buffer overflow!\n");
 		goto error;
@@ -1953,7 +1954,9 @@ int _b2b_send_reply(b2b_dlg_t* dlg, b2b_rpl_data_t* rpl_data)
 		memcpy(p, extra_headers->s, extra_headers->len);
 		p += extra_headers->len;
 	}
-	len = sprintf(p,"Contact: <%.*s>", local_contact.len, local_contact.s);
+	len = sprintf(p,"Contact: <%.*s>%.*s", local_contact.len, local_contact.s,
+			(rpl_data->contact_hdr_params?rpl_data->contact_hdr_params->len: 0),
+			(rpl_data->contact_hdr_params?rpl_data->contact_hdr_params->s: ""));
 	p += len;
 	memcpy(p, CRLF, CRLF_LEN);
 	p += CRLF_LEN;
@@ -2482,7 +2485,8 @@ int _b2b_send_request(b2b_dlg_t* dlg, b2b_req_data_t* req_data)
 
 	if(b2breq_complete_ehdr(req_data->extra_headers, req_data->client_headers,
 			&ehdr, req_data->body,
-			((et==B2B_SERVER)?&dlg->contact[CALLEE_LEG]:&dlg->contact[CALLER_LEG]))< 0)
+			((et==B2B_SERVER)?&dlg->contact[CALLEE_LEG]:&dlg->contact[CALLER_LEG]),
+			req_data->contact_hdr_params)< 0)
 	{
 		LM_ERR("Failed to complete extra headers\n");
 		goto error;
@@ -3912,11 +3916,12 @@ static inline int is_CT_present(struct hdr_field* headers)
 }
 
 int b2breq_complete_ehdr(str* extra_headers, str *client_headers,
-		str* ehdr_out, str* body, str* local_contact)
+		str* ehdr_out, str* body, str* local_contact, str *ct_hdr_params)
 {
 	str ehdr= {NULL,0};
 	static char buf[BUF_LEN];
 	static struct sip_msg foo_msg;
+	str str_empty = str_init("");
 
 	if(((extra_headers?extra_headers->len:0) + 14 + local_contact->len +
 		(client_headers?client_headers->len:0))> BUF_LEN)
@@ -3931,13 +3936,17 @@ int b2breq_complete_ehdr(str* extra_headers, str *client_headers,
 		memcpy(ehdr.s, extra_headers->s, extra_headers->len);
 		ehdr.len = extra_headers->len;
 	}
+	if (!ct_hdr_params)
+		ct_hdr_params = &str_empty;
 	if (local_contact->s[0] == '<') {
 		/* already enclosed */
-		ehdr.len += sprintf(ehdr.s+ ehdr.len, "Contact: %.*s\r\n",
-			local_contact->len, local_contact->s);
+		ehdr.len += sprintf(ehdr.s+ ehdr.len, "Contact: %.*s%.*s\r\n",
+			local_contact->len, local_contact->s,
+			ct_hdr_params->len, ct_hdr_params->s);
 	} else {
-		ehdr.len += sprintf(ehdr.s+ ehdr.len, "Contact: <%.*s>\r\n",
-			local_contact->len, local_contact->s);
+		ehdr.len += sprintf(ehdr.s+ ehdr.len, "Contact: <%.*s>%.*s\r\n",
+			local_contact->len, local_contact->s,
+			ct_hdr_params->len, ct_hdr_params->s);
 	}
 	if (client_headers && client_headers->len && client_headers->s)
 	{

modules/b2b_entities/dlg.h

@@ -191,7 +191,7 @@ void b2b_tm_cback(struct cell* t, b2b_table htable, struct tmcb_params *ps);
 void print_b2b_entities(void);
 
 int b2breq_complete_ehdr(str* extra_headers, str *client_headers,
-		str* ehdr_out, str* body, str* contact);
+		str* ehdr_out, str* body, str* contact, str *ct_hdr_params);
 
 b2b_dlg_t* b2b_search_htable_dlg(b2b_table table, unsigned int hash_index,
 		unsigned int local_index, str* to_tag, str* from_tag, str* callid);

modules/b2b_logic/b2b_logic.c

@@ -130,9 +130,11 @@ struct script_route_ref *global_reply_rt_ref = NULL;
 unsigned int b2b_clean_period = 100;
 unsigned int b2b_update_period = 100;
 str custom_headers = {0, 0};
+static str custom_ct_hdrs_params = {0, 0};
 str custom_headers_lst[HDR_LST_LEN];
 int custom_headers_lst_len =0;
 str custom_headers_regexp = {0, 0};
+csv_record *custom_ct_hdrs_params_list;
 regex_t* custom_headers_re;
 /* The list of the headers that are passed on the other side by default */
 static str default_headers[HDR_DEFAULT_LEN]=
@@ -285,6 +287,7 @@ static const param_export_t params[]=
 	{"script_reply_route",    STR_PARAM,          &script_reply_route        },
 	{"custom_headers",  STR_PARAM,                &custom_headers.s          },
 	{"custom_headers_regexp", STR_PARAM,          &custom_headers_regexp.s   },
+	{"custom_contact_header_params", STR_PARAM,   &custom_ct_hdrs_params.s   },
 	{"contact_user",    INT_PARAM,                &contact_user              },
 	{"db_url",          STR_PARAM,                &db_url.s                  },
 	{"cachedb_url",     STR_PARAM, 				  &cdb_url.s         		 },
@@ -572,6 +575,16 @@ static int mod_init(void)
 	if(custom_headers.s)
 		custom_headers.len = strlen(custom_headers.s);
 
+	if(custom_ct_hdrs_params.s) {
+		custom_ct_hdrs_params.len = strlen(custom_ct_hdrs_params.s);
+		custom_ct_hdrs_params_list = __parse_csv_record(&custom_ct_hdrs_params, 0, ';');
+		if (!custom_ct_hdrs_params_list) {
+			LM_ERR("cannot parse contact headers parameters param [%s]\n",
+					custom_ct_hdrs_params.s);
+			return -1;
+		}
+	}
+
 	memset(custom_headers_lst, 0, HDR_LST_LEN*sizeof(str));
 	custom_headers_lst[i].s = custom_headers.s;
 	if(custom_headers.s)

modules/b2b_logic/b2b_logic.h

@@ -32,6 +32,7 @@
 #include "../../cachedb/cachedb.h"
 #include "../../timer.h"
 #include "../b2b_entities/b2be_load.h"
+#include "../../lib/csv.h"
 
 enum b2b_tuple_state {
 	/* initial bridge state */
@@ -131,6 +132,7 @@ enum pv_entity_field {
 };
 
 extern str custom_headers_lst[HDR_LST_LEN];
+extern csv_record *custom_ct_hdrs_params_list;
 extern regex_t* custom_headers_re;
 extern int custom_headers_lst_len;
 extern int contact_user;

modules/b2b_logic/bridging.c

@@ -506,6 +506,7 @@ int process_bridge_200OK(struct sip_msg* msg, str* extra_headers,
 	b2bl_entity_id_t* bentity0, *bentity1;
 	int entity_no;
 	b2b_req_data_t req_data;
+	str *ct_hdrs = NULL;
 
 	bentity0 = tuple->bridge_entities[0];
 	bentity1 = tuple->bridge_entities[1];
@@ -526,6 +527,9 @@ int process_bridge_200OK(struct sip_msg* msg, str* extra_headers,
 	LM_DBG("entity_no = %d, entity=%p, be[0]= %p\n",
 		entity_no, entity, tuple->bridge_entities[0]);
 
+	if ((ct_hdrs = b2b_extract_msg_contact_hdrs(msg)) != NULL)
+		b2b_store_msg_contact_hdrs(tuple, &entity->key, ct_hdrs);
+
 	switch (tuple->state) {
 	case B2B_BRIDGING_HOLD_STATE:
 		if (entity_no != 0) {
@@ -654,6 +658,7 @@ int process_bridge_200OK(struct sip_msg* msg, str* extra_headers,
 			req_data.method =&method_ack;
 			req_data.extra_headers =extra_headers;
 			req_data.body = body;
+			req_data.contact_hdr_params = ct_hdrs;
 			req_data.dlginfo =bentity1->dlginfo;
 			if(b2b_api.send_request(&req_data) < 0)
 			{
@@ -732,6 +737,7 @@ int process_bridge_200OK(struct sip_msg* msg, str* extra_headers,
 			req_data.client_headers=&bentity1->hdrs;;
 			req_data.extra_headers =extra_headers;
 			req_data.body = body;
+			req_data.contact_hdr_params = ct_hdrs;
 			req_data.dlginfo =bentity1->dlginfo;
 			if(b2b_api.send_request(&req_data) < 0)
 			{
@@ -753,6 +759,7 @@ int process_bridge_200OK(struct sip_msg* msg, str* extra_headers,
 			req_data.client_headers=&bentity1->hdrs;;
 			req_data.extra_headers =extra_headers;
 			req_data.body =body;
+			req_data.contact_hdr_params = ct_hdrs;
 			req_data.dlginfo =bentity1->dlginfo;
 			if(b2b_api.send_request(&req_data) < 0)
 			{
@@ -795,6 +802,7 @@ int process_bridge_200OK(struct sip_msg* msg, str* extra_headers,
 			req_data.method =&method_invite;
 			req_data.extra_headers = NULL;
 			req_data.client_headers = &bentity0->hdrs;
+			req_data.contact_hdr_params = ct_hdrs;
 			req_data.body = body;
 			b2b_api.send_request(&req_data);
 			bentity0->state = B2BL_ENT_NEW;
@@ -905,6 +913,7 @@ int process_bridge_200OK(struct sip_msg* msg, str* extra_headers,
 		req_data.client_headers=&bentity0->hdrs;
 		req_data.extra_headers =extra_headers;
 		req_data.body =body;
+		req_data.contact_hdr_params = ct_hdrs;
 		req_data.dlginfo =bentity0->dlginfo;
 		if(b2b_api.send_request(&req_data) < 0)
 		{
@@ -1382,6 +1391,7 @@ static int bridging_start_old_ent(b2bl_tuple_t* tuple, b2bl_entity_id_t *old_ent
 	req_data.extra_headers = NULL;
 	req_data.client_headers = &old_entity->hdrs;
 	req_data.body = body;
+	req_data.contact_hdr_params = b2b_get_msg_contact_hdrs(tuple, &old_entity->key);
 	b2b_api.send_request(&req_data);
 	old_entity->state = B2BL_ENT_NEW;
 	if (body) {
@@ -2163,7 +2173,7 @@ int b2bl_bridge_msg(struct sip_msg* msg, str* key, int entity_no,
 	str to_uri={NULL,0}, from_uri, from_dname;
 	b2b_req_data_t req_data;
 	int ret;
-	str local_contact;
+	str local_contact, *ct_hdrs;
 	int maxfwd;
 
 	if(!msg || !key)
@@ -2242,6 +2252,7 @@ int b2bl_bridge_msg(struct sip_msg* msg, str* key, int entity_no,
 	}
 	bridging_entity = tuple->bridge_entities[entity_no];
 	old_entity = tuple->bridge_entities[(entity_no?0:1)];
+	ct_hdrs = b2b_get_msg_contact_hdrs(tuple, &old_entity->key);
 
 	if(!old_entity || old_entity->next || old_entity->prev)
 	{

modules/b2b_logic/doc/b2b_logic_admin.xml

@@ -237,6 +237,30 @@ modparam("b2b_logic", "custom_headers_regexp", "/^x-/i")
 		<programlisting format="linespecific">
 ...
 modparam("b2b_logic", "custom_headers", "User-Agent;Date")
+...
+	</programlisting>
+		</example>
+	</section>
+	<section id="param_custom_contact_header_param" xreflabel="custom_contact_header_params">
+		<title><varname>custom_contact_header_params</varname> (str)</title>
+		<para>
+			A list of Contact header parameters, delimited by ';', that should
+			be passed from the dialog of one side to the other side.
+		</para>
+		<para>
+			Throughout a dialog, the value of each parameter is being
+			attached to the entity - this means that when an entity is being bridged,
+			the corresponding entity's headers params are being sent towards the new
+			entity.
+		</para>
+		<para>
+		<emphasis>Default value is <quote></quote> (no parameter).</emphasis>
+		</para>
+		<example>
+		<title>Set <varname>custom_contact_header_params</varname> parameter</title>
+		<programlisting format="linespecific">
+...
+modparam("b2b_logic", "custom_contact_header_params", "audio;video")
 ...
 	</programlisting>
 		</example>