Changeset 1639 for pjproject/trunk/pjmedia/src/pjmedia/session.c

Timestamp:

Dec 28, 2007 8:51:58 AM (16 years ago)

Author:

bennylp

Message:

Ticket #433: Failure in media negotiation when SDP contains two audio media lines (thanks Arie Velthoen)

File:

• pjproject/trunk/pjmedia/src/pjmedia/session.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/session.c

@@ -54 +54 @@
 static const pj_str_t ID_IP4 = { "IP4", 3};
 static const pj_str_t ID_IP6 = { "IP6", 3};
-/*static const pj_str_t ID_RTP_AVP = { "RTP/AVP", 7 };*/
-/*static const pj_str_t ID_SDP_NAME = { "pjmedia", 7 };*/
+static const pj_str_t ID_RTP_AVP = { "RTP/AVP", 7 };
+static const pj_str_t ID_RTP_SAVP = { "RTP/SAVP", 8 };
+//static const pj_str_t ID_SDP_NAME = { "pjmedia", 7 };
 static const pj_str_t ID_RTPMAP = { "rtpmap", 6 };
 static const pj_str_t ID_TELEPHONE_EVENT = { "telephone-event", 15 };
@@ -181 +182 @@
     }
 
+    /* Transport protocol */
+
     /* Transport type must be equal */
     if (pj_stricmp(&rem_m->desc.transport, 
@@ -188 +191 @@
         return PJMEDIA_SDPNEG_EINVANSTP;
     }
+
+    if (pj_stricmp(&local_m->desc.transport, &ID_RTP_AVP) == 0) {
+
+        si->proto = PJMEDIA_TP_PROTO_RTP_AVP;
+
+    } else if (pj_stricmp(&local_m->desc.transport, &ID_RTP_SAVP) == 0) {
+
+        si->proto = PJMEDIA_TP_PROTO_RTP_SAVP;
+
+    } else {
+
+        si->proto = PJMEDIA_TP_PROTO_UNKNOWN;
+        return PJMEDIA_SDP_EINPROTO;
+    }
+
 
     /* Check address family in remote SDP */