February 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4252 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: mikej Date: Tue Feb 13 22:24:20 2007 New Revision: 4252 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: cleanups: duplicate declarations, shadowed global names, extra paramaters, and constifications. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Feb 13 22:24:20 2007 @@ -424,8 +424,6 @@ static void launch_profile_thread(sofia_profile_t *profile); -static switch_status_t config_sofia(int reload); - static switch_status_t chat_send(char *proto, char *from, char *to, char *subject, char *body, char *hint); /* BODY OF THE MODULE */ @@ -438,14 +436,13 @@ } auth_res_t; -static char *get_url_from_contact(char *buf, uint8_t dup) +static char *get_url_from_contact(char *buf, uint8_t to_dup) { char *url = NULL, *e; - if ((url = strchr(buf, '<')) && (e = strchr(url, '>'))) { url++; - if (dup) { + if (to_dup) { url = strdup(url); e = strchr(url, '>'); } @@ -459,8 +456,8 @@ static auth_res_t parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, char *regstr, char *np, size_t nplen) { - int index; - char *cur; + int indexnum; + const char *cur; su_md5_t ctx; char uridigest[2 * SU_MD5_DIGEST_SIZE + 1]; char bigdigest[2 * SU_MD5_DIGEST_SIZE + 1]; @@ -471,7 +468,7 @@ nonce = uri = qop = cnonce = nc = response = NULL; if (authorization->au_params) { - for(index = 0; (cur=(char*)authorization->au_params[index]); index++) { + for(indexnum = 0; (cur=authorization->au_params[indexnum]); indexnum++) { char *var, *val, *p, *work; var = val = work = NULL; if ((work = strdup(cur))) { @@ -1325,7 +1322,7 @@ deactivate_rtp(tech_pvt); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel %s hanging up, cause: %s\n", - switch_channel_get_name(channel), switch_channel_cause2str(cause), sip_cause); + switch_channel_get_name(channel), switch_channel_cause2str(cause)); if (tech_pvt->hash_key) { switch_core_hash_delete(tech_pvt->profile->chat_hash, tech_pvt->hash_key); @@ -4573,7 +4570,7 @@ char const *realm = NULL; char *p = NULL, *duprealm = NULL, *qrealm = NULL; char const *scheme = NULL; - int index; + int indexnum; char *cur; char authentication[256] = ""; int ss_state; @@ -4597,7 +4594,7 @@ } scheme = (char const *) authenticate->au_scheme; if (authenticate->au_params) { - for(index = 0; (cur=(char*)authenticate->au_params[index]); index++) { + for(indexnum = 0; (cur=(char*)authenticate->au_params[indexnum]); indexnum++) { if ((realm = strstr(cur, "realm="))) { realm += 6; break;

1 0

[commit] r4251 - in freeswitch/trunk/src: . include
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: mikej Date: Tue Feb 13 22:22:43 2007 New Revision: 4251 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_event.c Log: constification for switch_core_hash_find and switch_event_create_subclass Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Tue Feb 13 22:22:43 2007 @@ -886,7 +886,7 @@ \param key the key to retrieve \return a pointer to the data held in the key */ -SWITCH_DECLARE(void *) switch_core_hash_find(switch_hash_t *hash, char *key); +SWITCH_DECLARE(void *) switch_core_hash_find(switch_hash_t *hash, const char *key); ///\} ///\defgroup timer Timer Functions Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Tue Feb 13 22:22:43 2007 @@ -139,7 +139,7 @@ \param subclass_name the subclass name for custom event (only valid when event_id is SWITCH_EVENT_CUSTOM) \return SWITCH_STATUS_SUCCESS on success */ -SWITCH_DECLARE(switch_status_t) switch_event_create_subclass(switch_event_t **event, switch_event_types_t event_id, char *subclass_name); +SWITCH_DECLARE(switch_status_t) switch_event_create_subclass(switch_event_t **event, switch_event_types_t event_id, const char *subclass_name); /*! \brief Set the priority of an event Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Feb 13 22:22:43 2007 @@ -3504,7 +3504,7 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(void *) switch_core_hash_find(switch_hash_t *hash, char *key) +SWITCH_DECLARE(void *) switch_core_hash_find(switch_hash_t *hash, const char *key) { return apr_hash_get(hash, key, APR_HASH_KEY_STRING); } Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Feb 13 22:22:43 2007 @@ -423,7 +423,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_create_subclass(switch_event_t **event, switch_event_types_t event_id, - char *subclass_name) + const char *subclass_name) { if (event_id != SWITCH_EVENT_CUSTOM && subclass_name) {

1 0

[commit] r4250 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: mikej Date: Tue Feb 13 21:56:31 2007 New Revision: 4250 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: eliminate shadowing of function level variables (functionally equivalent but redundant in this case) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Feb 13 21:56:31 2007 @@ -2047,15 +2047,6 @@ nua_respond(tech_pvt->nh, SIP_180_RINGING, SIPTAG_CONTACT_STR(tech_pvt->profile->url), TAG_END()); break; case SWITCH_MESSAGE_INDICATE_PROGRESS: { - struct private_object *tech_pvt; - switch_channel_t *channel = NULL; - - channel = switch_core_session_get_channel(session); - assert(channel != NULL); - - tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); - if (!switch_test_flag(tech_pvt, TFLAG_ANS)) { switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Asked to send early media by %s\n", msg->from);

1 0

[commit] r4249 - in freeswitch/trunk/src: . include
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: mikej Date: Tue Feb 13 21:53:23 2007 New Revision: 4249 Modified: freeswitch/trunk/src/include/switch_console.h freeswitch/trunk/src/include/switch_event.h freeswitch/trunk/src/include/switch_log.h freeswitch/trunk/src/switch_console.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_log.c Log: constify the fmt string on all printf like functions Modified: freeswitch/trunk/src/include/switch_console.h ============================================================================== --- freeswitch/trunk/src/include/switch_console.h (original) +++ freeswitch/trunk/src/include/switch_console.h Tue Feb 13 21:53:23 2007 @@ -67,7 +67,7 @@ /*! \brief A method akin to printf for dealing with api streams */ -SWITCH_DECLARE(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, char *fmt, ...) PRINTF_FUNCTION(2,3); +SWITCH_DECLARE(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, const char *fmt, ...) PRINTF_FUNCTION(2,3); SWITCH_END_EXTERN_C #endif Modified: freeswitch/trunk/src/include/switch_event.h ============================================================================== --- freeswitch/trunk/src/include/switch_event.h (original) +++ freeswitch/trunk/src/include/switch_event.h Tue Feb 13 21:53:23 2007 @@ -172,7 +172,7 @@ \param fmt the value of the header (varargs see standard sprintf family) \return SWITCH_STATUS_SUCCESS if the header was added */ -SWITCH_DECLARE(switch_status_t) switch_event_add_header(switch_event_t *event, switch_stack_t stack, char *header_name, char *fmt, ...) PRINTF_FUNCTION(4,5); +SWITCH_DECLARE(switch_status_t) switch_event_add_header(switch_event_t *event, switch_stack_t stack, const char *header_name, const char *fmt, ...) PRINTF_FUNCTION(4,5); /*! \brief Destroy an event @@ -251,7 +251,7 @@ \return the xml object if the operation was successful \note the body supplied by this function will supersede an existing body the event may have */ -SWITCH_DECLARE(switch_xml_t) switch_event_xmlize(switch_event_t *event, char *fmt, ...) PRINTF_FUNCTION(2,3); +SWITCH_DECLARE(switch_xml_t) switch_event_xmlize(switch_event_t *event, const char *fmt, ...) PRINTF_FUNCTION(2,3); /*! \brief Determine if the event system has been initilized @@ -266,7 +266,7 @@ \return SWITCH_STATUS_SUCCESS if the body was added to the event \note the body parameter can be shadowed by the switch_event_reserve_subclass_detailed function */ -SWITCH_DECLARE(switch_status_t) switch_event_add_body(switch_event_t *event, char *fmt, ...) PRINTF_FUNCTION(2,3); +SWITCH_DECLARE(switch_status_t) switch_event_add_body(switch_event_t *event, const char *fmt, ...) PRINTF_FUNCTION(2,3); /*! Modified: freeswitch/trunk/src/include/switch_log.h ============================================================================== --- freeswitch/trunk/src/include/switch_log.h (original) +++ freeswitch/trunk/src/include/switch_log.h Tue Feb 13 21:53:23 2007 @@ -94,7 +94,7 @@ \param ... variable args \note there are channel macros to supply the first 4 parameters */ -SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char *file, const char *func, int line, switch_log_level_t level, char *fmt, ...) PRINTF_FUNCTION(6,7); +SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char *file, const char *func, int line, switch_log_level_t level, const char *fmt, ...) PRINTF_FUNCTION(6,7); /*! \brief Shut down the logging engine Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Tue Feb 13 21:53:23 2007 @@ -35,7 +35,7 @@ #define CMD_BUFLEN 1024; -SWITCH_DECLARE(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, char *fmt, ...) +SWITCH_DECLARE(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, const char *fmt, ...) { va_list ap; char *buf = handle->data; Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Feb 13 21:53:23 2007 @@ -474,8 +474,8 @@ return NULL; } -SWITCH_DECLARE(switch_status_t) switch_event_add_header(switch_event_t *event, switch_stack_t stack, char *header_name, - char *fmt, ...) +SWITCH_DECLARE(switch_status_t) switch_event_add_header(switch_event_t *event, switch_stack_t stack, const char *header_name, + const char *fmt, ...) { int ret = 0; char data[2048]; @@ -516,7 +516,7 @@ } -SWITCH_DECLARE(switch_status_t) switch_event_add_body(switch_event_t *event, char *fmt, ...) +SWITCH_DECLARE(switch_status_t) switch_event_add_body(switch_event_t *event, const char *fmt, ...) { int ret = 0; char *data; @@ -729,7 +729,7 @@ return header; } -SWITCH_DECLARE(switch_xml_t) switch_event_xmlize(switch_event_t *event, char *fmt, ...) +SWITCH_DECLARE(switch_xml_t) switch_event_xmlize(switch_event_t *event, const char *fmt, ...) { switch_event_header_t *hp; char *data = NULL, *body = NULL; Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Tue Feb 13 21:53:23 2007 @@ -162,7 +162,7 @@ return NULL; } -SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char *file, const char *func, int line, switch_log_level_t level, char *fmt, ...) +SWITCH_DECLARE(void) switch_log_printf(switch_text_channel_t channel, const char *file, const char *func, int line, switch_log_level_t level, const char *fmt, ...) { char *data = NULL; char *new_fmt = NULL;

1 0

[commit] r4248 - freeswitch/trunk/src/include
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: anthm Date: Tue Feb 13 20:01:58 2007 New Revision: 4248 Modified: freeswitch/trunk/src/include/switch_xml.h Log: add nil thing to xml func Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Tue Feb 13 20:01:58 2007 @@ -265,7 +265,7 @@ ///\param value the attribute value ///\return an xml node or NULL #define switch_xml_set_attr_d(xml, name, value) \ - switch_xml_set_attr(switch_xml_set_flag(xml, SWITCH_XML_DUP), strdup(name), strdup(value)) + switch_xml_set_attr(switch_xml_set_flag(xml, SWITCH_XML_DUP), strdup(name), strdup(switch_str_nil(value))) ///\brief sets a flag for the given tag and returns the tag ///\param xml the xml node

1 0

[commit] r4247 - freeswitch/trunk/src
by Freeswitch SVN 14 Feb '07

14 Feb '07

Author: mikej Date: Tue Feb 13 19:31:11 2007 New Revision: 4247 Modified: freeswitch/trunk/src/switch_console.c Log: use WaitForSingleObject for the console loop to wait on stdin on the windows build, as the select was not working properly. Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Tue Feb 13 19:31:11 2007 @@ -199,8 +199,10 @@ while(running) { uint32_t arg; +#ifndef _MSC_VER fd_set rfds, efds; struct timeval tv = {0, 20000}; +#endif switch_core_session_ctl(SCSC_CHECK_RUNNING, &arg); if (!arg) { @@ -210,13 +212,14 @@ if (activity) { switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, "\nfreeswitch@%s> ", hostname); } - #ifdef _MSC_VER -//Microsofts macros don't pass their own compilers warnings. -#pragma warning(push) -#pragma warning(disable: 4127 4389) -#endif + activity = WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE),20); + if (activity == 102) { + fflush(stdout); + continue; + } +#else FD_ZERO(&rfds); FD_ZERO(&efds); FD_SET(fileno(stdin), &rfds); @@ -225,14 +228,12 @@ break; } -#ifdef _MSC_VER -#pragma warning(pop) -#endif - if (activity == 0) { fflush(stdout); continue; } +#endif + memset(&cmd, 0, sizeof(cmd)); for (x = 0; x < (sizeof(cmd)-1); x++) {

1 0

[commit] r4246 - freeswitch/trunk/src
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: mikej Date: Tue Feb 13 17:15:24 2007 New Revision: 4246 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: fix warnings on weird L value casts for function pointers. Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Tue Feb 13 17:15:24 2007 @@ -286,6 +286,9 @@ switch_loadable_module_t *module = NULL; apr_dso_handle_t *dso = NULL; apr_status_t status = SWITCH_STATUS_SUCCESS; + apr_dso_handle_sym_t load_function_handle = NULL; + apr_dso_handle_sym_t shutdown_function_handle = NULL; + apr_dso_handle_sym_t runtime_function_handle = NULL; switch_module_load_t load_func_ptr = NULL; int loading = 1; const char *err = NULL; @@ -304,7 +307,8 @@ break; } - status = apr_dso_sym((apr_dso_handle_sym_t *)&load_func_ptr, dso, "switch_module_load"); + status = apr_dso_sym(&load_function_handle, dso, "switch_module_load"); + load_func_ptr = (switch_module_load_t)(intptr_t) load_function_handle; if (load_func_ptr == NULL) { err = "Cannot locate symbol 'switch_module_load' please make sure this is a vaild module."; @@ -334,8 +338,10 @@ module->module_interface = module_interface; module->switch_module_load = load_func_ptr; - apr_dso_sym((apr_dso_handle_sym_t *)&module->switch_module_shutdown, dso, "switch_module_shutdown"); - apr_dso_sym((apr_dso_handle_sym_t *)&module->switch_module_runtime, dso, "switch_module_runtime"); + apr_dso_sym(&shutdown_function_handle, dso, "switch_module_shutdown"); + module->switch_module_shutdown = (switch_module_shutdown_t)(intptr_t) shutdown_function_handle; + apr_dso_sym(&runtime_function_handle, dso, "switch_module_runtime"); + module->switch_module_runtime = (switch_module_runtime_t)(intptr_t) runtime_function_handle; module->lib = dso;

1 0

[commit] r4245 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: mikej Date: Tue Feb 13 17:07:28 2007 New Revision: 4245 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: mod_conference use void function pointer for the caller control function table instead of a void data pointer (c99 likes to keep them separate) Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Tue Feb 13 17:07:28 2007 @@ -256,10 +256,12 @@ CONF_API_SUB_ARGS_AS_ONE } conference_fntype_t; +typedef void (*void_fn_t)(void); + /* API command parser */ typedef struct api_command { char *pname; - void *pfnapicmd; + void_fn_t pfnapicmd; conference_fntype_t fntype; char *psyntax; } api_command_t; @@ -3129,28 +3131,28 @@ /* API Interface Function sub-commands */ static api_command_t conf_api_sub_commands[] = { - {"list", &conf_api_sub_list, CONF_API_SUB_ARGS_SPLIT, "<confname> list [delim <string>]"}, - {"energy", &conf_api_sub_energy, CONF_API_SUB_MEMBER_TARGET, "<confname> energy <member_id|all|last> [<newval>]"}, - {"volume_in", &conf_api_sub_volume_in, CONF_API_SUB_MEMBER_TARGET, "<confname> volume_in <member_id|all|last> [<newval>]"}, - {"volume_out", &conf_api_sub_volume_out, CONF_API_SUB_MEMBER_TARGET, "<confname> volume_out <member_id|all|last> [<newval>]"}, - {"play", &conf_api_sub_play, CONF_API_SUB_ARGS_SPLIT, "<confname> play <file_path> [<member_id>]"}, - {"say", &conf_api_sub_say, CONF_API_SUB_ARGS_AS_ONE, "<confname> say <text>"}, - {"saymember", &conf_api_sub_saymember, CONF_API_SUB_ARGS_AS_ONE, "<confname> saymember <member_id> <text>"}, - {"stop", &conf_api_sub_stop, CONF_API_SUB_ARGS_SPLIT, "<confname> stop <[current|all|last]> [<member_id>]"}, - {"dtmf", &conf_api_sub_dtmf, CONF_API_SUB_MEMBER_TARGET, "<confname> dtmf <[member_id|all|last]> <digits>"}, - {"kick", &conf_api_sub_kick, CONF_API_SUB_MEMBER_TARGET, "<confname> kick <[member_id|all|last]>"}, - {"mute", &conf_api_sub_mute, CONF_API_SUB_MEMBER_TARGET, "<confname> mute <[member_id|all]|last>"}, - {"unmute", &conf_api_sub_unmute, CONF_API_SUB_MEMBER_TARGET, "<confname> unmute <[member_id|all]|last>"}, - {"deaf", &conf_api_sub_deaf, CONF_API_SUB_MEMBER_TARGET, "<confname> deaf <[member_id|all]|last>"}, - {"undeaf", &conf_api_sub_undeaf, CONF_API_SUB_MEMBER_TARGET, "<confname> undeaf <[member_id|all]|last>"}, - {"relate", &conf_api_sub_relate, CONF_API_SUB_ARGS_SPLIT, "<confname> relate <member_id> <other_member_id> [nospeak|nohear|clear]"}, - {"lock", &conf_api_sub_lock, CONF_API_SUB_ARGS_SPLIT, "<confname> lock"}, - {"unlock", &conf_api_sub_unlock, CONF_API_SUB_ARGS_SPLIT, "<confname> unlock"}, - {"dial", &conf_api_sub_dial, CONF_API_SUB_ARGS_SPLIT, "<confname> dial <endpoint_module_name>/<destination> <callerid number> <callerid name>"}, - {"bgdial", &conf_api_sub_bgdial, CONF_API_SUB_ARGS_SPLIT, "<confname> bgdial <endpoint_module_name>/<destination> <callerid number> <callerid name>"}, - {"transfer", &conf_api_sub_transfer, CONF_API_SUB_ARGS_SPLIT, "<confname> transfer <conference_name> <member id> [...<member id>]"}, - {"record", &conf_api_sub_record, CONF_API_SUB_ARGS_SPLIT, "<confname> record <filename>"}, - {"norecord", &conf_api_sub_norecord, CONF_API_SUB_ARGS_SPLIT, "<confname> norecord <[filename|all]>"}, + {"list", (void_fn_t)&conf_api_sub_list, CONF_API_SUB_ARGS_SPLIT, "<confname> list [delim <string>]"}, + {"energy", (void_fn_t)&conf_api_sub_energy, CONF_API_SUB_MEMBER_TARGET, "<confname> energy <member_id|all|last> [<newval>]"}, + {"volume_in", (void_fn_t)&conf_api_sub_volume_in, CONF_API_SUB_MEMBER_TARGET, "<confname> volume_in <member_id|all|last> [<newval>]"}, + {"volume_out", (void_fn_t)&conf_api_sub_volume_out, CONF_API_SUB_MEMBER_TARGET, "<confname> volume_out <member_id|all|last> [<newval>]"}, + {"play", (void_fn_t)&conf_api_sub_play, CONF_API_SUB_ARGS_SPLIT, "<confname> play <file_path> [<member_id>]"}, + {"say", (void_fn_t)&conf_api_sub_say, CONF_API_SUB_ARGS_AS_ONE, "<confname> say <text>"}, + {"saymember", (void_fn_t)&conf_api_sub_saymember, CONF_API_SUB_ARGS_AS_ONE, "<confname> saymember <member_id> <text>"}, + {"stop", (void_fn_t)&conf_api_sub_stop, CONF_API_SUB_ARGS_SPLIT, "<confname> stop <[current|all|last]> [<member_id>]"}, + {"dtmf", (void_fn_t)&conf_api_sub_dtmf, CONF_API_SUB_MEMBER_TARGET, "<confname> dtmf <[member_id|all|last]> <digits>"}, + {"kick", (void_fn_t)&conf_api_sub_kick, CONF_API_SUB_MEMBER_TARGET, "<confname> kick <[member_id|all|last]>"}, + {"mute", (void_fn_t)&conf_api_sub_mute, CONF_API_SUB_MEMBER_TARGET, "<confname> mute <[member_id|all]|last>"}, + {"unmute", (void_fn_t)&conf_api_sub_unmute, CONF_API_SUB_MEMBER_TARGET, "<confname> unmute <[member_id|all]|last>"}, + {"deaf", (void_fn_t)&conf_api_sub_deaf, CONF_API_SUB_MEMBER_TARGET, "<confname> deaf <[member_id|all]|last>"}, + {"undeaf", (void_fn_t)&conf_api_sub_undeaf, CONF_API_SUB_MEMBER_TARGET, "<confname> undeaf <[member_id|all]|last>"}, + {"relate", (void_fn_t)&conf_api_sub_relate, CONF_API_SUB_ARGS_SPLIT, "<confname> relate <member_id> <other_member_id> [nospeak|nohear|clear]"}, + {"lock", (void_fn_t)&conf_api_sub_lock, CONF_API_SUB_ARGS_SPLIT, "<confname> lock"}, + {"unlock", (void_fn_t)&conf_api_sub_unlock, CONF_API_SUB_ARGS_SPLIT, "<confname> unlock"}, + {"dial", (void_fn_t)&conf_api_sub_dial, CONF_API_SUB_ARGS_SPLIT, "<confname> dial <endpoint_module_name>/<destination> <callerid number> <callerid name>"}, + {"bgdial", (void_fn_t)&conf_api_sub_bgdial, CONF_API_SUB_ARGS_SPLIT, "<confname> bgdial <endpoint_module_name>/<destination> <callerid number> <callerid name>"}, + {"transfer", (void_fn_t)&conf_api_sub_transfer, CONF_API_SUB_ARGS_SPLIT, "<confname> transfer <conference_name> <member id> [...<member id>]"}, + {"record", (void_fn_t)&conf_api_sub_record, CONF_API_SUB_ARGS_SPLIT, "<confname> record <filename>"}, + {"norecord", (void_fn_t)&conf_api_sub_norecord, CONF_API_SUB_ARGS_SPLIT, "<confname> norecord <[filename|all]>"}, }; #define CONFFUNCAPISIZE (sizeof(conf_api_sub_commands)/sizeof(conf_api_sub_commands[0])) @@ -3194,7 +3196,7 @@ } if (all) { - conference_member_itterator(conference, stream, conf_api_sub_commands[i].pfnapicmd, argv[argn+2]); + conference_member_itterator(conference, stream, (conf_api_member_cmd_t)conf_api_sub_commands[i].pfnapicmd, argv[argn+2]); } else if (last) { conference_member_t *member = NULL; conference_member_t *last_member = NULL;

1 0

[commit] r4244 - freeswitch/trunk/src/mod/endpoints/mod_iax
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: mikej Date: Tue Feb 13 16:54:16 2007 New Revision: 4244 Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Log: missing return; Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Tue Feb 13 16:54:16 2007 @@ -834,7 +834,7 @@ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Doh! no caller profile\n"); switch_core_session_destroy(new_session); - SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; } if ((tech_pvt->iax_session = iax_session_new()) == 0) {

1 0

[commit] r4243 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 13 Feb '07

13 Feb '07

Author: mikej Date: Tue Feb 13 16:52:33 2007 New Revision: 4243 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: potentially uninitialized variable. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Feb 13 16:52:33 2007 @@ -969,7 +969,7 @@ switch_stream_handle_t stream = {0}; switch_hash_index_t *hi; void *vval; - char *extra_headers; + char *extra_headers = NULL; const void *vvar; channel = switch_core_session_get_channel(session);

1 0