kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-13 15:50:59 +00:00
Code Issues Projects Releases Wiki Activity

figure out when we are on hold

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3185 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-10-24 21:31:39 +00:00
parent e22015c799
commit 521e3b0a55
3 changed files with 648 additions and 1324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

646
libs/libspeakup/aclocal.m4 vendored
View File

File diff suppressed because it is too large Load Diff

1287
libs/libspeakup/configure vendored
View File

File diff suppressed because it is too large Load Diff

39
src/mod/endpoints/mod_sofia/mod_sofia.c
View File

@ -161,7 +161,8 @@ typedef enum {
TFLAG_NOHUP = (1 << 18),
TFLAG_XFER = (1 << 19),
TFLAG_NOMEDIA = (1 << 20),
TFLAG_BUGGY_2833 = (1 << 21)
TFLAG_BUGGY_2833 = (1 << 21),
TFLAG_SIP_HOLD = (1 << 22)
} TFLAGS;
static struct {
@ -1203,12 +1204,15 @@ static void deactivate_rtp(private_object_t *tech_pvt)
}
}
static switch_status_t tech_set_codec(private_object_t *tech_pvt)
static switch_status_t tech_set_codec(private_object_t *tech_pvt, int force)
{
switch_channel_t *channel;
assert(tech_pvt->codecs[tech_pvt->codec_index] != NULL);
if (tech_pvt->read_codec.implementation) {
if (!force) {
return SWITCH_STATUS_SUCCESS;
}
if (strcasecmp(tech_pvt->read_codec.implementation->iananame, tech_pvt->rm_encoding) ||
tech_pvt->read_codec.implementation->samples_per_second != tech_pvt->rm_rate) {
@ -1291,7 +1295,7 @@ static switch_status_t activate_rtp(private_object_t *tech_pvt)
return SWITCH_STATUS_SUCCESS;
}
if ((status = tech_set_codec(tech_pvt)) != SWITCH_STATUS_SUCCESS) {
if ((status = tech_set_codec(tech_pvt, 0)) != SWITCH_STATUS_SUCCESS) {
return status;
}
@ -1945,6 +1949,8 @@ static uint8_t negotiate_sdp(switch_core_session_t *session, sdp_session_t *sdp)
uint8_t match = 0;
private_object_t *tech_pvt;
sdp_media_t *m;
sdp_attribute_t *a;
tech_pvt = switch_core_session_get_private(session);
assert(tech_pvt != NULL);
@ -1956,6 +1962,14 @@ static uint8_t negotiate_sdp(switch_core_session_t *session, sdp_session_t *sdp)
}
}
for (a = sdp->sdp_attributes; a; a = a->a_next) {
if (!strcasecmp(a->a_name, "sendonly")) {
switch_set_flag_locked(tech_pvt, TFLAG_SIP_HOLD);
} else if (!strcasecmp(a->a_name, "sendrecv")) {
switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD);
}
}
for (m = sdp->sdp_media; m ; m = m->m_next) {
if (m->m_type == sdp_media_audio) {
sdp_rtpmap_t *map;
@ -1992,7 +2006,7 @@ static uint8_t negotiate_sdp(switch_core_session_t *session, sdp_session_t *sdp)
}
if (match) {
if (tech_set_codec(tech_pvt) != SWITCH_STATUS_SUCCESS) {
if (tech_set_codec(tech_pvt, 1) != SWITCH_STATUS_SUCCESS) {
match = 0;
}
break;
@ -2441,14 +2455,15 @@ static void sip_i_state(int status,
match = negotiate_sdp(session, sdp);
}
}
tech_choose_port(tech_pvt);
set_local_sdp(tech_pvt);
tech_set_codec(tech_pvt);
switch_set_flag_locked(tech_pvt, TFLAG_REINVITE);
activate_rtp(tech_pvt);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Processing Reinvite\n");
if (parser) {
sdp_parser_free(parser);
if (match) {
tech_choose_port(tech_pvt);
set_local_sdp(tech_pvt);
switch_set_flag_locked(tech_pvt, TFLAG_REINVITE);
activate_rtp(tech_pvt);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Processing Reinvite\n");
if (parser) {
sdp_parser_free(parser);
}
}
}
}