- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4096 - in freeswitch/trunk: libs/win32 libs/win32/apr-util w32/Library
by Freeswitch SVN 31 Jan '07

31 Jan '07

Author: mikej Date: Wed Jan 31 02:54:02 2007 New Revision: 4096 Modified: freeswitch/trunk/libs/win32/apr-util/xml.vcproj freeswitch/trunk/libs/win32/util.vbs freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Log: fix windows build when there is a space in the source directory name. Modified: freeswitch/trunk/libs/win32/apr-util/xml.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/apr-util/xml.vcproj (original) +++ freeswitch/trunk/libs/win32/apr-util/xml.vcproj Wed Jan 31 02:54:02 2007 @@ -346,7 +346,7 @@ <Tool Name="VCCustomBuildTool" Description="Creating expat.h from expat.h.in" - CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in > $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h
" + CommandLine="if not exist "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" type "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in" > "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h"
" Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" /> </FileConfiguration> @@ -356,7 +356,7 @@ <Tool Name="VCCustomBuildTool" Description="Creating expat.h from expat.h.in" - CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in > $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h
" + CommandLine="if not exist "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" type "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in" > "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h"
" Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" /> </FileConfiguration> @@ -370,7 +370,7 @@ <Tool Name="VCCustomBuildTool" Description="Creating config.h from winconfig.h" - CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h > $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h
" + CommandLine="if not exist "$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" type "$(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h" > "$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h"
" Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" /> </FileConfiguration> @@ -380,7 +380,7 @@ <Tool Name="VCCustomBuildTool" Description="Creating config.h from winconfig.h" - CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h > $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h
" + CommandLine="if not exist "$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" type "$(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h" > "$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h"
" Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/util.vbs ============================================================================== --- freeswitch/trunk/libs/win32/util.vbs (original) +++ freeswitch/trunk/libs/win32/util.vbs Wed Jan 31 02:54:02 2007 @@ -231,7 +231,7 @@ MyFile.WriteLine("@" & "cd " & quote & tmpFolder & quote ) MyFile.WriteLine("@" & VersionCmd) MyFile.Close - Set oExec = WshShell.Exec(tmpFolder & "tmpVersion.Bat") + Set oExec = WshShell.Exec("cmd /C " & quote & tmpFolder & "tmpVersion.Bat" & quote) Do strFromProc = OExec.StdOut.ReadLine() VERSION=strFromProc Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Wed Jan 31 02:54:02 2007 @@ -106,7 +106,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="xcopy $(SolutionDir)conf\*.* $(SolutionDir)$(OutDir)\conf\ /C /D /Y
if not exist $(SolutionDir)$(OutDir)\db md $(SolutionDir)$(OutDir)\db
if not exist $(SolutionDir)$(OutDir)\log md $(SolutionDir)$(OutDir)\log
if not exist $(SolutionDir)$(OutDir)\log md $(SolutionDir)$(OutDir)\htdocs

" + CommandLine="xcopy "$(SolutionDir)conf\*.*" "$(SolutionDir)$(OutDir)\conf\" /C /D /Y
if not exist "$(SolutionDir)$(OutDir)\db" md "$(SolutionDir)$(OutDir)\db"
if not exist "$(SolutionDir)$(OutDir)\log" md "$(SolutionDir)$(OutDir)\log"
if not exist "$(SolutionDir)$(OutDir)\htdocs" md "$(SolutionDir)$(OutDir)\htdocs"

" /> </Configuration> <Configuration @@ -195,7 +195,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="xcopy $(SolutionDir)conf\*.* $(SolutionDir)$(OutDir)\conf\ /C /D /Y
if not exist $(SolutionDir)$(OutDir)\db md $(SolutionDir)$(OutDir)\db
if not exist $(SolutionDir)$(OutDir)\log md $(SolutionDir)$(OutDir)\log
if not exist $(SolutionDir)$(OutDir)\log md $(SolutionDir)$(OutDir)\htdocs

" + CommandLine="xcopy "$(SolutionDir)conf\*.*" "$(SolutionDir)$(OutDir)\conf\" /C /D /Y
if not exist "$(SolutionDir)$(OutDir)\db" md "$(SolutionDir)$(OutDir)\db"
if not exist "$(SolutionDir)$(OutDir)\log" md "$(SolutionDir)$(OutDir)\log"
if not exist "$(SolutionDir)$(OutDir)\htdocs" md "$(SolutionDir)$(OutDir)\htdocs"

" /> </Configuration> </Configurations>

1 0

[commit] r4095 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 30 Jan '07

30 Jan '07

Author: mikej Date: Tue Jan 30 14:20:41 2007 New Revision: 4095 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: code before declaration, and function must return value. 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 Jan 30 14:20:41 2007 @@ -1230,7 +1230,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "dial argc %u 1 '%s' 2 '%s' 3 '%s' 4 '%s'\n", argc, argv[0], argv[1], argv[2], argv[3]); if (argc >= 4) { - switch_call_cause_t *cause; + switch_call_cause_t cause; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "executing conference outcall\n"); conference_outcall(member->conference, NULL, argv[0], atoi(argv[1]), NULL, argv[3], argv[2], &cause); } else { @@ -3466,9 +3466,9 @@ if (call) { switch_call_cause_t cause; + switch_event_t *event; conference_outcall(call->conference, call->session, call->bridgeto, call->timeout, call->flags, call->cid_name, call->cid_num, &cause); - switch_event_t *event; 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", call->conference->name); @@ -3523,7 +3523,11 @@ switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); switch_thread_create(&thread, thd_attr, conference_outcall_run, call, conference->pool); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Lanuching BG Thread for outcall\n"); + + return SWITCH_STATUS_SUCCESS; } + + return SWITCH_STATUS_MEMERR; } /* Play a file */

1 0

[commit] r4094 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 30 Jan '07

30 Jan '07

Author: mikej Date: Tue Jan 30 13:00:58 2007 New Revision: 4094 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: Yet another attempt to get the garbage collector code right. Patch worked out with Bret McDanel Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Jan 30 13:00:58 2007 @@ -2411,6 +2411,8 @@ if (cx) { eval_some_js(script, cx, javascript_global_object, &rval); + JS_EndRequest(cx); + JS_MaybeGC(cx); JS_DestroyContext(cx); } }

1 0

[commit] r4093 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 30 Jan '07

30 Jan '07

Author: anthm Date: Tue Jan 30 11:37:03 2007 New Revision: 4093 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: ummm.... yeah... 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 Jan 30 11:37:03 2007 @@ -2310,6 +2310,7 @@ if (match && (map->rm_rate == imp->samples_per_second)) { if (ptime && ptime * 1000 != imp->microseconds_per_frame) { near_match = imp; + match = 0; continue; } mimp = imp; @@ -2329,7 +2330,8 @@ near_match->iananame, near_match->samples_per_second, ptime); - + + prefs[0] = tmp; num = switch_loadable_module_get_codecs_sorted(search, 1, prefs, 1); if (num) {

1 0

[commit] r4092 - freeswitch/trunk/libs/libdingaling
by Freeswitch SVN 30 Jan '07

30 Jan '07

Author: anthm Date: Tue Jan 30 10:12:31 2007 New Revision: 4092 Modified: freeswitch/trunk/libs/libdingaling/.update Log: trigger dingaling rebuild Modified: freeswitch/trunk/libs/libdingaling/.update ============================================================================== --- freeswitch/trunk/libs/libdingaling/.update (original) +++ freeswitch/trunk/libs/libdingaling/.update Tue Jan 30 10:12:31 2007 @@ -1 +1 @@ -Fri Jan 19 15:23:51 EST 2007 +Tue Jan 30 10:12:18 EST 2007

1 0

[commit] r4091 - in freeswitch/trunk/src: . include
by Freeswitch SVN 30 Jan '07

30 Jan '07

Author: anthm Date: Mon Jan 29 22:17:10 2007 New Revision: 4091 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr.c Log: add success cause for originate Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Jan 29 22:17:10 2007 @@ -783,6 +783,7 @@ typedef enum { SWITCH_CAUSE_UNALLOCATED = 0, + SWITCH_CAUSE_SUCCESS = 1, SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET = 2, SWITCH_CAUSE_NO_ROUTE_DESTINATION = 3, SWITCH_CAUSE_CHANNEL_UNACCEPTABLE = 6, Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Jan 29 22:17:10 2007 @@ -40,6 +40,7 @@ static struct switch_cause_table CAUSE_CHART[] = { { "UNALLOCATED", SWITCH_CAUSE_UNALLOCATED }, + { "SUCCESS", SWITCH_CAUSE_SUCCESS }, { "NO_ROUTE_TRANSIT_NET", SWITCH_CAUSE_NO_ROUTE_TRANSIT_NET }, { "NO_ROUTE_DESTINATION", SWITCH_CAUSE_NO_ROUTE_DESTINATION }, { "CHANNEL_UNACCEPTABLE", SWITCH_CAUSE_CHANNEL_UNACCEPTABLE }, Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Jan 29 22:17:10 2007 @@ -2893,6 +2893,7 @@ switch_channel_set_variable(caller_channel, "originate_disposition", "call accepted"); } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Originate Resulted in Success: [%s]\n", switch_channel_get_name(peer_channel)); + *cause = SWITCH_CAUSE_SUCCESS; } else { if (peer_channel) { *cause = switch_channel_get_cause(peer_channel);

1 0

[commit] r4090 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 30 Jan '07

30 Jan '07

Author: anthm Date: Mon Jan 29 19:43:14 2007 New Revision: 4090 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: conf tweaks the series 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 Mon Jan 29 19:43:14 2007 @@ -283,7 +283,15 @@ uint32_t timeout, char *flags, char *cid_name, - char *cid_num); + char *cid_num, + switch_call_cause_t *cause); +static switch_status_t conference_outcall_bg(conference_obj_t *conference, + switch_core_session_t *session, + char *bridgeto, + uint32_t timeout, + char *flags, + char *cid_name, + char *cid_num); static void conference_function(switch_core_session_t *session, char *data); static void launch_conference_thread(conference_obj_t *conference); static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, void *obj); @@ -1222,8 +1230,9 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "dial argc %u 1 '%s' 2 '%s' 3 '%s' 4 '%s'\n", argc, argv[0], argv[1], argv[2], argv[3]); if (argc >= 4) { + switch_call_cause_t *cause; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "executing conference outcall\n"); - conference_outcall(member->conference, NULL, argv[0], atoi(argv[1]), NULL, argv[3], argv[2]); + conference_outcall(member->conference, NULL, argv[0], atoi(argv[1]), NULL, argv[3], argv[2], &cause); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "conference outcall not executed\n"); } @@ -2919,7 +2928,26 @@ assert(stream != NULL); if (argc > 2) { - conference_outcall(conference, NULL, argv[2], 60, NULL, argv[4], argv[3]); + switch_call_cause_t cause; + conference_outcall(conference, NULL, argv[2], 60, NULL, argv[4], argv[3], &cause); + stream->write_function(stream, "Call Requested: result: [%s]\n", switch_channel_cause2str(cause)); + } else { + ret_status = SWITCH_STATUS_GENERR; + } + + return ret_status; +} + + +static switch_status_t conf_api_sub_bgdial(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char**argv) +{ + switch_status_t ret_status = SWITCH_STATUS_SUCCESS; + + assert(conference != NULL); + assert(stream != NULL); + + if (argc > 2) { + conference_outcall_bg(conference, NULL, argv[2], 60, NULL, argv[4], argv[3]); stream->write_function(stream, "OK\n"); } else { ret_status = SWITCH_STATUS_GENERR; @@ -3100,6 +3128,7 @@ {"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]>"}, @@ -3260,13 +3289,11 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Read Lock Fail\n"); goto done; } - switch_mutex_lock(conference->mutex); if (argc >= 2) { conf_api_dispatch(conference, stream, argc, argv, (const char *)buf, 1); } else { stream->write_function(stream, "Conference command, not specified.\nTry 'help'\n"); } - switch_mutex_unlock(conference->mutex); switch_thread_rwlock_unlock(conference->rwlock); } else { @@ -3317,6 +3344,7 @@ /*.on_hold */ NULL, }; + /* generate an outbound call from the conference */ static switch_status_t conference_outcall(conference_obj_t *conference, switch_core_session_t *session, @@ -3324,14 +3352,16 @@ uint32_t timeout, char *flags, char *cid_name, - char *cid_num) + char *cid_num, + switch_call_cause_t *cause) { switch_core_session_t *peer_session; switch_channel_t *peer_channel; switch_status_t status = SWITCH_STATUS_SUCCESS; switch_channel_t *caller_channel = NULL; char appdata[512]; - switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; + + *cause = SWITCH_CAUSE_NORMAL_CLEARING; if (switch_thread_rwlock_tryrdlock(conference->rwlock) != SWITCH_STATUS_SUCCESS) { @@ -3355,7 +3385,7 @@ /* establish an outbound call leg */ if (switch_ivr_originate(session, &peer_session, - &cause, + cause, bridgeto, timeout, &audio_bridge_peer_state_handlers, @@ -3363,9 +3393,9 @@ cid_num, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot create outgoing channel, cause: %s\n", - switch_channel_cause2str(cause)); + switch_channel_cause2str(*cause)); if (caller_channel) { - switch_channel_hangup(caller_channel, cause); + switch_channel_hangup(caller_channel, *cause); } goto done; } @@ -3420,6 +3450,82 @@ return status; } +struct bg_call { + conference_obj_t *conference; + switch_core_session_t *session; + char *bridgeto; + uint32_t timeout; + char *flags; + char *cid_name; + char *cid_num; +}; + +static void *SWITCH_THREAD_FUNC conference_outcall_run(switch_thread_t *thread, void *obj) +{ + struct bg_call *call = (struct bg_call *) obj; + + if (call) { + switch_call_cause_t cause; + + conference_outcall(call->conference, call->session, call->bridgeto, call->timeout, call->flags, call->cid_name, call->cid_num, &cause); + switch_event_t *event; + + 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", call->conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "bgdial-result"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Result", switch_channel_cause2str(cause)); + switch_event_fire(&event); + } + switch_safe_free(call->bridgeto); + switch_safe_free(call->flags); + switch_safe_free(call->cid_name); + switch_safe_free(call->cid_num); + switch_safe_free(call); + } + + return NULL; +} + +static switch_status_t conference_outcall_bg(conference_obj_t *conference, + switch_core_session_t *session, + char *bridgeto, + uint32_t timeout, + char *flags, + char *cid_name, + char *cid_num) +{ + struct bg_call *call = NULL; + + if ((call = malloc(sizeof(*call)))) { + switch_thread_t *thread; + switch_threadattr_t *thd_attr = NULL; + + memset(call, 0, sizeof(*call)); + call->conference = conference; + call->session = session; + call->timeout = timeout; + + if (bridgeto) { + call->bridgeto = strdup(bridgeto); + } + if (flags) { + call->flags = strdup(flags); + } + if (cid_name) { + call->cid_name = strdup(cid_name); + } + if (cid_num) { + call->cid_num = strdup(cid_num); + } + + switch_threadattr_create(&thd_attr, conference->pool); + switch_threadattr_detach_set(thd_attr, 1); + switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); + switch_thread_create(&thread, thd_attr, conference_outcall_run, call, conference->pool); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Lanuching BG Thread for outcall\n"); + } +} + /* Play a file */ static switch_status_t conference_local_play_file(conference_obj_t *conference, switch_core_session_t *session, char *path, uint32_t leadin, char *buf, switch_size_t len) @@ -3682,7 +3788,8 @@ /* if we're using "bridge:" make an outbound call and bridge it in */ if (!switch_strlen_zero(bridgeto) && strcasecmp(bridgeto, "none")) { - if (conference_outcall(conference, session, bridgeto, 60, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) { + switch_call_cause_t cause; + if (conference_outcall(conference, session, bridgeto, 60, NULL, NULL, NULL, &cause) != SWITCH_STATUS_SUCCESS) { goto done; } } else {

1 0

[commit] r4087 - in freeswitch/trunk: libs/libdingaling/src src/mod/endpoints/mod_dingaling
by Freeswitch SVN 29 Jan '07

29 Jan '07

Author: anthm Date: Mon Jan 29 17:22:29 2007 New Revision: 4087 Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c freeswitch/trunk/libs/libdingaling/src/libdingaling.h freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: fix dingaling reject Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Mon Jan 29 17:22:29 2007 @@ -366,6 +366,8 @@ } } else if (!strcasecmp(type, "transport-accept")) { dl_signal = LDL_SIGNAL_TRANSPORT_ACCEPT; + } else if (!strcasecmp(type, "reject")) { + dl_signal = LDL_SIGNAL_REJECT; } else if (!strcasecmp(type, "transport-info")) { char *tid = iks_find_attrib(xml, "id"); dl_signal = LDL_SIGNAL_CANDIDATES; Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.h ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.h (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.h Mon Jan 29 17:22:29 2007 @@ -142,7 +142,8 @@ LDL_SIGNAL_LOGIN_SUCCESS, LDL_SIGNAL_LOGIN_FAILURE, LDL_SIGNAL_CONNECTED, - LDL_SIGNAL_TRANSPORT_ACCEPT + LDL_SIGNAL_TRANSPORT_ACCEPT, + LDL_SIGNAL_REJECT } ldl_signal_t; typedef enum { Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Mon Jan 29 17:22:29 2007 @@ -1616,10 +1616,10 @@ switch_channel_set_flag(channel, CF_OUTBOUND); switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); - + switch_stun_random_string(sess_id, 10, "0123456789"); - tech_pvt->us = switch_core_session_strdup(session, user); - tech_pvt->them = switch_core_session_strdup(session, full_id); + tech_pvt->us = switch_core_session_strdup(*new_session, user); + tech_pvt->them = switch_core_session_strdup(*new_session, full_id); ldl_session_create(&dlsession, mdl_profile->handle, sess_id, full_id, user, LDL_FLAG_OUTBOUND); tech_pvt->profile = mdl_profile; ldl_session_set_private(dlsession, *new_session); @@ -2685,11 +2685,18 @@ } } break; + case LDL_SIGNAL_REJECT: + if (channel) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "reject %s\n", switch_channel_get_name(channel)); + terminate_session(&session, __LINE__, SWITCH_CAUSE_CALL_REJECTED); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "End Call (Rejected)\n"); + goto done; + } + break; case LDL_SIGNAL_ERROR: case LDL_SIGNAL_TERMINATE: if (channel) { - switch_channel_state_t state = switch_channel_get_state(channel); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "hungup %s %u %d\n", switch_channel_get_name(channel), state, CS_INIT); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "hungup %s %u %d\n", switch_channel_get_name(channel)); terminate_session(&session, __LINE__, SWITCH_CAUSE_NORMAL_CLEARING); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "End Call\n"); goto done;

1 0

[commit] r4086 - freeswitch/trunk/src
by Freeswitch SVN 29 Jan '07

29 Jan '07

Author: anthm Date: Mon Jan 29 15:11:26 2007 New Revision: 4086 Modified: freeswitch/trunk/src/switch_core.c Log: make send_dtmf parse w and W for 500 and 1000 ms pause Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Jan 29 15:11:26 2007 @@ -2469,13 +2469,35 @@ switch_status_t status = SWITCH_STATUS_FALSE; if (session->endpoint_interface->io_routines->send_dtmf) { - if ((status = session->endpoint_interface->io_routines->send_dtmf(session, dtmf)) == SWITCH_STATUS_SUCCESS) { - for (ptr = session->event_hooks.send_dtmf; ptr; ptr = ptr->next) { - if ((status = ptr->send_dtmf(session, dtmf)) != SWITCH_STATUS_SUCCESS) { - break; - } - } - } + if (strchr(dtmf, 'w') || strchr(dtmf, 'W')) { + char *d; + for (d = dtmf; d && *d; d++) { + char digit[2] = ""; + + if (*d == 'w') { + switch_yield(500000); + continue; + } else if (*d == 'W') { + switch_yield(1000000); + continue; + } + + digit[0] = *d; + if ((status = session->endpoint_interface->io_routines->send_dtmf(session, digit)) != SWITCH_STATUS_SUCCESS) { + return status; + } + } + } else { + status = session->endpoint_interface->io_routines->send_dtmf(session, dtmf); + } + + if (status == SWITCH_STATUS_SUCCESS) { + for (ptr = session->event_hooks.send_dtmf; ptr; ptr = ptr->next) { + if ((status = ptr->send_dtmf(session, dtmf)) != SWITCH_STATUS_SUCCESS) { + break; + } + } + } } return status;

1 0

[commit] r4085 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 29 Jan '07

29 Jan '07

Author: mikej Date: Mon Jan 29 15:06:23 2007 New Revision: 4085 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: add queue_dtmf application, takes one param, a string of dtmf that will be queued to send from the channel. You could use this in the dialplan before a bridge to queue up dtmf to be sent to the other channel for example if you need to dial digits after answer for an fxo ata device. Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Jan 29 15:06:23 2007 @@ -71,6 +71,16 @@ switch_channel_ringback(channel); } +static void queue_dtmf_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *channel; + if (!switch_strlen_zero(data)) { + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + switch_channel_queue_dtmf(channel, data); + } +} + static void transfer_function(switch_core_session_t *session, char *data) { int argc; @@ -469,13 +479,22 @@ /*.next */ &dptools_api_interface }; +static const switch_application_interface_t queuedtmf_application_interface = { + /*.interface_name */ "queue_dtmf", + /*.application_function */ queue_dtmf_function, + /* long_desc */ "Queue dtmf to be sent from a session", + /* short_desc */ "Queue dtmf to be sent", + /* syntax */ "<dtmf_data>", + /*.next */ NULL +}; + static const switch_application_interface_t redirect_application_interface = { /*.interface_name */ "redirect", /*.application_function */ redirect_function, /* long_desc */ "Send a redirect message to a session.", /* short_desc */ "Send session redirect", /* syntax */ "<redirect_data>", - /*.next */ NULL + /*.next */ &queuedtmf_application_interface }; static const switch_application_interface_t ivr_application_interface = {

1 0