October 2006 - Freeswitch-branches - FreeSWITCH Mailing Lists

[commit] r3149 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 22 Oct '06

22 Oct '06

Author: knhor Date: Sat Oct 21 23:30:15 2006 New Revision: 3149 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Log: rename conference_list_itterator to conference_member_itterator so that it matches trunk Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Sat Oct 21 23:30:15 2006 @@ -233,7 +233,7 @@ static switch_status_t chat_send(char *proto, char *from, char *to, char *subject, char *body, char *hint); static void launch_conference_record_thread(conference_obj_t *conference, char *path); -static void conference_list_itterator(conference_obj_t *conference, +static void conference_member_itterator(conference_obj_t *conference, switch_stream_handle_t *stream, int (*pfncallback)(conference_obj_t*, conference_member_t*, int, switch_stream_handle_t*, void*), void *data); @@ -1484,7 +1484,7 @@ return SWITCH_STATUS_SUCCESS; } -static void conference_list_itterator(conference_obj_t *conference, switch_stream_handle_t *stream, int (*pfncallback)(conference_obj_t*, conference_member_t*, int, switch_stream_handle_t*, void*), void *data) +static void conference_member_itterator(conference_obj_t *conference, switch_stream_handle_t *stream, int (*pfncallback)(conference_obj_t*, conference_member_t*, int, switch_stream_handle_t*, void*), void *data) { conference_member_t *member = NULL; @@ -2077,7 +2077,7 @@ conference_function_mute_member(conference, NULL, id, stream, NULL); goto done; } else { - conference_list_itterator(conference, stream, &conference_function_mute_member, NULL); + conference_member_itterator(conference, stream, &conference_function_mute_member, NULL); goto done; } } else { @@ -2093,7 +2093,7 @@ conference_function_unmute_member(conference, NULL, id, stream, NULL); goto done; } else { - conference_list_itterator(conference, stream, &conference_function_unmute_member, NULL); + conference_member_itterator(conference, stream, &conference_function_unmute_member, NULL); goto done; } } else { @@ -2109,7 +2109,7 @@ conference_function_deaf_member(conference, NULL, id, stream, NULL); goto done; } else { - conference_list_itterator(conference, stream, &conference_function_deaf_member, NULL); + conference_member_itterator(conference, stream, &conference_function_deaf_member, NULL); goto done; } } else { @@ -2125,7 +2125,7 @@ conference_function_undeaf_member(conference, NULL, id, stream, NULL); goto done; } else { - conference_list_itterator(conference, stream, &conference_function_undeaf_member, NULL); + conference_member_itterator(conference, stream, &conference_function_undeaf_member, NULL); goto done; } } else { @@ -2151,7 +2151,7 @@ conference_function_kick_member(conference, NULL, id, stream, NULL); goto done; } else { - conference_list_itterator(conference, stream, &conference_function_kick_member, NULL); + conference_member_itterator(conference, stream, &conference_function_kick_member, NULL); goto done; } } else {

1 0

[commit] r3148 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 22 Oct '06

22 Oct '06

Author: knhor Date: Sat Oct 21 23:24:08 2006 New Revision: 3148 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Log: merge -r3138:3139 from trunk Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Sat Oct 21 23:24:08 2006 @@ -73,7 +73,8 @@ MFLAG_CAN_SPEAK = (1 << 1), MFLAG_CAN_HEAR = (1 << 2), MFLAG_KICKED = (1 << 3), - MFLAG_ITHREAD = (1 << 4) + MFLAG_ITHREAD = (1 << 4), + MFLAG_NOCHANNEL = (1 << 5) } member_flag_t; @@ -170,6 +171,7 @@ switch_mutex_t *audio_out_mutex; switch_codec_t read_codec; switch_codec_t write_codec; + char *rec_path; uint8_t *frame; uint8_t *mux_frame; uint32_t buflen; @@ -186,6 +188,15 @@ struct conference_member *next; }; +/* Record Node */ +struct conference_record { + conference_obj_t *conference; + char *path; + switch_memory_pool_t *pool; +}; +typedef struct conference_record conference_record_t; + + /* Function Prototypes */ static uint32_t next_member_id(void); static conference_relationship_t *member_get_relationship(conference_member_t *member, conference_member_t *other_member); @@ -220,6 +231,7 @@ static conference_obj_t *conference_new(char *name, switch_xml_t profile, switch_memory_pool_t *pool); static void switch_change_sln_volume(int16_t *data, uint32_t samples, int32_t vol); static switch_status_t chat_send(char *proto, char *from, char *to, char *subject, char *body, char *hint); +static void launch_conference_record_thread(conference_obj_t *conference, char *path); static void conference_list_itterator(conference_obj_t *conference, switch_stream_handle_t *stream, @@ -299,6 +311,11 @@ conference_member_t *member = NULL; for(member = conference->members; member; member = member->next) { + + if (switch_test_flag(member, MFLAG_NOCHANNEL)) { + continue; + } + if (member->id == id) { break; } @@ -307,6 +324,17 @@ return member; } +static void conference_record_stop(conference_obj_t *conference, char *path) +{ + conference_member_t *member = NULL; + + for(member = conference->members; member; member = member->next) { + if (switch_test_flag(member, MFLAG_NOCHANNEL) && (!path || !strcmp(path, member->rec_path))) { + switch_clear_flag_locked(member, MFLAG_RUNNING); + } + } +} + /* Add a custom relationship to a member */ static conference_relationship_t *member_add_relationship(conference_member_t *member, uint32_t id) { @@ -364,39 +392,41 @@ member->next = conference->members; member->energy_level = conference->energy_level; conference->members = member; - conference->count++; - if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Active (%d caller%s)", conference->count, conference->count == 1 ? "" : "s"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); - switch_event_fire(&event); - } + if (!switch_test_flag(member, MFLAG_NOCHANNEL)) { + conference->count++; + if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Active (%d caller%s)", conference->count, conference->count == 1 ? "" : "s"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); + switch_event_fire(&event); + } - if (conference->enter_sound) { - conference_play_file(conference, conference->enter_sound, CONF_DEFAULT_LEADIN); - } - if (conference->count == 1 && conference->alone_sound) { - conference_play_file(conference, conference->alone_sound, 0); - } + if (conference->enter_sound) { + conference_play_file(conference, conference->enter_sound, CONF_DEFAULT_LEADIN); + } + + if (conference->count == 1 && conference->alone_sound) { + conference_play_file(conference, conference->alone_sound, 0); + } - if (conference->min && conference->count >= conference->min) { - switch_set_flag(conference, CFLAG_ENFORCE_MIN); - } + if (conference->min && conference->count >= conference->min) { + switch_set_flag(conference, CFLAG_ENFORCE_MIN); + } - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "add-member"); - switch_event_fire(&event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "add-member"); + switch_event_fire(&event); + } } - switch_mutex_unlock(member->flag_mutex); switch_mutex_unlock(member->audio_out_mutex); switch_mutex_unlock(member->audio_in_mutex); @@ -430,39 +460,41 @@ last = imember; } - conference->count--; + member->conference = NULL; - if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Active (%d caller%s)", conference->count, conference->count == 1 ? "" : "s"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); - switch_event_fire(&event); - } + if (!switch_test_flag(member, MFLAG_NOCHANNEL)) { + conference->count--; + if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "login", "%s", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "from", "%s@%s", conference->name, conference->domain); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "Active (%d caller%s)", conference->count, conference->count == 1 ? "" : "s"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); + switch_event_fire(&event); + } - if ((conference->min && switch_test_flag(conference, CFLAG_ENFORCE_MIN) && conference->count < conference->min) - || (switch_test_flag(conference, CFLAG_DYNAMIC) && conference->count == 0) ) { - switch_set_flag(conference, CFLAG_DESTRUCT); - } else { - if (conference->exit_sound) { - conference_play_file(conference, conference->exit_sound, 0); + if ((conference->min && switch_test_flag(conference, CFLAG_ENFORCE_MIN) && conference->count < conference->min) + || (switch_test_flag(conference, CFLAG_DYNAMIC) && conference->count == 0) ) { + switch_set_flag(conference, CFLAG_DESTRUCT); + } else { + if (conference->exit_sound) { + conference_play_file(conference, conference->exit_sound, 0); + } + if (conference->count == 1 && conference->alone_sound) { + conference_play_file(conference, conference->alone_sound, 0); + } } - if (conference->count == 1 && conference->alone_sound) { - conference_play_file(conference, conference->alone_sound, 0); - } - } - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "del-member"); - switch_event_fire(&event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "del-member"); + switch_event_fire(&event); + } } - switch_mutex_unlock(member->flag_mutex); switch_mutex_unlock(member->audio_out_mutex); switch_mutex_unlock(member->audio_in_mutex); @@ -493,7 +525,9 @@ return NULL; } + switch_mutex_lock(globals.hash_mutex); globals.threads++; + switch_mutex_unlock(globals.hash_mutex); while(globals.running && !switch_test_flag(conference, CFLAG_DESTRUCT)) { uint8_t file_frame[CONF_BUFFER_SIZE] = {0}; @@ -677,23 +711,32 @@ switch_mutex_lock(conference->mutex); for(imember = conference->members; imember; imember = imember->next) { - switch_channel_t *channel = switch_core_session_get_channel(imember->session); - // add this little bit to preserve the bridge cause code in case of an early media call that - // never answers - if (switch_test_flag(conference, CFLAG_ANSWERED)) - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); - else - // put actual cause code from outbound channel hangup here - switch_channel_hangup(channel, conference->bridge_hangup_cause); + switch_channel_t *channel; + + if (!switch_test_flag(imember, MFLAG_NOCHANNEL)) { + channel = switch_core_session_get_channel(imember->session); + + // add this little bit to preserve the bridge cause code in case of an early media call that + // never answers + if (switch_test_flag(conference, CFLAG_ANSWERED)) { + switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + } else { + // put actual cause code from outbound channel hangup here + switch_channel_hangup(channel, conference->bridge_hangup_cause); + } + } + switch_clear_flag_locked(imember, MFLAG_RUNNING); } switch_mutex_unlock(conference->mutex); /* Wait till everybody is out */ - + switch_clear_flag_locked(conference, CFLAG_RUNNING); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Write Lock ON\n"); switch_thread_rwlock_wrlock(conference->rwlock); switch_thread_rwlock_unlock(conference->rwlock); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Write Lock OFF\n"); switch_mutex_lock(globals.hash_mutex); switch_core_hash_delete(globals.conference_hash, conference->name); @@ -715,7 +758,10 @@ switch_event_fire(&event); } + switch_mutex_lock(globals.hash_mutex); globals.threads--; + switch_mutex_unlock(globals.hash_mutex); + return NULL; } @@ -1032,6 +1078,117 @@ } } + +/* Sub-Routine called by a record entity inside a conference */ +static void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *thread, void *obj) +{ + switch_frame_t write_frame = {0}; + uint8_t data[SWITCH_RECCOMMENDED_BUFFER_SIZE]; + switch_file_handle_t fh = {0}; + conference_member_t smember = {0}, *member; + conference_record_t *rec = (conference_record_t *) obj; + uint32_t divider = 1000 / rec->conference->interval; + uint32_t samples = (rec->conference->rate / divider); + uint32_t bytes = samples * 2; + uint32_t mux_used; + char *vval; + + switch_mutex_lock(globals.hash_mutex); + globals.threads++; + switch_mutex_unlock(globals.hash_mutex); + + member = &smember; + + member->flags = MFLAG_CAN_HEAR | MFLAG_NOCHANNEL | MFLAG_RUNNING; + + write_frame.data = data; + write_frame.buflen = sizeof(data); + assert(rec->conference != NULL); + + member->conference = rec->conference; + member->native_rate = rec->conference->rate; + member->rec_path = rec->path; + fh.channels = 1; + fh.samplerate = rec->conference->rate; + member->id = next_member_id(); + member->pool = rec->pool; + + switch_mutex_init(&member->flag_mutex, SWITCH_MUTEX_NESTED, rec->pool); + switch_mutex_init(&member->audio_in_mutex, SWITCH_MUTEX_NESTED, rec->pool); + switch_mutex_init(&member->audio_out_mutex, SWITCH_MUTEX_NESTED, rec->pool); + + /* Setup an audio buffer for the incoming audio */ + if (switch_buffer_create_dynamic(&member->audio_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, 0) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n"); + goto end; + } + + /* Setup an audio buffer for the outgoing audio */ + if (switch_buffer_create_dynamic(&member->mux_buffer, CONF_DBLOCK_SIZE, CONF_DBUFFER_SIZE, 0) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error Creating Audio Buffer!\n"); + goto end; + } + + if (conference_add_member(rec->conference, member) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Joining Conference\n"); + goto end; + } + + + if (switch_core_file_open(&fh, + rec->path, + SWITCH_FILE_FLAG_WRITE | SWITCH_FILE_DATA_SHORT, + rec->pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening File [%s]\n", rec->path); + goto end; + } + + if ((vval = switch_mprintf("Conference %s", rec->conference->name))) { + switch_core_file_set_string(&fh, SWITCH_AUDIO_COL_STR_TITLE, vval); + switch_safe_free(vval); + } + + while(switch_test_flag(member, MFLAG_RUNNING) && switch_test_flag(rec->conference, CFLAG_RUNNING) && rec->conference->count) { + if ((mux_used = (uint32_t) switch_buffer_inuse(member->mux_buffer)) >= bytes) { + /* Flush the output buffer and write all the data (presumably muxed) back to the channel */ + switch_mutex_lock(member->audio_out_mutex); + write_frame.data = data; + while ((write_frame.datalen = (uint32_t)switch_buffer_read(member->mux_buffer, write_frame.data, mux_used))) { + if (!switch_test_flag((&fh), SWITCH_FILE_PAUSE)) { + switch_size_t len = (switch_size_t) mux_used / 2; + switch_core_file_write(&fh, write_frame.data, &len); + } + } + switch_mutex_unlock(member->audio_out_mutex); + } else { + switch_yield(20000); + } + } /* Rinse ... Repeat */ + + conference_del_member(rec->conference, member); + switch_buffer_destroy(&member->audio_buffer); + switch_buffer_destroy(&member->mux_buffer); + switch_clear_flag_locked(member, MFLAG_RUNNING); + switch_core_file_close(&fh); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Recording Stopped\n"); + + end: + + + if (rec->pool) { + switch_memory_pool_t *pool = rec->pool; + rec = NULL; + switch_core_destroy_memory_pool(&pool); + } + + switch_mutex_lock(globals.hash_mutex); + globals.threads--; + switch_mutex_unlock(globals.hash_mutex); + + return NULL; +} + + /* Make files stop playing in a conference either the current one or all of them */ static uint32_t conference_stop_file(conference_obj_t *conference, file_stop_t stop) { @@ -1348,12 +1505,22 @@ switch_mutex_lock(conference->member_mutex); for (member = conference->members; member; member = member->next) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_caller_profile_t *profile = switch_channel_get_caller_profile(channel); - char *uuid = switch_core_session_get_uuid(member->session); - char *name = switch_channel_get_name(channel); + switch_channel_t *channel; + switch_caller_profile_t *profile; + char *uuid; + char *name; uint32_t count = 0; + if (switch_test_flag(member, MFLAG_NOCHANNEL)) { + continue; + } + + uuid = switch_core_session_get_uuid(member->session); + channel = switch_core_session_get_channel(member->session); + profile = switch_channel_get_caller_profile(channel); + name = switch_channel_get_name(channel); + + stream->write_function(stream, "%u%s%s%s%s%s%s%s%s%s", member->id,delim, name,delim, @@ -1383,10 +1550,17 @@ switch_mutex_lock(conference->member_mutex); for (member = conference->members; member; member = member->next) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_caller_profile_t *profile = switch_channel_get_caller_profile(channel); + switch_channel_t *channel; + switch_caller_profile_t *profile; - stream->write_function(stream, "Caller %s <%s>\n", + if (switch_test_flag(member, MFLAG_NOCHANNEL)) { + continue; + } + channel = switch_core_session_get_channel(member->session); + profile = switch_channel_get_caller_profile(channel); + + + stream->write_function(stream, "*) %s (%s)\n", profile->caller_id_name, profile->caller_id_number ); @@ -1958,6 +2132,15 @@ stream->write_function(stream, "usage undeaf <[id|all]>\n"); goto done; } + + } else if (!strcasecmp(argv[1], "record")) { + if (argc > 2) { + launch_conference_record_thread(conference, argv[2]); + } else { + stream->write_function(stream, "-ERR No Path Specified!\n"); + } + } else if (!strcasecmp(argv[1], "norecord")) { + conference_record_stop(conference, argv[1]); } else if (!strcasecmp(argv[1], "kick")) { if (argc > 2) { uint32_t id = atoi(argv[2]); @@ -2575,6 +2758,8 @@ goto codec_done1; } + + /* Prepare MUTEXS */ member.id = next_member_id(); member.pool = pool; @@ -2655,6 +2840,34 @@ switch_thread_create(&thread, thd_attr, conference_thread_run, conference, conference->pool); } +static void launch_conference_record_thread(conference_obj_t *conference, char *path) +{ + switch_thread_t *thread; + switch_threadattr_t *thd_attr = NULL; + switch_memory_pool_t *pool; + conference_record_t *rec; + + /* Setup a memory pool to use. */ + if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Pool Failure\n"); + } + + /* Create a node object*/ + if (!(rec = switch_core_alloc(pool, sizeof(*rec)))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Alloc Failure\n"); + switch_core_destroy_memory_pool(&pool); + } + + rec->conference = conference; + rec->path = switch_core_strdup(pool, path); + rec->pool = pool; + + switch_threadattr_create(&thd_attr, rec->pool); + switch_threadattr_detach_set(thd_attr, 1); + switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); + switch_thread_create(&thread, thd_attr, conference_record_thread_run, rec, rec->pool); +} + static void *SWITCH_THREAD_FUNC input_thread_run(switch_thread_t *thread, void *obj) { conference_member_t *member = obj; @@ -3181,6 +3394,7 @@ if (globals.running) { globals.running = 0; while (globals.threads) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Waiting for %d threads\n", globals.threads); switch_yield(100000); } }

1 0

[commit] r3147 - freeswitch/branches/pasaporte
by Freeswitch SVN 22 Oct '06

22 Oct '06

Author: sphere Date: Sat Oct 21 20:37:56 2006 New Revision: 3147 Added: freeswitch/branches/pasaporte/ Log: Creating empty folder for pasaporte

1 0

[commit] r3146 - in freeswitch/branches/stkn/buildsys/trunk: . build libs/packages
by Freeswitch SVN 22 Oct '06

22 Oct '06

Author: stkn Date: Sat Oct 21 20:33:57 2006 New Revision: 3146 Added: freeswitch/branches/stkn/buildsys/trunk/libs/packages/ freeswitch/branches/stkn/buildsys/trunk/libs/packages/apr-util.pkg freeswitch/branches/stkn/buildsys/trunk/libs/packages/apr.pkg freeswitch/branches/stkn/buildsys/trunk/libs/packages/sofia-sip.pkg freeswitch/branches/stkn/buildsys/trunk/libs/packages/srtp.pkg (contents, props changed) freeswitch/branches/stkn/buildsys/trunk/site.conf.in Modified: freeswitch/branches/stkn/buildsys/trunk/build/newbuild.sh Log: updates Modified: freeswitch/branches/stkn/buildsys/trunk/build/newbuild.sh ============================================================================== --- freeswitch/branches/stkn/buildsys/trunk/build/newbuild.sh (original) +++ freeswitch/branches/stkn/buildsys/trunk/build/newbuild.sh Sat Oct 21 20:33:57 2006 @@ -7,13 +7,43 @@ # # clean environment -unset WORKDIR DISTDIR D S A P PN PV +unset S A PKG_NAME PKG_VER BASEDIR CFLAGS LDFLAGS WORKDIR +_PHASES="fetch unpack compile install merge clean" + die() { echo "!!! $@" exit 1 } +get_basedir() { + cd "$(dirname $0)/.." + echo "${PWD}" + cd "${OLDPWD}" +} + +append_cflags() { + [ $# -lt 1 ] && { + echo "usage: append-cflags <flag>" >&2 + return 1 + } + + CFLAGS="${CFLAGS} $@" + + return 0 +} + +append_ldflags() { + [ $# -lt 1 ] && { + echo "usage: append-ldflags <flag>" >&2 + return 1 + } + + LDFLAGS="${LDFLAGS} $@" + + return 0 +} + unpack() { for x in $@; do case ${x} in @@ -34,25 +64,25 @@ has() { local tmp="${1}" - [[ $# -lt 2 ]] && { + [ $# -lt 2 ] && { echo "usage: has <flag> <list>" >&2 return 1 } shift for x in $@; do - [[ "${tmp}" = "${x}" ]] && return 0 + [ "${tmp}" = "${x}" ] && return 0 done return 1 } -use_enable() { - [[ $# -lt 1 ]] && { - echo "usage: use_enable <flag>" >&2 +option_enable() { + [ $# -lt 1 ] && { + echo "usage: option_enable <flag>" >&2 return 1 } - if [[ -n "${USE}" ]] && has ${1} ${USE}; then + if has ${1} ${OPTIONS} 2>/dev/null; then echo "--enable-${1}" else echo "--disable-${1}" @@ -60,49 +90,44 @@ return 0 } -if [[ $# -lt 2 ]]; then +do_config() { + [ ! -x configure ] && die "No configure script found" + + ./configure \ + --prefix="${PREFIX}" ${@} +} + +do_install() { + make DESTDIR="${D}" INSTALL_PREFIX="${D}" install +} + + +if [ $# -lt 2 ]; then die "Usage: $0 <action> <package> [options]" fi # +# get base directory (aka $(top_srcdir)) +# +BASEDIR="$(get_basedir)" +PKGDIR="${BASEDIR}/libs/packages" + +# # override settings with site-specific values # -if [[ -e "site.conf" ]]; then +if [ -e "${BASEDIR}/site.conf" ]; then # override settings - source "site.conf" + source "${BASEDIR}/site.conf" fi +ACTION="${1}" PKG="${2}" -# -# check if package exists as specified -# try to find newest version if only the package name has been given -# -if [[ ! -e "${PKG}.pkg" ]]; then - tmp="$(ls -1 "${PKG}-"[0-9.]*.pkg 2>/dev/null | sort | tail -n1)" - if [[ -n "${tmp}" ]]; then - PKG="$(echo "${tmp}" | sed -e "s:\.pkg\$::")" - fi -fi +WORKDIR="${WORKDIR:-${BASEDIR}/libs}" +DISTDIR="${DISTDIR:-${BASEDIR}/libs}" -# -# setup some constants -# -P="${PKG}" -PN="${P%-*}" -PV="${P##*-}" +declare -r WORKDIR DISTDIR BASEDIR PKG ACTION -WORKDIR="${WORKDIR:-${PWD}}" -DISTDIR="${DISTDIR:-${PWD}}" -S="${WORKDIR}/${P}" - -D="${D:}" -A="" - -unset PKG - -SAVE_CWD="${PWD}" - # # default functions # @@ -111,15 +136,18 @@ } src_unpack() { - echo "foobar unpack" + unpack "${A}" + cd "${S}" } src_compile() { - echo "foobar compile" + do_config || die "configure failed" + + make || die "building failed" } src_install() { - echo "foobar install" + do_install || die "installation failed" } # @@ -128,135 +156,160 @@ # # check for package description file # -if [[ -e "${P}.pkg" ]]; then - source "${P}.pkg" -else - die "package ${P} does not exist" +if [ ! -e "${PKGDIR}/${PKG}" ]; then + die "package ${PKG} does not exist" fi -# -# check package parameters -# +source "${PKGDIR}/${PKG}" || die "failed to source ${PKG}" -if [[ -z "${SRC_URI}" ]]; then - die "No download location(s) specified" +[ -z "${PKG_NAME}" ] && die "Package name not specified in ${PKG}" +[ -z "${PKG_VER}" ] && die "Package version not specified in ${PKG}" +[ -z "${OPTIONS}" ] && OPTIONS="" + +if [ -z "${S}" ]; then + S="${WORKDIR}/${PKG_NAME}-${PKG_VER}" fi # # fill A # -for x in ${SRC_URI}; do +for x in ${PKG_URI}; do A="${A} $(basename "${x}")" done A="$(echo "${A}" | sed -e "s:^[ \t]\+::")" -# -# handle actions -# +[ "${ACTION}" != "merge" ] && D="${BASEDIR}/built" -case $1 in - install|compile|fetch|unpack|clean) - action="${1}" - ;; - *) - die "Possible actions: fetch unpack compile install clean" - ;; -esac +declare -r D A S PKG_NAME PKG_VER PKG_SRC echo "*************************************************" -echo "P = ${P}" -echo "PV = ${PV}" -echo "PN = ${PN}" +echo "PKG_NAME = ${PKG_NAME}" +echo "PKG_VER = ${PKG_VER}" echo "S = ${S}" echo "D = ${D}" echo "" +echo "BASEDIR = ${BASEDIR}" echo "WORKDIR = ${WORKDIR}" echo "DISTDIR = ${DISTDIR}" -echo "SRC_URI = ${SRC_URI}" +echo "PKG_URI = ${PKG_URI}" echo "A = ${A}" -echo "************************************************" +echo "*************************************************" -#exit 0 +handle_clean() { + # + # clean + # + cd "${WORKDIR}" -# -# clean -# -if [[ "${action}" = "clean" ]]; then - rm "${WORKDIR}"/{.fetched,.compiled,.unpacked,.installed} 2>/dev/null - # safety check - if [[ -n "${WORKDIR}" ]] && \ - [[ -n "${S}" ]] && \ - [[ -d "${S}" ]] && \ - [[ -n "$(echo "${S}" | grep "${WORKDIR}")" ]] + if [ -n "${S}" ] && \ + [ -d "${S}" ] then rm -r "${S}" fi +} -# if [[ -n "${S}" ]] && [[ -d "${S}" ]] && [[ "${S}" != "/" ]]; then -# rm -r "${S}" -# fi -fi -cd "${SAVE_CWD}" -[[ "${action}" = "clean" ]] && exit 0 +handle_fetch() { + local F + # + # fetch + # + cd "${WORKDIR}" -# -# fetch -# -if [[ ! -e "${WORKDIR}/.fetched" ]] || \ - [[ "${action}" = "fetch" ]] -then - for x in ${SRC_URI}; do + for x in ${PKG_URI}; do F="$(basename "${x}")" # distfile does not exist, fetch it - if [[ ! -e "${DISTDIR}/${F}" ]]; then + if [ ! -e "${DISTDIR}/${F}" ]; then wget -c "${x}" -O "${DISTDIR}/${F}" || die "Failed to fetch ${x}" fi done - touch "${WORKDIR}/.fetched" -fi -cd "${SAVE_CWD}" -[[ "${action}" = "fetch" ]] && exit 0 +} -# -# unpack -# -if [[ ! -e "${WORKDIR}/.unpacked" ]] || \ - [[ "${action}" = "unpack" ]] -then +handle_unpack() { + # + # unpack + # cd "${WORKDIR}" - src_unpack - touch "${WORKDIR}/.unpacked" -fi -cd "${SAVE_CWD}" -[[ "${action}" = "unpack" ]] && exit 0 + if [ ! -e "${S}/.unpacked" ] + then + echo ">>> Unpacking package..." + src_unpack + else + echo "* Already unpacked, skipping" + fi -# -# compile -# -if [[ ! -e "${WORKDIR}/.compiled" ]] || \ - [[ "${action}" = "compile" ]] -then - cd "${S}" - src_compile - touch "${WORKDIR}/.compiled" -fi -cd "${SAVE_CWD}" -[[ "${action}" = "compile" ]] && exit 0 + touch "${S}/.unpacked" +} +handle_compile() { + # + # compile + # + [ -d "${S}" ] && cd "${S}" + + if [ ! -e "${S}/.compiled" ] + then + echo ">>> Compiling package..." + src_compile + else + echo "* Already compiled, skipping" + fi + touch "${S}/.compiled" +} + +handle_install() { + local D + + # + # install + # + [ -d "${S}" ] && cd "${S}" + + if [ ! -e "${S}/.installed" ] + then + echo ">>> Installing package..." + src_install + else + echo "* Already installed, skipping" + fi + + cd "${WORKDIR}" + + touch "${S}/.installed" +} + +handle_merge() { + # + # Merge package + # + [ -d "${S}" ] && cd "${S}" + + src_install +} + # -# install # -if [[ ! -e "${WORKDIR}/.installed" ]] || \ - [[ "${action}" = "install" ]] +# +has "${ACTION}" "${_PHASES}" || die "Invalid action \"${ACTION}\", valid actions: ${_PHASES}" + +if [ "${ACTION}" = "clean" ] then - cd "${S}" - src_install - touch "${WORKDIR}/.installed" -fi -cd "${SAVE_CWD}" + handle_clean +else + for x in ${_PHASES}; do + case ${x} in + fetch|unpack|compile|install) + handle_${x} || die "${x} failed" + ;; + merge) + [ "`id -u`" != "root" ] && die "Need to be root to merge package!" + handle_${x} + ;; + esac -exit 0 + [ "${x}" = "${ACTION}" ] && break 1 + done +fi Added: freeswitch/branches/stkn/buildsys/trunk/libs/packages/apr-util.pkg ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/buildsys/trunk/libs/packages/apr-util.pkg Sat Oct 21 20:33:57 2006 @@ -0,0 +1,24 @@ +# +# +# +PKG_NAME="apr-util" +PKG_VER="1.2.7" + +PKG_URI="http://www.freeswitch.org/downloads/${PKG_NAME}-${PKG_VER}.tar.gz" + +src_unpack() { + unpack "${A}" + cd "${S}" +} + +src_compile() { + ./configure \ + --prefix="${PREFIX}" \ + $(option_enable debug) || die "configure failed" + + make all || die "make all failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" +} Added: freeswitch/branches/stkn/buildsys/trunk/libs/packages/apr.pkg ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/buildsys/trunk/libs/packages/apr.pkg Sat Oct 21 20:33:57 2006 @@ -0,0 +1,25 @@ +# +# +# + +PKG_NAME="apr" +PKG_VER="1.2.7" + +PKG_URI="http://www.freeswitch.org/downloads/${PKG_NAME}-${PKG_VER}.tar.gz" + +src_unpack() { + unpack "${A}" + cd "${S}" +} + +src_compile() { + ./configure \ + --prefix="${PREFIX}" \ + $(option_enable debug) || die "configure failed" + + make all || die "make all failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" +} Added: freeswitch/branches/stkn/buildsys/trunk/libs/packages/sofia-sip.pkg ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/buildsys/trunk/libs/packages/sofia-sip.pkg Sat Oct 21 20:33:57 2006 @@ -0,0 +1,25 @@ +# +# +# + +PKG_NAME="sofia-sip" +PKG_VER="1.12.1" + +PKG_URI="http://mesh.dl.sourceforge.net/sourceforge/${PKG_NAME}/${PKG_NAME}-${PKG_VE…" + +src_unpack() { + unpack "${A}" + cd "${S}" +} + +src_compile() { + ./configure \ + --prefix="${PREFIX}" \ + $(use_enable debug) || die "configure failed" + + make all || die "make all failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" +} Added: freeswitch/branches/stkn/buildsys/trunk/libs/packages/srtp.pkg ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/buildsys/trunk/libs/packages/srtp.pkg Sat Oct 21 20:33:57 2006 @@ -0,0 +1,23 @@ + +PKG_NAME="srtp" +PKG_VER="" + +PKG_SRC="" + +ARCH="`uname -m`" + +src_compile() { + [ "$ARCH" = "x86_64" ] && \ + OPTS="--enable-pic" + + ./configure \ + --prefix="$(PREFIX)" \ + ${OPTS} || exit 1 + + make all || exit 1 +} + + + + + Added: freeswitch/branches/stkn/buildsys/trunk/site.conf.in ============================================================================== --- (empty file) +++ freeswitch/branches/stkn/buildsys/trunk/site.conf.in Sat Oct 21 20:33:57 2006 @@ -0,0 +1,2 @@ +PREFIX="@prefix@" +CFLAGS="@CFLAGS@"

1 0

[commit] r3138 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_skel
by Freeswitch SVN 21 Oct '06

21 Oct '06

Author: knhor Date: Sat Oct 21 13:02:15 2006 New Revision: 3138 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_skel/mod_skel.c Log: tidy up and add switch_module_runtime Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_skel/mod_skel.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_skel/mod_skel.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_skel/mod_skel.c Sat Oct 21 13:02:15 2006 @@ -59,16 +59,21 @@ /* Called when the system shuts down - SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void) - { - return SWITCH_STATUS_SUCCESS; - } +SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void) +{ + return SWITCH_STATUS_SUCCESS; +} */ /* If it exists, this is called in it's own thread when the module-load completes - SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void) - { - return SWITCH_STATUS_SUCCESS; - } + If it returns anything but SWITCH_STATUS_TERM it will be called again automaticly +SWITCH_MOD_DECLARE(switch_status_t) switch_module_runtime(void) +{ + while(looping) + { + switch_yield(1000); + } + return SWITCH_STATUS_TERM; +} */

1 0

[commit] r3137 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_playback
by Freeswitch SVN 21 Oct '06

21 Oct '06

Author: knhor Date: Sat Oct 21 12:04:37 2006 New Revision: 3137 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_playback/mod_playback.c Log: let * end record instead of hangup Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_playback/mod_playback.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_playback/mod_playback.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_playback/mod_playback.c Sat Oct 21 12:04:37 2006 @@ -127,12 +127,14 @@ { switch_channel_t *channel; channel = switch_core_session_get_channel(session); + switch_status_t status; assert(channel != NULL); - if (switch_ivr_record_file(session, NULL, data, on_dtmf, NULL, 0) != SWITCH_STATUS_SUCCESS) { + status = switch_ivr_record_file(session, NULL, data, on_dtmf, NULL, 0); + + if (!switch_channel_ready(channel) || (status != SWITCH_STATUS_SUCCESS && !SWITCH_STATUS_IS_BREAK(status))) { switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); } - }

1 0

[commit] r3136 - freeswitch/branches/jeeza
by Freeswitch SVN 21 Oct '06

21 Oct '06

Author: sphere Date: Sat Oct 21 06:44:57 2006 New Revision: 3136 Added: freeswitch/branches/jeeza/ Log: Creating empty folder for jeeza

1 0

[commit] r3135 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 21 Oct '06

21 Oct '06

Author: knhor Date: Sat Oct 21 01:59:10 2006 New Revision: 3135 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Log: add ALL as conference member id parameter to Mute, Unmute, Deaf, Undeaf, and Kick conference commands. Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Sat Oct 21 01:59:10 2006 @@ -221,6 +221,11 @@ static void switch_change_sln_volume(int16_t *data, uint32_t samples, int32_t vol); static switch_status_t chat_send(char *proto, char *from, char *to, char *subject, char *body, char *hint); +static void conference_list_itterator(conference_obj_t *conference, + switch_stream_handle_t *stream, + int (*pfncallback)(conference_obj_t*, conference_member_t*, int, switch_stream_handle_t*, void*), + void *data); + /* Return a Distinct ID # */ static uint32_t next_member_id(void) { @@ -1322,6 +1327,20 @@ return SWITCH_STATUS_SUCCESS; } +static void conference_list_itterator(conference_obj_t *conference, switch_stream_handle_t *stream, int (*pfncallback)(conference_obj_t*, conference_member_t*, int, switch_stream_handle_t*, void*), void *data) +{ + conference_member_t *member = NULL; + + if(conference != NULL && stream != NULL && pfncallback != NULL) { + switch_mutex_lock(conference->member_mutex); + + for (member = conference->members; member; member = member->next) { + pfncallback(conference,member,member->id,stream,data); + } + switch_mutex_unlock(conference->member_mutex); + } +} + static void conference_list(conference_obj_t *conference, switch_stream_handle_t *stream, char *delim) { conference_member_t *member = NULL; @@ -1357,7 +1376,6 @@ switch_mutex_unlock(conference->member_mutex); } - static void conference_list_pretty(conference_obj_t *conference, switch_stream_handle_t *stream) { conference_member_t *member = NULL; @@ -1377,6 +1395,147 @@ switch_mutex_unlock(conference->member_mutex); } +static int conference_function_mute_member(conference_obj_t *conference, conference_member_t *member, int id, switch_stream_handle_t *stream, void *data) +{ + int err = 0; + + if (member != NULL || (member = conference_member_get(conference, id))) { + switch_event_t *event; + + switch_clear_flag_locked(member, MFLAG_CAN_SPEAK); + if (member->conference->muted_sound) { + conference_member_play_file(member, member->conference->muted_sound, 0); + } + stream->write_function(stream, "OK mute %u\n", id); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "mute-member"); + switch_event_fire(&event); + } + } else { + stream->write_function(stream, "Non-Existant ID %u\n", id); + err = 1; + } + + return err; +} + +static int conference_function_unmute_member(conference_obj_t *conference, conference_member_t *member, int id, switch_stream_handle_t *stream, void *data) +{ + int err = 0; + + if (member != NULL || (member = conference_member_get(conference, id))) { + switch_event_t *event; + + switch_set_flag_locked(member, MFLAG_CAN_SPEAK); + stream->write_function(stream, "OK unmute %u\n", id); + if (member->conference->unmuted_sound) { + conference_member_play_file(member, member->conference->unmuted_sound, 0); + } + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "unmute-member"); + switch_event_fire(&event); + } + } else { + stream->write_function(stream, "Non-Existant ID %u\n", id); + err = 1; + } + + return err; +} + +static int conference_function_deaf_member(conference_obj_t *conference, conference_member_t *member, int id, switch_stream_handle_t *stream, void *data) +{ + int err = 0; + + if (member != NULL || (member = conference_member_get(conference, id))) { + switch_event_t *event; + + switch_clear_flag_locked(member, MFLAG_CAN_HEAR); + stream->write_function(stream, "OK deaf %u\n", id); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "deaf-member"); + switch_event_fire(&event); + } + } else { + stream->write_function(stream, "Non-Existant ID %u\n", id); + err = 1; + } + + return err; +} + +static int conference_function_undeaf_member(conference_obj_t *conference, conference_member_t *member, int id, switch_stream_handle_t *stream, void *data) +{ + int err = 0; + + if (member != NULL || (member = conference_member_get(conference, id))) { + switch_event_t *event; + + switch_set_flag_locked(member, MFLAG_CAN_HEAR); + stream->write_function(stream, "OK undeaf %u\n", id); + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "undeaf-member"); + switch_event_fire(&event); + } + } else { + stream->write_function(stream, "Non-Existant ID %u\n", id); + err = 1; + } + + return err; +} + +static int conference_function_kick_member(conference_obj_t *conference, conference_member_t *member, int id, switch_stream_handle_t *stream, void *data) +{ + int err = 0; + + if (member != NULL || (member = conference_member_get(conference, id))) { + switch_event_t *event; + + switch_mutex_lock(member->flag_mutex); + switch_clear_flag(member, MFLAG_RUNNING); + switch_set_flag(member, MFLAG_KICKED); + switch_mutex_unlock(member->flag_mutex); + + stream->write_function(stream, "OK kicked %u\n", id); + + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "kick-member"); + switch_event_fire(&event); + } + } else { + stream->write_function(stream, "Non-Existant ID %u\n", id); + err = 1; + } + + return err; +} + /* API Interface Function */ static switch_status_t conf_function(char *buf, switch_core_session_t *session, switch_stream_handle_t *stream) { @@ -1496,7 +1655,7 @@ } } else if (argc == 4) { uint32_t id = atoi(argv[3]); - conference_member_t *member; + conference_member_t *member; if ((member = conference_member_get(conference, id))) { if (conference_member_play_file(member, argv[2], 0) == SWITCH_STATUS_SUCCESS) { @@ -1738,142 +1897,82 @@ } else if (!strcasecmp(argv[1], "mute")) { if (argc > 2) { uint32_t id = atoi(argv[2]); - conference_member_t *member; + uint8_t all = ( id == 0 && strcasecmp(argv[2], "all") == 0 ); - if ((member = conference_member_get(conference, id))) { - switch_clear_flag_locked(member, MFLAG_CAN_SPEAK); - if (member->conference->muted_sound) { - conference_member_play_file(member, member->conference->muted_sound, 0); - } - stream->write_function(stream, "OK mute %u\n", id); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); - - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "mute-member"); - switch_event_fire(&event); - } + if (!all) { + conference_function_mute_member(conference, NULL, id, stream, NULL); goto done; } else { - stream->write_function(stream, "Non-Existant ID %u\n", id); + conference_list_itterator(conference, stream, &conference_function_mute_member, NULL); goto done; } } else { - stream->write_function(stream, "usage mute <id>\n"); + stream->write_function(stream, "usage mute <[id|all]>\n"); goto done; } } else if (!strcasecmp(argv[1], "unmute")) { if (argc > 2) { uint32_t id = atoi(argv[2]); - conference_member_t *member; + uint8_t all = ( id == 0 && strcasecmp(argv[2], "all") == 0 ); - if ((member = conference_member_get(conference, id))) { - switch_set_flag_locked(member, MFLAG_CAN_SPEAK); - stream->write_function(stream, "OK unmute %u\n", id); - if (member->conference->unmuted_sound) { - conference_member_play_file(member, member->conference->unmuted_sound, 0); - } - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); - - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "unmute-member"); - switch_event_fire(&event); - } + if (!all) { + conference_function_unmute_member(conference, NULL, id, stream, NULL); goto done; } else { - stream->write_function(stream, "Non-Existant ID %u\n", id); + conference_list_itterator(conference, stream, &conference_function_unmute_member, NULL); goto done; } } else { - stream->write_function(stream, "usage unmute <id>\n"); + stream->write_function(stream, "usage unmute <[id|all]>\n"); goto done; } } else if (!strcasecmp(argv[1], "deaf")) { if (argc > 2) { uint32_t id = atoi(argv[2]); - conference_member_t *member; + uint8_t all = ( id == 0 && strcasecmp(argv[2], "all") == 0 ); - if ((member = conference_member_get(conference, id))) { - switch_clear_flag_locked(member, MFLAG_CAN_HEAR); - stream->write_function(stream, "OK deaf %u\n", id); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); - - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "deaf-member"); - switch_event_fire(&event); - } + if (!all) { + conference_function_deaf_member(conference, NULL, id, stream, NULL); goto done; } else { - stream->write_function(stream, "Non-Existant ID %u\n", id); + conference_list_itterator(conference, stream, &conference_function_deaf_member, NULL); goto done; } } else { - stream->write_function(stream, "usage deaf <id>\n"); + stream->write_function(stream, "usage deaf <[id|all]>\n"); goto done; } } else if (!strcasecmp(argv[1], "undeaf")) { if (argc > 2) { uint32_t id = atoi(argv[2]); - conference_member_t *member; + uint8_t all = ( id == 0 && strcasecmp(argv[2], "all") == 0 ); - if ((member = conference_member_get(conference, id))) { - switch_set_flag_locked(member, MFLAG_CAN_HEAR); - stream->write_function(stream, "OK undeaf %u\n", id); - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); - - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "undeaf-member"); - switch_event_fire(&event); - } + if (!all) { + conference_function_undeaf_member(conference, NULL, id, stream, NULL); goto done; } else { - stream->write_function(stream, "Non-Existant ID %u\n", id); + conference_list_itterator(conference, stream, &conference_function_undeaf_member, NULL); goto done; } } else { - stream->write_function(stream, "usage undeaf <id>\n"); + stream->write_function(stream, "usage undeaf <[id|all]>\n"); goto done; } } else if (!strcasecmp(argv[1], "kick")) { if (argc > 2) { uint32_t id = atoi(argv[2]); - conference_member_t *member; + uint8_t all = ( id == 0 && strcasecmp(argv[2], "all") == 0 ); - if ((member = conference_member_get(conference, id))) { - switch_mutex_lock(member->flag_mutex); - switch_clear_flag(member, MFLAG_RUNNING); - switch_set_flag(member, MFLAG_KICKED); - switch_mutex_unlock(member->flag_mutex); - - stream->write_function(stream, "OK kicked %u\n", id); - - if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); - - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "kick-member"); - switch_event_fire(&event); - } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "conference kick all %u\n",all); + if (!all) { + conference_function_kick_member(conference, NULL, id, stream, NULL); goto done; } else { - stream->write_function(stream, "Non-Existant ID %u\n", id); + conference_list_itterator(conference, stream, &conference_function_kick_member, NULL); goto done; } } else { - stream->write_function(stream, "usage kick <id>\n"); + stream->write_function(stream, "usage kick <[id|all]>\n"); goto done; } } else if (!strcasecmp(argv[1], "transfer")) { @@ -2721,11 +2820,11 @@ "<confname> say <text>\n" "<confname> saymember <member_id><text>\n" "<confname> stop <[current|all]> [<member_id>]\n" - "<confname> kick <member_id>\n" - "<confname> mute <member_id>\n" - "<confname> unmute <member_id>\n" - "<confname> deaf <member_id>\n" - "<confname> undef <member_id>\n" + "<confname> kick <[member_id|all]>\n" + "<confname> mute <[member_id|all]>\n" + "<confname> unmute <[member_id|all]>\n" + "<confname> deaf <[member_id|all]>\n" + "<confname> undef <[member_id|all]>\n" "<confname> relate <member_id> <other_member_id> [nospeak|nohear]\n" "<confname> lock\n" "<confname> unlock\n"

1 0

[commit] r3128 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 21 Oct '06

21 Oct '06

Author: knhor Date: Fri Oct 20 20:50:44 2006 New Revision: 3128 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix unlock event descriptor name typo Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Oct 20 20:50:44 2006 @@ -1466,7 +1466,7 @@ stream->write_function(stream, "OK %s unlocked\n", argv[0]); if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "lock"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "unlock"); switch_event_fire(&event); } goto done;

1 0

[commit] r3127 - freeswitch/branches/knhor/trunk
by Freeswitch SVN 21 Oct '06

21 Oct '06

Author: knhor Date: Fri Oct 20 20:36:32 2006 New Revision: 3127 Added: freeswitch/branches/knhor/trunk/ - copied from r3126, /freeswitch/trunk/ Log: knhor - 061020 - initial tunk copy

1 0