- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r9306 - freeswitch/trunk/src
by Freeswitch SVN 15 Aug '08

15 Aug '08

Author: anthm Date: Fri Aug 15 17:49:43 2008 New Revision: 9306 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: change log message to protect the innocent Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Fri Aug 15 17:49:43 2008 @@ -272,13 +272,15 @@ if (status != SWITCH_STATUS_BREAK && !switch_channel_test_flag(chan_a, CF_HOLD)) { if (switch_core_session_write_frame(session_b, read_frame, SWITCH_IO_FLAG_NONE, stream_id) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "write: %s Bad Frame....[%u] Bubye!\n", - switch_channel_get_name(chan_b), read_frame->datalen); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, + "%s ending bridge by request from write function\n", switch_channel_get_name(chan_b)); + + goto end_of_bridge_loop; } } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "read: %s Bad Frame.... Bubye!\n", switch_channel_get_name(chan_a)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s ending bridge by request from read function\n", switch_channel_get_name(chan_a)); goto end_of_bridge_loop; } }

1 0

[commit] r9305 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 15 Aug '08

15 Aug '08

Author: anthm Date: Fri Aug 15 15:30:34 2008 New Revision: 9305 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: fix MODENDP-121 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Fri Aug 15 15:30:34 2008 @@ -269,6 +269,7 @@ char *register_scheme; char *register_realm; char *register_username; + char *auth_username; char *register_password; char *register_from; char *register_contact; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Aug 15 15:30:34 2008 @@ -775,6 +775,7 @@ char *register_str = "true", *scheme = "Digest", *realm = NULL, *username = NULL, + *auth_username = NULL, *password = NULL, *caller_id_in_from = "false", *extension = NULL, @@ -807,6 +808,8 @@ realm = val; } else if (!strcmp(var, "username")) { username = val; + } else if (!strcmp(var, "auth-username")) { + auth_username = val; } else if (!strcmp(var, "password")) { password = val; } else if (!strcmp(var, "caller-id-in-from")) { @@ -886,6 +889,10 @@ from_domain = realm; } + if (switch_strlen_zero(auth_username)) { + auth_username = username; + } + if (!switch_strlen_zero(register_proxy)) { gateway->register_sticky_proxy = switch_core_strdup(gateway->pool, register_proxy); } @@ -899,6 +906,7 @@ gateway->register_context = switch_core_strdup(gateway->pool, context); gateway->register_realm = switch_core_strdup(gateway->pool, realm); gateway->register_username = switch_core_strdup(gateway->pool, username); + gateway->auth_username = switch_core_strdup(gateway->pool, auth_username); gateway->register_password = switch_core_strdup(gateway->pool, password); if (switch_true(caller_id_in_from)) { switch_set_flag(gateway, REG_FLAG_CALLERID); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Fri Aug 15 15:30:34 2008 @@ -1094,7 +1094,7 @@ goto cancel; } - switch_snprintf(authentication, sizeof(authentication), "%s:%s:%s:%s", scheme, realm, gateway->register_username, gateway->register_password); + switch_snprintf(authentication, sizeof(authentication), "%s:%s:%s:%s", scheme, realm, gateway->auth_username, gateway->register_password); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Authenticating '%s' with '%s'.\n", profile->username, authentication);

1 0

[commit] r9304 - freeswitch/trunk
by Freeswitch SVN 15 Aug '08

15 Aug '08

Author: mikej Date: Fri Aug 15 11:08:19 2008 New Revision: 9304 Modified: freeswitch/trunk/Freeswitch.2008.sln Log: tweak race in msvc build system when doing parallel build (multi cpu) Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Fri Aug 15 11:08:19 2008 @@ -700,6 +700,9 @@ EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mediaframe", "libs\openmrcp\mediaframe\mediaframe.2008.vcproj", "{AA91F0AC-6562-435E-814C-5C94689FEFA2}" + ProjectSection(ProjectDependencies) = postProject + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpcore", "libs\openmrcp\mrcpcore\mrcpcore.2008.vcproj", "{829A9309-3B94-43C0-846B-7EC9D6D35F8B}" ProjectSection(ProjectDependencies) = postProject

1 0

[commit] r9303 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 15 Aug '08

15 Aug '08

Author: anthm Date: Fri Aug 15 11:05:48 2008 New Revision: 9303 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: add eval function Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Fri Aug 15 11:05:48 2008 @@ -197,6 +197,52 @@ } + +SWITCH_STANDARD_API(eval_function) +{ + char *expanded; + switch_event_t *event; + char uuid[80] = ""; + const char *p, *input = cmd; + + if (switch_strlen_zero(cmd)) { + stream->write_function(stream, "%s", ""); + return SWITCH_STATUS_SUCCESS; + } + + if (!strncasecmp(cmd, "uuid:", 5)) { + p = cmd + 5; + if ((input = strchr(p, ' ')) && *input++) { + switch_copy_string(uuid, p, input - p); + } + } + + if (switch_strlen_zero(input)) { + stream->write_function(stream, "%s", ""); + return SWITCH_STATUS_SUCCESS; + } + + + switch_event_create(&event, SWITCH_EVENT_MESSAGE); + if (*uuid) { + if ((session = switch_core_session_locate(uuid))) { + switch_channel_event_set_data(switch_core_session_get_channel(session), event); + switch_core_session_rwunlock(session); + } + } + + expanded = switch_event_expand_headers(event, input); + + stream->write_function(stream, "%s", expanded); + + if (expanded != input) { + free(expanded); + } + + return SWITCH_STATUS_SUCCESS; + +} + SWITCH_STANDARD_API(module_exists_function) { if (!switch_strlen_zero(cmd)) { @@ -2535,6 +2581,7 @@ SWITCH_ADD_API(commands_api_interface, "url_decode", "url decode a string", url_decode_function, "<string>"); SWITCH_ADD_API(commands_api_interface, "module_exists", "check if module exists", module_exists_function, "<module>"); SWITCH_ADD_API(commands_api_interface, "uuid_send_dtmf", "send dtmf digits", uuid_send_dtmf_function, UUID_SEND_DTMF_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "eval", "eval (noop)", eval_function, "<expression>"); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_NOUNLOAD;

1 0

[commit] r9302 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 15 Aug '08

15 Aug '08

Author: mikej Date: Fri Aug 15 00:07:33 2008 New Revision: 9302 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: attempt to fix MODAPP-129, seg when kicking many conference members quickly 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 Fri Aug 15 00:07:33 2008 @@ -2828,11 +2828,12 @@ if (stream != NULL) { stream->write_function(stream, "OK kicked %u\n", member->id); } - if (test_eflag(member->conference, EFLAG_KICK_MEMBER) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - conference_add_event_member_data(member, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "kick-member"); - switch_event_fire(&event); + if (member->conference && test_eflag(member->conference, EFLAG_KICK_MEMBER)) { + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + conference_add_event_member_data(member, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "kick-member"); + switch_event_fire(&event); + } } return SWITCH_STATUS_SUCCESS; } @@ -3662,7 +3663,7 @@ conference_member_t *member = conference_member_get(conference, id); if (member != NULL) { - pfn(conference_member_get(conference, id), stream, argv[argn + 2]); + pfn(member, stream, argv[argn + 2]); } else { stream->write_function(stream, "Non-Existant ID %u\n", id); }

1 0

[commit] r9301 - freeswitch/trunk/src
by Freeswitch SVN 15 Aug '08

15 Aug '08

Author: robertj Date: Thu Aug 14 23:34:29 2008 New Revision: 9301 Modified: freeswitch/trunk/src/switch_xml.c Log: Fixed 64 bit compile issues with DevStudio 2005. Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Thu Aug 14 23:34:29 2008 @@ -2258,11 +2258,11 @@ #endif static int compare(const void *, const void *); -static int glob0(const char *, glob_t *, int *); -static int glob1(char *, glob_t *, int *); -static int glob2(char *, char *, char *, char *, glob_t *, int *); -static int glob3(char *, char *, char *, char *, char *, glob_t *, int *); -static int globextend(const char *, glob_t *, int *); +static int glob0(const char *, glob_t *, size_t *); +static int glob1(char *, glob_t *, size_t *); +static int glob2(char *, char *, char *, char *, glob_t *, size_t *); +static int glob3(char *, char *, char *, char *, char *, glob_t *, size_t *); +static int globextend(const char *, glob_t *, size_t *); static int match(char *, char *, char *); #pragma warning(push) @@ -2271,7 +2271,7 @@ int glob(const char *pattern, int flags, int (*errfunc)(const char *, int), glob_t *pglob) { const unsigned char *patnext; - int limit; + size_t limit; char c; char *bufnext, *bufend, patbuf[MAXPATHLEN]; @@ -2307,11 +2307,11 @@ * sorts the list (unless unsorted operation is requested). Returns 0 * if things went well, nonzero if errors occurred. */ -static int glob0(const char *pattern, glob_t *pglob, int *limit) +static int glob0(const char *pattern, glob_t *pglob, size_t *limit) { const char *qpatnext; int c, err; - unsigned int oldpathc; + size_t oldpathc; char *bufnext, patbuf[MAXPATHLEN]; qpatnext = pattern; @@ -2398,7 +2398,7 @@ return(strcmp(*(char **)p, *(char **)q)); } -static int glob1(char *pattern, glob_t *pglob, int *limit) +static int glob1(char *pattern, glob_t *pglob, size_t *limit) { char pathbuf[MAXPATHLEN]; @@ -2414,7 +2414,7 @@ * of recursion for each segment in the pattern that contains one or more * meta characters. */ -static int glob2(char *pathbuf, char *pathend, char *pathend_last, char *pattern, glob_t *pglob, int *limit) +static int glob2(char *pathbuf, char *pathend, char *pathend_last, char *pattern, glob_t *pglob, size_t *limit) { struct stat sb; char *p, *q; @@ -2466,7 +2466,7 @@ /* NOTREACHED */ } -static int glob3(char *pathbuf, char *pathend, char *pathend_last, char *pattern, char *restpattern, glob_t *pglob, int *limit) +static int glob3(char *pathbuf, char *pathend, char *pathend_last, char *pattern, char *restpattern, glob_t *pglob, size_t *limit) { int err; apr_dir_t * dirp; @@ -2543,12 +2543,12 @@ * Either gl_pathc is zero and gl_pathv is NULL; or gl_pathc > 0 and * gl_pathv points to (gl_offs + gl_pathc + 1) items. */ -static int globextend(const char *path, glob_t *pglob, int *limit) +static int globextend(const char *path, glob_t *pglob, size_t *limit) { char **pathv; char * copy; - int i; - unsigned int newsize, len; + size_t i; + size_t newsize, len; const char *p; if (*limit && pglob->gl_pathc > (unsigned int)(*limit)) { @@ -2644,7 +2644,7 @@ /* Free allocated data belonging to a glob_t structure. */ void globfree(glob_t *pglob) { - int i; + size_t i; char **pp; if (pglob->gl_pathv != NULL) {

1 0

[commit] r9300 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 Aug '08

14 Aug '08

Author: anthm Date: Thu Aug 14 15:44:12 2008 New Revision: 9300 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix for SFSIP-82 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Aug 14 15:44:12 2008 @@ -2230,9 +2230,10 @@ match = strcasecmp(switch_str_nil(map->rm_encoding), tech_pvt->iananame) ? 0 : 1; } - if (match) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Our existing codec [%s] is still good, let's keep it\n", - tech_pvt->rm_encoding); + if (match && connection->c_address && tech_pvt->remote_sdp_audio_ip && + !strcmp(connection->c_address, tech_pvt->remote_sdp_audio_ip) && m->m_port == tech_pvt->remote_sdp_audio_port) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Our existing sdp is still good [%s %s:%d], let's keep it.\n", + tech_pvt->rm_encoding, tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port); got_audio = 1; break; }

1 0

[commit] r9299 - freeswitch/trunk/src
by Freeswitch SVN 14 Aug '08

14 Aug '08

Author: brian Date: Thu Aug 14 14:22:07 2008 New Revision: 9299 Modified: freeswitch/trunk/src/switch_cpp.cpp Log: fix cpp bridge Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Thu Aug 14 14:22:07 2008 @@ -1070,7 +1070,7 @@ if (switch_channel_ready(channel_a) && switch_channel_ready(channel_b)) { session_a.begin_allow_threads(); - if (!switch_channel_media_ready(channel_a)) { + if (!switch_channel_test_flag(channel_a, CF_OUTBOUND) && !switch_channel_media_ready(channel_a)) { switch_channel_pre_answer(channel_a); }

1 0

[commit] r9298 - freeswitch/trunk/src
by Freeswitch SVN 14 Aug '08

14 Aug '08

Author: brian Date: Thu Aug 14 14:19:41 2008 New Revision: 9298 Modified: freeswitch/trunk/src/switch_cpp.cpp Log: fix cpp bridge Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Thu Aug 14 14:19:41 2008 @@ -1070,12 +1070,10 @@ if (switch_channel_ready(channel_a) && switch_channel_ready(channel_b)) { session_a.begin_allow_threads(); - if (!switch_channel_test_flag(channel_a, CF_ANSWERED)) { - switch_channel_answer(channel_a); - } - if (!switch_channel_test_flag(channel_b, CF_ANSWERED)) { - switch_channel_answer(channel_b); + if (!switch_channel_media_ready(channel_a)) { + switch_channel_pre_answer(channel_a); } + if (switch_channel_ready(channel_a) && switch_channel_ready(channel_b)) { args = session_a.get_cb_args(); // get the cb_args data structure for session a dtmf_func = args.input_callback; // get the call back function

1 0

[commit] r9297 - freeswitch/trunk/src/mod/languages/mod_lua
by Freeswitch SVN 14 Aug '08

14 Aug '08

Author: brian Date: Thu Aug 14 13:35:46 2008 New Revision: 9297 Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp Log: fix lua originate Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Thu Aug 14 13:35:46 2008 @@ -59,10 +59,15 @@ } -void Session::originate(CoreSession *a_leg_session, char *dest, int timeout) +int Session::originate(CoreSession *a_leg_session, char *dest, int timeout) { - CoreSession::originate(a_leg_session, dest, timeout); - setLUA(L); + int x = CoreSession::originate(a_leg_session, dest, timeout); + + if (x) { + setLUA(L); + } + + return x; } lua_State *Session::getLUA() Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h Thu Aug 14 13:35:46 2008 @@ -33,7 +33,7 @@ void setInputCallback(char *cbfunc, char *funcargs = NULL); void setHangupHook(char *func, char *arg = NULL); bool ready(); - void originate(CoreSession *a_leg_session, char *dest, int timeout); + int originate(CoreSession *a_leg_session, char *dest, int timeout); char *cb_function; char *cb_arg; Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp Thu Aug 14 13:35:46 2008 @@ -7438,6 +7438,7 @@ CoreSession *arg2 = (CoreSession *) 0 ; char *arg3 = (char *) 0 ; int arg4 ; + int result; SWIG_check_num_args("originate",4,4) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("originate",1,"LUA::Session *"); @@ -7456,9 +7457,9 @@ arg3 = (char *)lua_tostring(L, 3); arg4 = (int)lua_tonumber(L, 4); - (arg1)->originate(arg2,arg3,arg4); + result = (int)(arg1)->originate(arg2,arg3,arg4); SWIG_arg=0; - + lua_pushnumber(L, (lua_Number) result); SWIG_arg++; return SWIG_arg; if(0) SWIG_fail;

1 0