Detect proper telephone-event id to use. fix to http://jira.freeswitch.org/browse...

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4390 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 1d5e0e134dd93aab1f08513cc0fedf9138f60d9c..5a993a8139a0bbbe0d9f9b929ba2a4d3c7b9378b 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -26,6 +26,7 @@
  * Anthony Minessale II <anthmct@yahoo.com>
  * Ken Rice, Asteria Solutions Group, Inc <ken@asteriasgi.com>
  * Paul D. Tinsley <pdt at jackhammer.org>
+ * Bret McDanel <trixter AT 0xdecafbad.com>
  *
  *
  * mod_sofia.c -- SOFIA SIP Endpoint
@@ -2334,6 +2335,7 @@ static switch_call_cause_t sofia_outgoing_channel(switch_core_session_t *session
 static uint8_t negotiate_sdp(switch_core_session_t *session, sdp_session_t *sdp)
 {
        uint8_t match = 0;
+       switch_payload_t te = 0;
        private_object_t *tech_pvt;
        sdp_media_t *m;
        sdp_attribute_t *a;
@@ -2390,8 +2392,15 @@ static uint8_t negotiate_sdp(switch_core_session_t *session, sdp_session_t *sdp)
                                int32_t i;
                 const switch_codec_implementation_t *mimp = NULL, *near_match = NULL;
 
-                               if (!strcasecmp(map->rm_encoding, "telephone-event")) {
-                                       tech_pvt->te = (switch_payload_t)map->rm_pt;
+                               if (!te && !strcasecmp(map->rm_encoding, "telephone-event")) {
+                                       te = tech_pvt->te = (switch_payload_t)map->rm_pt;
+                               }
+
+                               if (match) {
+                                       if (te) {
+                                               break;
+                                       }
+                                       continue;
                                }
 
                                for (i = 0; i < tech_pvt->num_codecs; i++) {
@@ -2464,7 +2473,6 @@ static uint8_t negotiate_sdp(switch_core_session_t *session, sdp_session_t *sdp)
                                        if (tech_set_codec(tech_pvt, 1) != SWITCH_STATUS_SUCCESS) {
                                                match = 0;
                                        }
-                                       break;
                                }
                        }
                }