提交 8792d338 authored 作者: Michael Jerris's avatar Michael Jerris

don't free reason string passed to nua_respond before we are done using it. (nh…

don't free reason string passed to nua_respond before we are done using it. (nh scope instead of session)

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8731 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 690d5b25
...@@ -988,7 +988,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi ...@@ -988,7 +988,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
} }
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Overlap Dial with %d %s\n", code, reason); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Overlap Dial with %d %s\n", code, reason);
nua_respond(tech_pvt->nh, code, reason, TAG_IF(to_uri, SIPTAG_CONTACT_STR(to_uri)), nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, reason), TAG_IF(to_uri, SIPTAG_CONTACT_STR(to_uri)),
SIPTAG_SUPPORTED_STR(NULL), SIPTAG_ACCEPT_STR(NULL), SIPTAG_SUPPORTED_STR(NULL), SIPTAG_ACCEPT_STR(NULL),
TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)), TAG_END()); TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)), TAG_END());
if (!switch_channel_test_flag(channel, CF_ANSWERED)) { if (!switch_channel_test_flag(channel, CF_ANSWERED)) {
...@@ -1003,12 +1003,12 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi ...@@ -1003,12 +1003,12 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
sofia_glue_tech_patch_sdp(tech_pvt); sofia_glue_tech_patch_sdp(tech_pvt);
sofia_glue_tech_proxy_remote_addr(tech_pvt); sofia_glue_tech_proxy_remote_addr(tech_pvt);
} }
nua_respond(tech_pvt->nh, code, reason, SIPTAG_CONTACT_STR(tech_pvt->reply_contact), nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, reason), SIPTAG_CONTACT_STR(tech_pvt->reply_contact),
SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str),
SOATAG_REUSE_REJECTED(1), SOATAG_REUSE_REJECTED(1),
SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END());
} else { } else {
nua_respond(tech_pvt->nh, code, reason, SIPTAG_CONTACT_STR(tech_pvt->reply_contact), TAG_END()); nua_respond(tech_pvt->nh, code, su_strdup(tech_pvt->nh->nh_home, reason), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), TAG_END());
} }
if (!switch_channel_test_flag(channel, CF_ANSWERED) && code >= 300) { if (!switch_channel_test_flag(channel, CF_ANSWERED) && code >= 300) {
switch_set_flag_locked(tech_pvt, TFLAG_BYE); switch_set_flag_locked(tech_pvt, TFLAG_BYE);
......
...@@ -91,6 +91,7 @@ typedef struct private_object private_object_t; ...@@ -91,6 +91,7 @@ typedef struct private_object private_object_t;
#include <sofia-sip/su_log.h> #include <sofia-sip/su_log.h>
#include <sofia-sip/nea.h> #include <sofia-sip/nea.h>
#include <sofia-sip/msg_addr.h> #include <sofia-sip/msg_addr.h>
#include "nua_stack.h"
typedef enum { typedef enum {
DTMF_2833, DTMF_2833,
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
* *
*/ */
#include "mod_sofia.h" #include "mod_sofia.h"
#include "nua_stack.h"
static void sofia_reg_kill_reg(sofia_gateway_t *gateway_ptr, int unreg) static void sofia_reg_kill_reg(sofia_gateway_t *gateway_ptr, int unreg)
{ {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论