kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-14 08:05:37 +00:00
Code Issues Projects Releases Wiki Activity

add more sanity check to the switch_cpp

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7994 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-03-31 18:04:22 +00:00
parent f1397e4450
commit 94b2225873
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/switch_cpp.h
View File

@ -113,6 +113,7 @@ class CoreSession {
switch_core_session_t *session;
switch_channel_t *channel;
unsigned int flags;
int allocated;
input_callback_state cb_state; // callback state, always pointed to by the buf
// field in this->args
switch_channel_state_t hook_state; // store hookstate for on_hangup callback

18
src/switch_cpp.cpp
View File

@ -37,8 +37,8 @@
#pragma warning(disable:4127 4003)
#endif
#define sanity_check(x) do { if (!session) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return x;}} while(0)
#define sanity_check_noreturn do { if (!session) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return;}} while(0)
#define sanity_check(x) do { if (!(session && allocated)) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return x;}} while(0)
#define sanity_check_noreturn do { if (!(session && allocated)) { switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "session is not initalized\n"); return;}} while(0)
#define init_vars() do { session = NULL; channel = NULL; uuid = NULL; tts_name = NULL; voice_name = NULL; memset(&args, 0, sizeof(args)); ap = NULL; 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 = ""; on_hangup = NULL; cb_state.function = NULL; } while(0)
@ -54,7 +54,7 @@ CoreSession::CoreSession()
ap = NULL;
on_hangup = NULL;
cb_state.function = NULL;
memset(&caller_profile, 0, sizeof(caller_profile));
caller_profile.source = "mod_unknown";
caller_profile.dialplan = "";
@ -71,11 +71,13 @@ CoreSession::CoreSession()
CoreSession::CoreSession(char *nuuid)
{
memset(&caller_profile, 0, sizeof(caller_profile));
init_vars();
uuid = strdup(nuuid);
if (session = switch_core_session_locate(uuid)) {
if (session = switch_core_session_locate(nuuid)) {
channel = switch_core_session_get_channel(session);
init_vars();
uuid = strdup(nuuid);
memset(&caller_profile, 0, sizeof(caller_profile));
allocated = 1;
}
}
@ -85,6 +87,7 @@ CoreSession::CoreSession(switch_core_session_t *new_session)
init_vars();
session = new_session;
channel = switch_core_session_get_channel(session);
allocated = 1;
switch_core_session_read_lock(session);
}
@ -369,6 +372,7 @@ int CoreSession::originate(CoreSession *a_leg_session,
}
if (a_leg_session) a_leg_session->end_allow_threads();
allocated = 1;
return SWITCH_STATUS_SUCCESS;
failed: