retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

doh 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3679 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-12-16 22:47:41 +00:00
parent 3137cee530
commit 487cb888d0
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mod/applications/mod_conference/mod_conference.c
View File

@ -2052,6 +2052,7 @@ static switch_status_t conf_function(char *buf, switch_core_session_t *session,
char *lbuf = NULL; char *lbuf = NULL;
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
char *http = NULL; char *http = NULL;
switch_memory_pool_t *pool = NULL;
if (session) { if (session) {
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
@ -2445,6 +2446,10 @@ static switch_status_t conf_function(char *buf, switch_core_session_t *session,
} }
} else if (!strcasecmp(argv[1], "transfer")) { } else if (!strcasecmp(argv[1], "transfer")) {
char *transfer_usage = "Usage transfer <confname> <id> [..<idN>]\n"; char *transfer_usage = "Usage transfer <confname> <id> [..<idN>]\n";
if (switch_strlen_zero(argv[2])) {
stream->write_function(stream, transfer_usage);
goto done;
}
if (argc > 3) { if (argc > 3) {
int x = 0; int x = 0;
for(x = 3; x < argc; x++) { for(x = 3; x < argc; x++) {
@ -2464,7 +2469,6 @@ static switch_status_t conf_function(char *buf, switch_core_session_t *session,
channel = switch_core_session_get_channel(member->session); channel = switch_core_session_get_channel(member->session);
if (!(new_conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[2]))) { if (!(new_conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[2]))) {
switch_memory_pool_t *pool;
char *conf_name; char *conf_name;
/* Setup a memory pool to use. */ /* Setup a memory pool to use. */
@ -2511,6 +2515,7 @@ static switch_status_t conf_function(char *buf, switch_core_session_t *session,
/* Indicate the conference is dynamic */ /* Indicate the conference is dynamic */
switch_set_flag_locked(new_conference, CFLAG_DYNAMIC); switch_set_flag_locked(new_conference, CFLAG_DYNAMIC);
pool = NULL;
/* Start the conference thread for this conference */ /* Start the conference thread for this conference */
launch_conference_thread(new_conference); launch_conference_thread(new_conference);
} }
@ -2638,12 +2643,12 @@ static switch_status_t conf_function(char *buf, switch_core_session_t *session,
stream->write_function(stream, "Memory Error!\n"); stream->write_function(stream, "Memory Error!\n");
} }
done: done:
if (lbuf) { switch_safe_free(lbuf);
free(lbuf); if (pool) {
switch_core_destroy_memory_pool(&pool);
} }
return status; return status;
} }