Merge branch 'feature/sdp-vars'

Initial implementation draft!

Author: liviuchircu

modules/rtpproxy/rtpproxy.c

@@ -3901,7 +3901,7 @@ static int rtpproxy_offer_answer(struct sip_msg *msg, struct rtpp_args *args,
 			LM_ERR("could not allocate space for new body\n");
 			goto error;
 		}
-		allocated_body = args->body.len;
+		allocated_body = 1;
 		body->len = 0;
 	}
 

parser/msg_parser.c

@@ -52,6 +52,7 @@
 #include "../core_stats.h"
 #include "../errinfo.h"
 #include "../dset.h"
+#include "../sdp_ops.h"
 #include "parse_hname2.h"
 #include "parse_uri.h"
 #include "parse_content.h"
@@ -975,6 +976,8 @@ void free_sip_msg(struct sip_msg* msg)
 		free_lump_list(msg->add_rm);
 	if (msg->body_lumps)
 		free_lump_list(msg->body_lumps);
+	if (msg->sdp_ops )
+		free_sdp_ops(msg->sdp_ops);
 	if (msg->reply_lump)
 		free_reply_lump(msg->reply_lump);
 	if (msg->body )

parser/msg_parser.h

@@ -286,6 +286,8 @@ struct sip_msg {
 	struct hdr_field* security_verify;
 
 	struct sip_msg_body *body;
+	/* optional, real-time changes performed on the first SDP body part */
+	struct sdp_body_part_ops *sdp_ops;
 
 	char* eoh;        /* pointer to the end of header (if found) or null */
 	char* unparsed;   /* here we stopped parsing*/
@@ -339,7 +341,7 @@ struct sip_msg {
 
 	/* flags used by core - allows to set various flags on the message; may
 	 * be used for simple inter-module communication or remembering
-	 * processing state reached */
+	 * processing state reached, e.g. FL_FORCE_RPORT */
 	unsigned int msg_flags;
 
 	str set_global_address;
@@ -362,6 +364,7 @@ struct sip_msg {
 #define FAKED_REPLY     ((struct sip_msg *) -1)
 
 extern int via_cnt;
+extern int sdp_get_custom_body(struct sip_msg *msg, str *body);
 
 #define parse_msg( _buf, _len, _msg) \
 	parse_msg_opt( _buf, _len, _msg, 1)
@@ -430,6 +433,11 @@ inline static int get_body(struct sip_msg *msg, str *body)
 	unsigned int hdrs_len;
 	int ct_len;
 
+	if (sdp_get_custom_body(msg, body) == 0) {
+		LM_DBG("found custom 'SDP ops' body, len: %d\n", body->len);
+		return 0;
+	}
+
 	if ( parse_headers(msg,HDR_EOH_F, 0)==-1 )
 		return -1;
 

parser/parse_body.c

@@ -22,6 +22,7 @@
 
 #include "../mem/mem.h"
 #include "../ut.h"
+#include "../sdp_ops.h"
 #include "parse_body.h"
 #include "parse_content.h"
 #include "parse_hname2.h"
@@ -230,7 +231,7 @@ static int parse_single_part(struct body_part *part, char * start, char * end)
 int parse_sip_body(struct sip_msg * msg)
 {
 	char *start, *end;
-	int type = 0;
+	int type = 0, new_sdp = 0;
 	struct body_part *part, *last;
 	str delimiter, body;
 
@@ -242,8 +243,12 @@ int parse_sip_body(struct sip_msg * msg)
 		return 0;
 
 	type = parse_content_type_hdr(msg);
-	if (type <= 0)
-		return 0;
+	if (type <= 0) {
+		if (!msg->sdp_ops || msg->sdp_ops->sdp.len == 0)
+			return 0;
+		type = (TYPE_APPLICATION<<16) + SUBTYPE_SDP;
+		new_sdp = 1;
+	}
 
 	msg->body = pkg_malloc(sizeof (struct sip_msg_body));
 	if (msg->body == 0)
@@ -255,7 +260,8 @@ int parse_sip_body(struct sip_msg * msg)
 
 	msg->body->body = body;
 
-	msg->body->boundary = ((content_t *) msg->content_type->parsed)->boundary;
+	if (!new_sdp)
+		msg->body->boundary = ((content_t *) msg->content_type->parsed)->boundary;
 
 	if ((type >> 16) == TYPE_MULTIPART)
 	{
@@ -269,7 +275,7 @@ int parse_sip_body(struct sip_msg * msg)
 		if (start == NULL) {
 			LM_ERR("Unable to parse multipart type:"
 				" malformed - missing start delimiters\n");
-			return 0;
+			goto out_free;
 		}
 
 		/* mark as first part (no previous one) */
@@ -293,7 +299,7 @@ int parse_sip_body(struct sip_msg * msg)
 			/* add 4 to delimiter 2 for "--"*/
 			if (parse_single_part(part, start + delimiter.len + 2, end)!=0) {
 				LM_ERR("Unable to parse part:[%.*s]\n",(int)(end-start),start);
-				return -1;
+				goto out_free;
 			}
 
 			/* set the parsing for the next cycle */
@@ -314,7 +320,7 @@ int parse_sip_body(struct sip_msg * msg)
 		part = &msg->body->first;
 
 		part->mime = type;
-		part->mime_s = msg->content_type->body;
+		part->mime_s = !new_sdp ? msg->content_type->body : str_init("application/sdp\r\n");
 		part->body = body;
 		part->headers.s = NULL;
 		part->headers.len = 0;
@@ -325,7 +331,11 @@ int parse_sip_body(struct sip_msg * msg)
 
 	return 0;
 
-};
+out_free:
+	free_sip_body(msg->body);
+	msg->body = NULL;
+	return -1;
+}
 
 
 struct body_part* add_body_part(struct sip_msg *msg, str *mime_s,

parser/parse_body.h

@@ -101,7 +101,7 @@ struct sip_msg_body {
 	 * in the SIP parts */
 	unsigned char updated_part_count;
 
-	/* multi purpose flags */
+	/* multi purpose flags, e.g. SIP_BODY_FLAG_NEW */
 	unsigned char flags;
 
 	/* entire body (as received) */

parser/parse_content.c

@@ -444,7 +444,6 @@ int parse_content_type_hdr( struct sip_msg *msg )
 	}
 	memset(rez, 0, sizeof (content_t));
 
-
 	/* it seams we have to parse it! :-( */
 	end = msg->content_type->body.s + msg->content_type->body.len;
 	ret = decode_mime_type(msg->content_type->body.s, end , &mime, rez);

parser/sdp/sdp.c

@@ -44,24 +44,6 @@
 #define HOLD_IP_STR "0.0.0.0"
 #define HOLD_IP_LEN 7
 
-/**
- * Creates and initialize a new sdp_info structure
- */
-static inline sdp_info_t* new_sdp(void)
-{
-	sdp_info_t* sdp;
-
-	sdp = (sdp_info_t*)pkg_malloc(sizeof(sdp_info_t));
-	if (sdp == NULL) {
-		LM_ERR("No memory left\n");
-		return NULL;
-	}
-	memset( sdp, 0, sizeof(sdp_info_t));
-
-	return sdp;
-}
-
-
 /**
  * Alocate a new session cell.
  */
@@ -707,7 +689,7 @@ sdp_info_t* parse_sdp(struct sip_msg* _m)
 	sdp_info_t *sdp, *ret;
 
 	if ( parse_sip_body(_m)<0 || _m->body==NULL) {
-		LM_DBG("message body has length zero\n");
+		LM_DBG("message body has length zero: %p\n", _m->body);
 		return NULL;
 	}
 

parser/sdp/sdp.h

@@ -214,6 +214,24 @@ void print_sdp_session(sdp_session_cell_t* sdp_session, int log_level);
  */
 void print_sdp_stream(sdp_stream_cell_t *stream, int log_level);
 
+/**
+ * Creates and initialize a new sdp_info structure
+ */
+static inline sdp_info_t* new_sdp(void)
+{
+	sdp_info_t* sdp;
+
+	sdp = (sdp_info_t*)pkg_malloc(sizeof(sdp_info_t));
+	if (sdp == NULL) {
+		LM_ERR("No memory left\n");
+		return NULL;
+	}
+	memset( sdp, 0, sizeof(sdp_info_t));
+
+	return sdp;
+}
+
+
 /**
  * Get the first SDP from the body
  */

pvar.c

@@ -50,6 +50,7 @@
 #include "transformations.h"
 #include "script_var.h"
 #include "pvar.h"
+#include "sdp_ops.h"
 #include "flags.h"
 #include "xlog.h"
 
@@ -1746,6 +1747,18 @@ static int pv_get_msg_body(struct sip_msg *msg, pv_param_t *param,
 	return pv_get_strval(msg, param, res, &s);
 }
 
+
+static int pv_get_sdp(struct sip_msg *msg, pv_param_t *_, pv_value_t *res)
+{
+	pv_param_t param;
+
+	memset(&param, 0, sizeof param);
+	param.pvn.u.isname.name.n = ((TYPE_APPLICATION<<16)+SUBTYPE_SDP);
+
+	return pv_get_msg_body(msg, &param, res);
+}
+
+
 static int pv_get_authattr(struct sip_msg *msg, pv_param_t *param,
 		pv_value_t *res)
 {
@@ -4284,6 +4297,21 @@ const pv_export_t _pv_names_table[] = {
 	{str_const_init("ruri.user"), /* */
 		PVT_RURI_USERNAME, pv_get_ruri_attr, pv_set_ruri_user,
 		0, 0, pv_init_iname, 1},
+	{str_const_init("sdp"), /* */
+		PVT_SDP, pv_get_sdp, pv_set_sdp,
+		0, 0, pv_init_iname, 1},
+	{str_const_init("sdp"), /* */
+		PVT_SDP, pv_get_sdp, pv_set_sdp,
+		pv_parse_sdp_name, 0, pv_init_iname, 1},
+	{str_const_init("sdp.line"), /* */
+		PVT_SDP_LINE, pv_get_sdp_line, pv_set_sdp_line,
+		pv_parse_sdp_line_name, 0, 0, 0},
+	{str_const_init("sdp.stream"), /* */
+		PVT_SDP_STREAM, pv_get_sdp_stream, pv_set_sdp_stream,
+		pv_parse_sdp_stream_name, 0, 0, 0},
+	{str_const_init("sdp.session"), /* */
+		PVT_SDP_SESSION, pv_get_sdp_session, pv_set_sdp_session,
+		pv_parse_sdp_session_name, 0, 0, 0},
 	{str_const_init("src_ip"), /* */
 		PVT_SRCIP, pv_get_srcip, 0,
 		0, 0, 0, 0},

pvar.h

@@ -131,7 +131,8 @@ enum _pv_type {
 	PVT_LINE_NUMBER,      PVT_CFG_FILE_NAME,     PVT_LOG_LEVEL,
 	PVT_XLOG_LEVEL,       PVT_AF,                PVT_HDR_NAME,
 	PVT_SOCKET_IN,        PVT_SOCKET_OUT,        PVT_BRANCH_FLAG,
-	PVT_MSG_FLAG,
+	PVT_SDP,              PVT_SDP_LINE,          PVT_SDP_STREAM,
+	PVT_SDP_SESSION,      PVT_MSG_FLAG,
 	/* registered by json module */
 	PVT_JSON,
 	/* registered by xml module */