FS-3748 --resolve

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 91012691252a7f7b2e89a96a67981ba9f5f84df1..1b9f64b3afcaa52626ff690917ad6b196c58ad13 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Tue Nov 22 18:16:53 CST 2011
+Tue Dec  6 18:12:20 CST 2011

diff --git a/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c b/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c
index 6455f4b5c837cb5bfb9742c19b6957ad8f348377..027544a00aa1ffc073ead23bcf4f4d7948ad4c6d 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c
+++ b/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c
@@ -1389,6 +1389,10 @@ void sdp_media_transport(sdp_media_t *m, char const *s)
   else if (su_casematch(s, "udptl"))
     /* Lower case - be compatible with people living by T.38 examples */
     m->m_proto = sdp_proto_udptl, m->m_proto_name = "udptl";
+  else if (su_casematch(s, "TCP/MSRP"))
+    m->m_proto = sdp_proto_msrp, m->m_proto_name = "TCP/MSRP";
+  else if (su_casematch(s, "TCP/TLS/MSRP"))
+    m->m_proto = sdp_proto_msrps, m->m_proto_name = "TCP/TLS/MSRP";
   else if (su_casematch(s, "UDP"))
     m->m_proto = sdp_proto_udp, m->m_proto_name = "UDP";
   else if (su_casematch(s, "TCP"))

diff --git a/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c b/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c
index e94c6b6758bbdbba2003d7c15b764e80e0c82807..87c706b27c2ae16df82664e77fa71c22f101ed1f 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c
+++ b/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c
@@ -591,6 +591,8 @@ static void print_media(sdp_printer_t *p,
     case sdp_proto_rtp:   proto = "RTP/AVP"; break;
     case sdp_proto_srtp:  proto = "RTP/SAVP"; break;
     case sdp_proto_udptl: proto = "udptl"; break;
+    case sdp_proto_msrp:  proto = "TCP/MSRP"; break;
+    case sdp_proto_msrps:  proto = "TCP/TLS/MSRP"; break;
     case sdp_proto_tls:   proto = "tls"; break;
     default:              proto = m->m_proto_name; break;
     }

diff --git a/libs/sofia-sip/libsofia-sip-ua/sdp/sofia-sip/sdp.h b/libs/sofia-sip/libsofia-sip-ua/sdp/sofia-sip/sdp.h
index bb39bca54b138df10806a5b4aedcf80fd18e541b..e4af3836a37f8cae87efdf5e523f55d6918ce726 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/sdp/sofia-sip/sdp.h
+++ b/libs/sofia-sip/libsofia-sip-ua/sdp/sofia-sip/sdp.h
@@ -243,6 +243,8 @@ typedef enum
   sdp_proto_rtp = 256,                 /**< RTP/AVP */
   sdp_proto_srtp = 257,                        /**< RTP/SAVP  */
   sdp_proto_udptl = 258,               /**< UDPTL. @NEW_1_12_4. */
+  sdp_proto_msrp =  259,               /**< TCP/MSRP @NEW_MSRP*/
+  sdp_proto_msrps = 260,               /**< TCP/TLS/MSRP @NEW_MSRP*/
   sdp_proto_tls = 511,                 /**< TLS over TCP */
   sdp_proto_any = 512                  /**< * wildcard */
 } sdp_proto_e;