mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-04-16 00:41:41 +00:00
Detect proper telephone-event id to use. fix to http://jira.freeswitch.org/browse/MODENDP-4 . using pt.diff.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4390 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
093dc6b4ef
commit
20ffa32772
@ -26,6 +26,7 @@
|
|||||||
* Anthony Minessale II <anthmct@yahoo.com>
|
* Anthony Minessale II <anthmct@yahoo.com>
|
||||||
* Ken Rice, Asteria Solutions Group, Inc <ken@asteriasgi.com>
|
* Ken Rice, Asteria Solutions Group, Inc <ken@asteriasgi.com>
|
||||||
* Paul D. Tinsley <pdt at jackhammer.org>
|
* Paul D. Tinsley <pdt at jackhammer.org>
|
||||||
|
* Bret McDanel <trixter AT 0xdecafbad.com>
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* mod_sofia.c -- SOFIA SIP Endpoint
|
* 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)
|
static uint8_t negotiate_sdp(switch_core_session_t *session, sdp_session_t *sdp)
|
||||||
{
|
{
|
||||||
uint8_t match = 0;
|
uint8_t match = 0;
|
||||||
|
switch_payload_t te = 0;
|
||||||
private_object_t *tech_pvt;
|
private_object_t *tech_pvt;
|
||||||
sdp_media_t *m;
|
sdp_media_t *m;
|
||||||
sdp_attribute_t *a;
|
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;
|
int32_t i;
|
||||||
const switch_codec_implementation_t *mimp = NULL, *near_match = NULL;
|
const switch_codec_implementation_t *mimp = NULL, *near_match = NULL;
|
||||||
|
|
||||||
if (!strcasecmp(map->rm_encoding, "telephone-event")) {
|
if (!te && !strcasecmp(map->rm_encoding, "telephone-event")) {
|
||||||
tech_pvt->te = (switch_payload_t)map->rm_pt;
|
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++) {
|
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) {
|
if (tech_set_codec(tech_pvt, 1) != SWITCH_STATUS_SUCCESS) {
|
||||||
match = 0;
|
match = 0;
|
||||||
}
|
}
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user