Changeset 1070 for pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c

Timestamp:

Mar 15, 2007 9:15:16 PM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #182: SDP negotiation failed when local does not specify telephone-event (thanks Esbjorn Dominique)

File:

• pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/sdp_neg.c

@@ -804 +804 @@
 
     /* See if all types of offer can be matched. */
-#if 1
     if (offer_has_codec && !found_matching_codec) {
         return PJMEDIA_SDPNEG_NOANSCODEC;
     }
 
+    /* If this comment is removed, negotiation will fail if remote has offered
+       telephone-event and local is not configured with telephone-event
+
     if (offer_has_telephone_event && !found_matching_telephone_event) {
         return PJMEDIA_SDPNEG_NOANSTELEVENT;
     }
+    */
 
     if (offer_has_other && !found_matching_other) {
         return PJMEDIA_SDPNEG_NOANSUNKNOWN;
     }
-#else
-    PJ_TODO(FULL_MATCHING_WITH_TELEPHONE_EVENTS);
-    if (!found_matching_codec &&
-        !found_matching_telephone_event &&
-        !found_matching_other)
-    {
-        /* Some of the payload in the offer has no matching local sdp */
-        return PJ_FALSE;
-    }
-#endif
 
     /* Seems like everything is in order.