From 51447009279f83999a2271a6c0874ef95005175e Mon Sep 17 00:00:00 2001 From: Steve Underwood Date: Sun, 3 Feb 2013 16:28:20 +0800 Subject: [PATCH] Changed the ..._image_sdp routine to ..._udptl_image_sdp in preparation for adding other kinds of image (specifically RTP and TCP/TPKT). --- src/mod/endpoints/mod_sofia/mod_sofia.c | 6 +++--- src/mod/endpoints/mod_sofia/mod_sofia.h | 2 +- src/mod/endpoints/mod_sofia/sofia_glue.c | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c index f8d9163435..90837150d4 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.c +++ b/src/mod/endpoints/mod_sofia/mod_sofia.c @@ -2063,7 +2063,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi start_udptl(tech_pvt, t38_options); - sofia_glue_set_image_sdp(tech_pvt, t38_options, msg->numeric_arg); + sofia_glue_set_udptl_image_sdp(tech_pvt, t38_options, msg->numeric_arg); if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) { char *extra_headers = sofia_glue_get_extra_headers(channel, SOFIA_SIP_RESPONSE_HEADER_PREFIX); @@ -2095,7 +2095,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi switch_t38_options_t *t38_options = switch_channel_get_private(tech_pvt->channel, "t38_options"); if (t38_options) { - sofia_glue_set_image_sdp(tech_pvt, t38_options, msg->numeric_arg); + sofia_glue_set_udptl_image_sdp(tech_pvt, t38_options, msg->numeric_arg); if (!switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { switch_channel_set_flag(channel, CF_REQ_MEDIA); @@ -2635,7 +2635,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi if (!strcasecmp(sdp, "t38")) { switch_t38_options_t *t38_options = switch_channel_get_private(tech_pvt->channel, "t38_options"); if (t38_options) { - sofia_glue_set_image_sdp(tech_pvt, t38_options, 0); + sofia_glue_set_udptl_image_sdp(tech_pvt, t38_options, 0); if (switch_rtp_ready(tech_pvt->rtp_session)) { sofia_clear_flag(tech_pvt, TFLAG_NOTIMER_DURING_BRIDGE); switch_rtp_udptl_mode(tech_pvt->rtp_session); diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.h b/src/mod/endpoints/mod_sofia/mod_sofia.h index 82c68516fb..2690f0ee32 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.h +++ b/src/mod/endpoints/mod_sofia/mod_sofia.h @@ -1142,7 +1142,7 @@ int sofia_glue_toggle_hold(private_object_t *tech_pvt, int sendonly); const char *sofia_state_string(int state); switch_status_t sofia_glue_tech_set_codec(private_object_t *tech_pvt, int force); void sofia_wait_for_reply(struct private_object *tech_pvt, nua_event_t event, uint32_t timeout); -void sofia_glue_set_image_sdp(private_object_t *tech_pvt, switch_t38_options_t *t38_options, int insist); +void sofia_glue_set_udptl_image_sdp(private_object_t *tech_pvt, switch_t38_options_t *t38_options, int insist); /* * Logging control functions diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c index 79d33fc497..7657488933 100644 --- a/src/mod/endpoints/mod_sofia/sofia_glue.c +++ b/src/mod/endpoints/mod_sofia/sofia_glue.c @@ -39,7 +39,7 @@ switch_cache_db_handle_t *_sofia_glue_get_db_handle(sofia_profile_t *profile, const char *file, const char *func, int line); #define sofia_glue_get_db_handle(_p) _sofia_glue_get_db_handle(_p, __FILE__, __SWITCH_FUNC__, __LINE__) -void sofia_glue_set_image_sdp(private_object_t *tech_pvt, switch_t38_options_t *t38_options, int insist) +void sofia_glue_set_udptl_image_sdp(private_object_t *tech_pvt, switch_t38_options_t *t38_options, int insist) { char buf[2048] = ""; char max_buf[128] = ""; @@ -110,7 +110,9 @@ void sofia_glue_set_image_sdp(private_object_t *tech_pvt, switch_t38_options_t * switch_snprintf(buf, sizeof(buf), "v=0\n" "o=%s %010u %010u IN %s %s\n" - "s=%s\n" "c=IN %s %s\n" "t=0 0\n", username, tech_pvt->owner_id, tech_pvt->session_id, family, ip, username, family, ip); + "s=%s\n" + "c=IN %s %s\n" + "t=0 0\n", username, tech_pvt->owner_id, tech_pvt->session_id, family, ip, username, family, ip); if (t38_options->T38FaxMaxBuffer) { switch_snprintf(max_buf, sizeof(max_buf), "a=T38FaxMaxBuffer:%d\n", t38_options->T38FaxMaxBuffer);