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

tweak 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8785 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-06-06 19:20:01 +00:00
parent 3720a64e04
commit 24a27c6ed5
1 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/switch_cpp.cpp
View File

@ -342,34 +342,13 @@ SWITCH_DECLARE(const char *)Stream::get_data()
SWITCH_DECLARE_CONSTRUCTOR CoreSession::CoreSession() SWITCH_DECLARE_CONSTRUCTOR CoreSession::CoreSession()
{ {
session = NULL; init_vars();
channel = NULL;
uuid = NULL;
tts_name = NULL;
voice_name = NULL;
memset(&args, 0, sizeof(args));
ap = NULL;
on_hangup = NULL;
cb_state.function = NULL;
memset(&caller_profile, 0, sizeof(caller_profile));
caller_profile.source = "mod_unknown";
caller_profile.dialplan = "";
caller_profile.context = "";
caller_profile.caller_id_name = "";
caller_profile.caller_id_number = "";
caller_profile.network_addr = "";
caller_profile.ani = "";
caller_profile.aniii = "";
caller_profile.rdnis = "";
caller_profile.username = "";
} }
SWITCH_DECLARE_CONSTRUCTOR CoreSession::CoreSession(char *nuuid) SWITCH_DECLARE_CONSTRUCTOR CoreSession::CoreSession(char *nuuid)
{ {
memset(&caller_profile, 0, sizeof(caller_profile));
init_vars(); init_vars();
if (!strchr(nuuid, '/') && (session = switch_core_session_locate(nuuid))) { if (!strchr(nuuid, '/') && (session = switch_core_session_locate(nuuid))) {
uuid = strdup(nuuid); uuid = strdup(nuuid);
channel = switch_core_session_get_channel(session); channel = switch_core_session_get_channel(session);
@ -388,8 +367,8 @@ SWITCH_DECLARE_CONSTRUCTOR CoreSession::CoreSession(char *nuuid)
SWITCH_DECLARE_CONSTRUCTOR CoreSession::CoreSession(switch_core_session_t *new_session) SWITCH_DECLARE_CONSTRUCTOR CoreSession::CoreSession(switch_core_session_t *new_session)
{ {
memset(&caller_profile, 0, sizeof(caller_profile));
init_vars(); init_vars();
if (new_session) { if (new_session) {
session = new_session; session = new_session;
channel = switch_core_session_get_channel(session); channel = switch_core_session_get_channel(session);
@ -403,14 +382,12 @@ SWITCH_DECLARE_CONSTRUCTOR CoreSession::~CoreSession()
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CoreSession::~CoreSession desctructor\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CoreSession::~CoreSession desctructor\n");
switch_channel_t *channel = NULL; switch_channel_t *channel = NULL;
init_vars();
this_check_void(); this_check_void();
switch_safe_free(xml_cdr_text); switch_safe_free(xml_cdr_text);
switch_safe_free(uuid); switch_safe_free(uuid);
switch_safe_free(tts_name); switch_safe_free(tts_name);
switch_safe_free(voice_name); switch_safe_free(voice_name);
if (session) { if (session) {
channel = switch_core_session_get_channel(session); channel = switch_core_session_get_channel(session);
if (switch_test_flag(this, S_HUP) && !switch_channel_test_flag(channel, CF_TRANSFER)) { if (switch_test_flag(this, S_HUP) && !switch_channel_test_flag(channel, CF_TRANSFER)) {