modules/sdpops: added sdp_with_transport_like() function

(cherry picked from commit a9b6cf96644589b462f02d009df768fece7e5c03)

modules/sdpops/README

@@ -10,7 +10,7 @@ Daniel-Constantin Mierla
 
    <[email protected]>
 
-   Copyright © 2011 asipto.com
+   Copyright (c) 2011 asipto.com
      __________________________________________________________________
 
    Table of Contents
@@ -34,13 +34,14 @@ Daniel-Constantin Mierla
               4.6. sdp_with_media(type)
               4.7. sdp_remove_media(type)
               4.8. sdp_with_transport(type)
-              4.9. sdp_remove_transport(type)
-              4.10. sdp_with_codecs_by_id(list)
-              4.11. sdp_with_codecs_by_name(list)
-              4.12. sdp_print(level)
-              4.13. sdp_get(avpvar)
-              4.14. sdp_content()
-              4.15. sdp_get_line_startswith(avpvar, string)
+              4.9. sdp_with_transport_like(string)
+              4.10. sdp_remove_transport(type)
+              4.11. sdp_with_codecs_by_id(list)
+              4.12. sdp_with_codecs_by_name(list)
+              4.13. sdp_print(level)
+              4.14. sdp_get(avpvar)
+              4.15. sdp_content()
+              4.16. sdp_get_line_startswith(avpvar, string)
 
    List of Examples
 
@@ -52,13 +53,14 @@ Daniel-Constantin Mierla
    1.6. sdp_with_media usage
    1.7. sdp_remove_media usage
    1.8. sdp_with_transport usage
-   1.9. sdp_remove_transport usage
-   1.10. sdp_with_codecs_by_id usage
-   1.11. sdp_with_codecs_by_name usage
-   1.12. sdp_print usage
-   1.13. sdp_get usage
-   1.14. sdp_content usage
-   1.15. sdp_get_line_startswith usage
+   1.9. sdp_with_transport_like usage
+   1.10. sdp_remove_transport usage
+   1.11. sdp_with_codecs_by_id usage
+   1.12. sdp_with_codecs_by_name usage
+   1.13. sdp_print usage
+   1.14. sdp_get usage
+   1.15. sdp_content usage
+   1.16. sdp_get_line_startswith usage
 
 Chapter 1. Admin Guide
 
@@ -81,13 +83,14 @@ Chapter 1. Admin Guide
         4.6. sdp_with_media(type)
         4.7. sdp_remove_media(type)
         4.8. sdp_with_transport(type)
-        4.9. sdp_remove_transport(type)
-        4.10. sdp_with_codecs_by_id(list)
-        4.11. sdp_with_codecs_by_name(list)
-        4.12. sdp_print(level)
-        4.13. sdp_get(avpvar)
-        4.14. sdp_content()
-        4.15. sdp_get_line_startswith(avpvar, string)
+        4.9. sdp_with_transport_like(string)
+        4.10. sdp_remove_transport(type)
+        4.11. sdp_with_codecs_by_id(list)
+        4.12. sdp_with_codecs_by_name(list)
+        4.13. sdp_print(level)
+        4.14. sdp_get(avpvar)
+        4.15. sdp_content()
+        4.16. sdp_get_line_startswith(avpvar, string)
 
 1. Overview
 
@@ -129,13 +132,14 @@ Chapter 1. Admin Guide
    4.6. sdp_with_media(type)
    4.7. sdp_remove_media(type)
    4.8. sdp_with_transport(type)
-   4.9. sdp_remove_transport(type)
-   4.10. sdp_with_codecs_by_id(list)
-   4.11. sdp_with_codecs_by_name(list)
-   4.12. sdp_print(level)
-   4.13. sdp_get(avpvar)
-   4.14. sdp_content()
-   4.15. sdp_get_line_startswith(avpvar, string)
+   4.9. sdp_with_transport_like(string)
+   4.10. sdp_remove_transport(type)
+   4.11. sdp_with_codecs_by_id(list)
+   4.12. sdp_with_codecs_by_name(list)
+   4.13. sdp_print(level)
+   4.14. sdp_get(avpvar)
+   4.15. sdp_content()
+   4.16. sdp_get_line_startswith(avpvar, string)
 
 4.1.  sdp_remove_codecs_by_id(list)
 
@@ -278,20 +282,37 @@ if(sdp_with_transport("RTP/SAVP"))
 }
 ...
 
-4.9.  sdp_remove_transport(type)
+4.9.  sdp_with_transport_like(string)
+
+   Returns true if the SDP has 'media=media port type ...' line, where
+   type contains string. The parameter can be static string or variable
+   holding a string.
+
+   This function can be used from ANY_ROUTE.
+
+   Example 1.9. sdp_with_transport_like usage
+...
+# check for SAVPF stream
+if(sdp_with_transport("SAVPF"))
+{
+    # the session has a SAVPF stream, e.g., RTP/SAVPF or UDP/TLS/RTP/SAVPF
+}
+...
+
+4.10.  sdp_remove_transport(type)
 
    Remove the streams that match on 'm=media port type ...' line. The
    parameter can be static string or variable holding the transport type.
 
    This function can be used from ANY_ROUTE.
 
-   Example 1.9. sdp_remove_transport usage
+   Example 1.10. sdp_remove_transport usage
 ...
 # remove stream with transport RTP/AVP
 sdp_remove_transport("RTP/AVP");
 ...
 
-4.10.  sdp_with_codecs_by_id(list)
+4.11.  sdp_with_codecs_by_id(list)
 
    Returns true if any of the codecs provided in the parameter 'list' from
    all media streams is found in SDP payload. The parameter 'list' must be
@@ -300,7 +321,7 @@ sdp_remove_transport("RTP/AVP");
 
    This function can be used from ANY_ROUTE.
 
-   Example 1.10. sdp_with_codecs_by_id usage
+   Example 1.11. sdp_with_codecs_by_id usage
 ...
 # test for PCMU
 if(sdp_with_codecs_by_id("0")) { ... }
@@ -308,7 +329,7 @@ if(sdp_with_codecs_by_id("0")) { ... }
 if(sdp_with_codecs_by_id("0,8,3")) { ... }
 ...
 
-4.11.  sdp_with_codecs_by_name(list)
+4.12.  sdp_with_codecs_by_name(list)
 
    Returns true if any of the codecs provided in the parameter 'list' from
    all media streams is found in SDP payload. The parameter 'list' must be
@@ -317,7 +338,7 @@ if(sdp_with_codecs_by_id("0,8,3")) { ... }
 
    This function can be used from ANY_ROUTE.
 
-   Example 1.11. sdp_with_codecs_by_name usage
+   Example 1.12. sdp_with_codecs_by_name usage
 ...
 # test for PCMU
 if(sdp_with_codecs_by_name("PCMU")) { ... }
@@ -325,45 +346,45 @@ if(sdp_with_codecs_by_name("PCMU")) { ... }
 if(sdp_with_codecs_by_name("PCMU,PCMA,GSM")) { ... }
 ...
 
-4.12.  sdp_print(level)
+4.13.  sdp_print(level)
 
    Print the SDP internal structure to log 'level'. The parameter can be
    static integer or variable holding the integer value of the log level.
 
    This function can be used from ANY_ROUTE.
 
-   Example 1.12. sdp_print usage
+   Example 1.13. sdp_print usage
 ...
 # print the SDP
 sdp_print("1");
 ...
 
-4.13.  sdp_get(avpvar)
+4.14.  sdp_get(avpvar)
 
    Store the SDP part of message body in an AVP. Return 1 if SDP is found,
    -1 on error and -2 if there is no SDP part in the message body.
 
    This function can be used from ANY_ROUTE.
 
-   Example 1.13. sdp_get usage
+   Example 1.14. sdp_get usage
 ...
 sdp_get("$avp(sdp)");
 ...
 
-4.14.  sdp_content()
+4.15.  sdp_content()
 
    Return true if the SIP message has SDP body or a SDP part in body.
 
    This function can be used from ANY_ROUTE.
 
-   Example 1.14. sdp_content usage
+   Example 1.15. sdp_content usage
 ...
 if(sdp_content()) {
     ...
 }
 ...
 
-4.15.  sdp_get_line_startswith(avpvar, string)
+4.16.  sdp_get_line_startswith(avpvar, string)
 
    Store the search part of SDP body message with line beginning with
    'string' in an AVP. Return 1 if 'string' is found in SDP, -1 on error
@@ -371,7 +392,7 @@ if(sdp_content()) {
 
    This function can be used from ANY_ROUTE.
 
-   Example 1.15. sdp_get_line_startswith usage
+   Example 1.16. sdp_get_line_startswith usage
 ...
 if(sdp_get_line_startswith("$avp(mline)", "m=")) {
         xlog("m-line: $avp(mline)\n");

modules/sdpops/doc/sdpops_admin.xml

@@ -273,6 +273,31 @@ if(sdp_with_transport("RTP/SAVP"))
     # the session has a SRTP/SAVP stream
 }
 ...
+</programlisting>
+	    </example>
+	</section>
+	<section>
+	    <title>
+		<function moreinfo="none">sdp_with_transport_like(string)</function>
+	    </title>
+	    <para>
+		Returns true if the SDP has 'media=media port type ...' line,
+		where type contains string. The
+		parameter can be static string or variable holding a string.
+	    </para>
+		<para>
+			This function can be used from ANY_ROUTE.
+	    </para>
+		<example>
+		<title><function>sdp_with_transport_like</function> usage</title>
+		<programlisting format="linespecific">
+...
+# check for SAVPF stream
+if(sdp_with_transport("SAVPF"))
+{
+    # the session has a SAVPF stream, e.g., RTP/SAVPF or UDP/TLS/RTP/SAVPF
+}
+...
 </programlisting>
 	    </example>
 	</section>

modules/sdpops/sdpops_mod.c

@@ -48,6 +48,7 @@ static int w_sdp_keep_codecs_by_id(sip_msg_t* msg, char* codecs, char *bar);
 static int w_sdp_keep_codecs_by_name(sip_msg_t* msg, char* codecs, char *bar);
 static int w_sdp_with_media(sip_msg_t* msg, char* media, char *bar);
 static int w_sdp_with_transport(sip_msg_t* msg, char* transport, char *bar);
+static int w_sdp_with_transport_like(sip_msg_t* msg, char* transport, char *bar);
 static int w_sdp_with_codecs_by_id(sip_msg_t* msg, char* codec, char *bar);
 static int w_sdp_with_codecs_by_name(sip_msg_t* msg, char* codec, char *bar);
 static int w_sdp_remove_media(sip_msg_t* msg, char* media, char *bar);
@@ -81,6 +82,8 @@ static cmd_export_t cmds[] = {
 		1, fixup_spve_null,  0, ANY_ROUTE},
 	{"sdp_with_transport",         (cmd_function)w_sdp_with_transport,
 		1, fixup_spve_null,  0, ANY_ROUTE},
+	{"sdp_with_transport_like",  (cmd_function)w_sdp_with_transport_like,
+		1, fixup_spve_null,  0, ANY_ROUTE},
 	{"sdp_remove_transport",       (cmd_function)w_sdp_remove_transport,
 		1, fixup_spve_null,  0, ANY_ROUTE},
 	{"sdp_with_codecs_by_id",      (cmd_function)w_sdp_with_codecs_by_id,
@@ -899,11 +902,45 @@ static int w_sdp_remove_media(sip_msg_t* msg, char* media, char *bar)
 	return 1;
 }
 
+
+/*
+ * ser_memmem() returns the location of the first occurrence of data
+ * pattern b2 of size len2 in memory block b1 of size len1 or
+ * NULL if none is found. Obtained from NetBSD.
+ */
+void *
+ser_memmem(const void *b1, const void *b2, size_t len1, size_t len2)
+{
+        /* Initialize search pointer */
+        char *sp = (char *) b1;
+
+        /* Initialize pattern pointer */
+        char *pp = (char *) b2;
+
+        /* Initialize end of search address space pointer */
+        char *eos = sp + len1 - len2;
+
+        /* Sanity check */
+        if(!(b1 && b2 && len1 && len2))
+                return NULL;
+
+        while (sp <= eos) {
+                if (*sp == *pp)
+                        if (memcmp(sp, pp, len2) == 0)
+                                return sp;
+
+                        sp++;
+        }
+
+        return NULL;
+}
+
+
 /** 
  * @brief check 'media' matches the value of any 'm=media port value ...' lines
  * @return -1 - error; 0 - not found; 1 - found
  */
-static int sdp_with_transport(sip_msg_t *msg, str *transport)
+static int sdp_with_transport(sip_msg_t *msg, str *transport, int like)
 {
 	int sdp_session_num;
 	int sdp_stream_num;
@@ -932,10 +969,16 @@ static int sdp_with_transport(sip_msg_t *msg, str *transport)
 			LM_DBG("stream %d of %d - transport [%.*s]\n",
 					sdp_stream_num, sdp_session_num,
 					sdp_stream->transport.len, sdp_stream->transport.s);
-			if(transport->len==sdp_stream->transport.len
-					&& strncasecmp(sdp_stream->transport.s, transport->s,
-						transport->len)==0)
+			if (like == 0) {
+			    if(transport->len==sdp_stream->transport.len
+			       && strncasecmp(sdp_stream->transport.s, transport->s,
+					      transport->len)==0)
+				return 1;
+			} else {
+			    if (ser_memmem(sdp_stream->transport.s, transport->s,
+					   sdp_stream->transport.len, transport->len)!=NULL)
 				return 1;
+			}
 			sdp_stream_num++;
 		}
 		sdp_session_num++;
@@ -963,7 +1006,31 @@ static int w_sdp_with_transport(sip_msg_t* msg, char* transport, char *bar)
 		return -1;
 	}
 
-	if(sdp_with_transport(msg, &ltransport)<=0)
+	if(sdp_with_transport(msg, &ltransport, 0)<=0)
+		return -1;
+	return 1;
+}
+
+/**
+ *
+ */
+static int w_sdp_with_transport_like(sip_msg_t* msg, char* transport, char *bar)
+{
+	str ltransport = {0, 0};
+
+	if(transport==0)
+	{
+		LM_ERR("invalid parameters\n");
+		return -1;
+	}
+
+	if(fixup_get_svalue(msg, (gparam_p)transport, &ltransport)!=0)
+	{
+		LM_ERR("unable to get the transport value\n");
+		return -1;
+	}
+
+	if(sdp_with_transport(msg, &ltransport, 1)<=0)
 		return -1;
 	return 1;
 }