kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add separate inbound/outound codec prefs params to sofia profile original codec-prefs sets both to the same value for back-compat 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15658 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-11-24 18:52:57 +00:00
parent aba8d7590f
commit d34d8ae16b
7 changed files with 60 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/sip_profiles/external.xml
View File

@ -24,7 +24,8 @@
<param name="dialplan" value="XML"/> <param name="dialplan" value="XML"/>
<param name="context" value="public"/> <param name="context" value="public"/>
<param name="dtmf-duration" value="100"/> <param name="dtmf-duration" value="100"/>
<param name="codec-prefs" value="$${outbound_codec_prefs}"/> <param name="inbound-codec-prefs" value="$${global_codec_prefs}"/>
<param name="outbound-codec-prefs" value="$${outbound_codec_prefs}"/>
<param name="hold-music" value="$${hold_music}"/> <param name="hold-music" value="$${hold_music}"/>
<param name="rtp-timer-name" value="soft"/> <param name="rtp-timer-name" value="soft"/>
<!--<param name="enable-100rel" value="true"/>--> <!--<param name="enable-100rel" value="true"/>-->

3
conf/sip_profiles/internal-ipv6.xml
View File

@ -14,7 +14,8 @@
<param name="sip-port" value="$${internal_sip_port}"/> <param name="sip-port" value="$${internal_sip_port}"/>
<param name="dialplan" value="XML"/> <param name="dialplan" value="XML"/>
<param name="dtmf-duration" value="100"/> <param name="dtmf-duration" value="100"/>
<param name="codec-prefs" value="$${global_codec_prefs}"/> <param name="inbound-codec-prefs" value="$${global_codec_prefs}"/>
<param name="outbound-codec-prefs" value="$${global_codec_prefs}"/>
<param name="use-rtp-timer" value="true"/> <param name="use-rtp-timer" value="true"/>
<param name="rtp-timer-name" value="soft"/> <param name="rtp-timer-name" value="soft"/>
<!-- ip address to use for rtp --> <!-- ip address to use for rtp -->

3
conf/sip_profiles/internal.xml
View File

@ -47,7 +47,8 @@
<param name="sip-port" value="$${internal_sip_port}"/> <param name="sip-port" value="$${internal_sip_port}"/>
<param name="dialplan" value="XML"/> <param name="dialplan" value="XML"/>
<param name="dtmf-duration" value="100"/> <param name="dtmf-duration" value="100"/>
<param name="codec-prefs" value="$${global_codec_prefs}"/> <param name="inbound-codec-prefs" value="$${global_codec_prefs}"/>
<param name="outbound-codec-prefs" value="$${global_codec_prefs}"/>
<param name="rtp-timer-name" value="soft"/> <param name="rtp-timer-name" value="soft"/>
<!-- ip address to use for rtp, DO NOT USE HOSTNAMES ONLY IP ADDRESSES --> <!-- ip address to use for rtp, DO NOT USE HOSTNAMES ONLY IP ADDRESSES -->
<param name="rtp-ip" value="$${local_ip_v4}"/> <param name="rtp-ip" value="$${local_ip_v4}"/>

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

@ -1966,7 +1966,9 @@ static switch_status_t cmd_status(char **argv, int argc, switch_stream_handle_t
} }
stream->write_function(stream, "HOLD-MUSIC \t%s\n", zstr(profile->hold_music) ? "N/A" : profile->hold_music); stream->write_function(stream, "HOLD-MUSIC \t%s\n", zstr(profile->hold_music) ? "N/A" : profile->hold_music);
stream->write_function(stream, "OUTBOUND-PROXY \t%s\n", zstr(profile->outbound_proxy) ? "N/A" : profile->outbound_proxy); stream->write_function(stream, "OUTBOUND-PROXY \t%s\n", zstr(profile->outbound_proxy) ? "N/A" : profile->outbound_proxy);
stream->write_function(stream, "CODECS \t%s\n", switch_str_nil(profile->codec_string)); stream->write_function(stream, "CODECS IN \t%s\n", switch_str_nil(profile->inbound_codec_string));
stream->write_function(stream, "CODECS OUT \t%s\n", switch_str_nil(profile->outbound_codec_string));
stream->write_function(stream, "TEL-EVENT \t%d\n", profile->te); stream->write_function(stream, "TEL-EVENT \t%d\n", profile->te);
if (profile->dtmf_type == DTMF_2833) { if (profile->dtmf_type == DTMF_2833) {
stream->write_function(stream, "DTMF-MODE \trfc2833\n"); stream->write_function(stream, "DTMF-MODE \trfc2833\n");
@ -2186,7 +2188,9 @@ static switch_status_t cmd_xml_status(char **argv, int argc, switch_stream_handl
stream->write_function(stream, " <tls-bind-url>%s</tls-bind-url>\n", switch_str_nil(profile->tls_bindurl)); stream->write_function(stream, " <tls-bind-url>%s</tls-bind-url>\n", switch_str_nil(profile->tls_bindurl));
stream->write_function(stream, " <hold-music>%s</hold-music>\n", zstr(profile->hold_music) ? "N/A" : profile->hold_music); stream->write_function(stream, " <hold-music>%s</hold-music>\n", zstr(profile->hold_music) ? "N/A" : profile->hold_music);
stream->write_function(stream, " <outbound-proxy>%s</outbound-proxy>\n", zstr(profile->outbound_proxy) ? "N/A" : profile->outbound_proxy); stream->write_function(stream, " <outbound-proxy>%s</outbound-proxy>\n", zstr(profile->outbound_proxy) ? "N/A" : profile->outbound_proxy);
stream->write_function(stream, " <codecs>%s</codecs>\n", switch_str_nil(profile->codec_string)); stream->write_function(stream, " <inbound-codecs>%s</inbound-codecs>\n", switch_str_nil(profile->inbound_codec_string));
stream->write_function(stream, " <outbound-codecs>%s</outbound-codecs>\n", switch_str_nil(profile->outbound_codec_string));
stream->write_function(stream, " <tel-event>%d</tel-event>\n", profile->te); stream->write_function(stream, " <tel-event>%d</tel-event>\n", profile->te);
stream->write_function(stream, " <dtmf-mode>rfc2833</dtmf-mode>\n"); stream->write_function(stream, " <dtmf-mode>rfc2833</dtmf-mode>\n");
stream->write_function(stream, " <dtmf-mode>info</dtmf-mode>\n"); stream->write_function(stream, " <dtmf-mode>info</dtmf-mode>\n");

5
src/mod/endpoints/mod_sofia/mod_sofia.h
View File

@ -459,7 +459,8 @@ struct sofia_profile {
switch_port_t sip_port; switch_port_t sip_port;
switch_port_t tls_sip_port; switch_port_t tls_sip_port;
int tls_version; int tls_version;
char *codec_string; char *inbound_codec_string;
char *outbound_codec_string;
int running; int running;
int dtmf_duration; int dtmf_duration;
uint8_t flags[TFLAG_MAX]; uint8_t flags[TFLAG_MAX];
@ -705,6 +706,8 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32
void sofia_glue_tech_prepare_codecs(private_object_t *tech_pvt); void sofia_glue_tech_prepare_codecs(private_object_t *tech_pvt);
const char *sofia_glue_get_codec_string(private_object_t *tech_pvt);
void sofia_glue_attach_private(switch_core_session_t *session, sofia_profile_t *profile, private_object_t *tech_pvt, const char *channame); void sofia_glue_attach_private(switch_core_session_t *session, sofia_profile_t *profile, private_object_t *tech_pvt, const char *channame);
switch_status_t sofia_glue_tech_choose_port(private_object_t *tech_pvt, int force); switch_status_t sofia_glue_tech_choose_port(private_object_t *tech_pvt, int force);

16
src/mod/endpoints/mod_sofia/sofia.c
View File

@ -2179,7 +2179,12 @@ switch_status_t reconfig_sofia(sofia_profile_t *profile)
} else if (!strcasecmp(var, "max-calls")) { } else if (!strcasecmp(var, "max-calls")) {
profile->max_calls = atoi(val); profile->max_calls = atoi(val);
} else if (!strcasecmp(var, "codec-prefs")) { } else if (!strcasecmp(var, "codec-prefs")) {
profile->codec_string = switch_core_strdup(profile->pool, val); profile->inbound_codec_string = switch_core_strdup(profile->pool, val);
profile->outbound_codec_string = switch_core_strdup(profile->pool, val);
} else if (!strcasecmp(var, "inbound-codec-prefs")) {
profile->inbound_codec_string = switch_core_strdup(profile->pool, val);
} else if (!strcasecmp(var, "outbound-codec-prefs")) {
profile->outbound_codec_string = switch_core_strdup(profile->pool, val);
} else if (!strcasecmp(var, "challenge-realm")) { } else if (!strcasecmp(var, "challenge-realm")) {
profile->challenge_realm = switch_core_strdup(profile->pool, val); profile->challenge_realm = switch_core_strdup(profile->pool, val);
} else if (!strcasecmp(var, "dtmf-duration")) { } else if (!strcasecmp(var, "dtmf-duration")) {
@ -2883,7 +2888,12 @@ switch_status_t config_sofia(int reload, char *profile_name)
} else if (!strcasecmp(var, "max-calls")) { } else if (!strcasecmp(var, "max-calls")) {
profile->max_calls = atoi(val); profile->max_calls = atoi(val);
} else if (!strcasecmp(var, "codec-prefs")) { } else if (!strcasecmp(var, "codec-prefs")) {
profile->codec_string = switch_core_strdup(profile->pool, val); profile->inbound_codec_string = switch_core_strdup(profile->pool, val);
profile->outbound_codec_string = switch_core_strdup(profile->pool, val);
} else if (!strcasecmp(var, "inbound-codec-prefs")) {
profile->inbound_codec_string = switch_core_strdup(profile->pool, val);
} else if (!strcasecmp(var, "outbound-codec-prefs")) {
profile->outbound_codec_string = switch_core_strdup(profile->pool, val);
} else if (!strcasecmp(var, "challenge-realm")) { } else if (!strcasecmp(var, "challenge-realm")) {
profile->challenge_realm = switch_core_strdup(profile->pool, val); profile->challenge_realm = switch_core_strdup(profile->pool, val);
} else if (!strcasecmp(var, "dtmf-duration")) { } else if (!strcasecmp(var, "dtmf-duration")) {
@ -3700,7 +3710,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
if (sofia_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION) && (parser = sdp_parse(NULL, r_sdp, (int) strlen(r_sdp), 0))) { if (sofia_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION) && (parser = sdp_parse(NULL, r_sdp, (int) strlen(r_sdp), 0))) {
if ((sdp = sdp_session(parser))) { if ((sdp = sdp_session(parser))) {
sofia_glue_set_r_sdp_codec_string(session, (tech_pvt->profile?tech_pvt->profile->codec_string:NULL), sdp); sofia_glue_set_r_sdp_codec_string(session, sofia_glue_get_codec_string(tech_pvt), sdp);
} }
sdp_parser_free(parser); sdp_parser_free(parser);
} }

25
src/mod/endpoints/mod_sofia/sofia_glue.c
View File

@ -409,6 +409,19 @@ void sofia_glue_set_local_sdp(private_object_t *tech_pvt, const char *ip, uint32
sofia_glue_tech_set_local_sdp(tech_pvt, buf, SWITCH_TRUE); sofia_glue_tech_set_local_sdp(tech_pvt, buf, SWITCH_TRUE);
} }
const char *sofia_glue_get_codec_string(private_object_t *tech_pvt)
{
const char *codec_string = NULL;
if (switch_channel_direction(tech_pvt->channel) == SWITCH_CALL_DIRECTION_OUTBOUND && !zstr(tech_pvt->profile->outbound_codec_string)) {
codec_string = tech_pvt->profile->outbound_codec_string ? tech_pvt->profile->outbound_codec_string : tech_pvt->profile->inbound_codec_string;
} else if (!zstr(tech_pvt->profile->inbound_codec_string)) {
codec_string = tech_pvt->profile->inbound_codec_string ? tech_pvt->profile->inbound_codec_string : tech_pvt->profile->outbound_codec_string;
}
return codec_string;
}
void sofia_glue_tech_prepare_codecs(private_object_t *tech_pvt) void sofia_glue_tech_prepare_codecs(private_object_t *tech_pvt)
{ {
const char *abs, *codec_string = NULL; const char *abs, *codec_string = NULL;
@ -426,10 +439,14 @@ void sofia_glue_tech_prepare_codecs(private_object_t *tech_pvt)
if ((abs = switch_channel_get_variable(tech_pvt->channel, "absolute_codec_string"))) { if ((abs = switch_channel_get_variable(tech_pvt->channel, "absolute_codec_string"))) {
codec_string = abs; codec_string = abs;
} else { goto ready;
}
if (!(codec_string = switch_channel_get_variable(tech_pvt->channel, "codec_string"))) { if (!(codec_string = switch_channel_get_variable(tech_pvt->channel, "codec_string"))) {
if (tech_pvt->profile->codec_string) { codec_string = sofia_glue_get_codec_string(tech_pvt);
codec_string = tech_pvt->profile->codec_string; if (codec_string && *codec_string == '=') {
codec_string++;
goto ready;
} }
} }
@ -442,8 +459,8 @@ void sofia_glue_tech_prepare_codecs(private_object_t *tech_pvt)
} }
} }
} }
}
ready:
if (codec_string) { if (codec_string) {
char *tmp_codec_string; char *tmp_codec_string;