- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r11314 - freeswitch/trunk/src
by FreeSWITCH SVN 20 Jan '09

20 Jan '09

Author: anthm Date: Tue Jan 20 12:35:07 2009 New Revision: 11314 Log: fix restart for mac Modified: freeswitch/trunk/src/switch.c Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Tue Jan 20 12:35:07 2009 @@ -653,8 +653,18 @@ } if (destroy_status == SWITCH_STATUS_RESTART) { - switch_sleep(1000000); + char buf[1024] = ""; + int i = 0; + + switch_sleep(1000000); ret = (int)execv(argv[0], argv); + fprintf(stderr, "Restart Failed [%s] resorting to plan b\n", strerror(errno)); + + for(i = 0; i < argc; i++) { + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%s ", argv[i]); + } + + ret = system(buf); } return ret;

1 0

[commit] r11313 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by FreeSWITCH SVN 20 Jan '09

20 Jan '09

Author: andrew Date: Tue Jan 20 11:59:08 2009 New Revision: 11313 Log: Show the default low input/output latencies for each device in pa dump Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Tue Jan 20 11:59:08 2009 @@ -1166,6 +1166,9 @@ switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, "Default rate: %8.2f\n", deviceInfo->defaultSampleRate); + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, "Default input latency: %.3f | ", deviceInfo->defaultLowInputLatency); + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, "Default output latency: %.3f\n", deviceInfo->defaultLowOutputLatency); + /* poll for standard sample rates */ inputParameters.device = i; inputParameters.channelCount = deviceInfo->maxInputChannels;

1 0

[commit] r11312 - freeswitch/trunk/src/mod/endpoints/mod_opal
by FreeSWITCH SVN 20 Jan '09

20 Jan '09

Author: anthm Date: Tue Jan 20 11:22:56 2009 New Revision: 11312 Log: workaround to test a theory Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp Tue Jan 20 11:22:56 2009 @@ -1212,6 +1212,8 @@ switch_status_t FSMediaStream::write_frame(const switch_frame_t *frame, switch_io_flag_t flags) { + RTP_DataFrame rtp; + if (!switch_channel_ready(m_fsChannel)) { return SWITCH_STATUS_FALSE; } @@ -1221,22 +1223,41 @@ m_callOnStart = false; } + if ((frame->flags & SFF_CNG)) { + return SWITCH_STATUS_SUCCESS; + } + if ((frame->flags & SFF_RAW_RTP) != 0) { RTP_DataFrame rtp((const BYTE *) frame->packet, frame->packetlen, false); - if (GetPatch()->PushFrame(rtp)) - return SWITCH_STATUS_SUCCESS; - } else if (frame->flags == 0) { - RTP_DataFrame rtp; - rtp.SetPayloadType(mediaFormat.GetPayloadType()); - rtp.SetPayloadSize(frame->datalen); - rtp.SetTimestamp(frame->timestamp); - rtp.SetSyncSource(frame->ssrc); - rtp.SetMarker(frame->m); - memcpy(rtp.GetPayloadPtr(), frame->data, frame->datalen); - if (GetPatch()->PushFrame(rtp)) + if (GetPatch()->PushFrame(rtp)) { return SWITCH_STATUS_SUCCESS; + } + } + + /* If we reach this code it means a call to an ivr or something else that does not generate timestamps + Its possible that frame->timestamp is set but not guarenteed and is best ignored for the time being. + We are probably relying on the rtp stack to generate the timestamp and ssrc for us at this point. + As a quick hack I am going to keep a sample counter and increment it by frame->samples but it would be + better if we could engage whatever it is in opal that makes it generate the timestamp. + */ + + rtp.SetPayloadType(mediaFormat.GetPayloadType()); + rtp.SetPayloadSize(frame->datalen); + + m_timeStamp += frame->samples; + rtp.SetTimestamp(m_timeStamp); + + //rtp.SetTimestamp(frame->timestamp); + //rtp.SetSyncSource(frame->ssrc); + //rtp.SetMarker(frame->m); + + memcpy(rtp.GetPayloadPtr(), frame->data, frame->datalen); + + if (GetPatch()->PushFrame(rtp)) { + return SWITCH_STATUS_SUCCESS; } + return SWITCH_STATUS_FALSE; } Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Tue Jan 20 11:22:56 2009 @@ -216,6 +216,7 @@ switch_frame_t m_readFrame; RTP_DataFrame m_readRTP; bool m_callOnStart; + uint32_t m_timeStamp; };

1 0

[commit] r11311 - freeswitch/trunk/conf/dialplan
by FreeSWITCH SVN 20 Jan '09

20 Jan '09

Author: brian Date: Tue Jan 20 11:03:13 2009 New Revision: 11311 Log: tweak the mad boss a bit, no pun inteded Modified: freeswitch/trunk/conf/dialplan/default.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Jan 20 11:03:13 2009 @@ -336,7 +336,7 @@ <action application="set" data="conference_auto_outcall_caller_id_number=0911"/> <action application="set" data="conference_auto_outcall_timeout=60"/> <action application="set" data="conference_auto_outcall_flags=mute"/> - <action application="set" data="conference_auto_outcall_prefix={sip_auto_answer=true,execute_on_answer='bind_meta_app 2 a s1 intercept::${uuid}'}"/> + <action application="set" data="conference_auto_outcall_prefix={sip_auto_answer=true,execute_on_answer='bind_meta_app 2 a s1 transfer::intercept:${uuid} inline'}"/> <action application="set" data="sip_exclude_contact=${network_addr}"/> <action application="conference_set_auto_outcall" data="${group_call(sales)}"/> <action application="conference" data="madboss_intercom1@default+flags{endconf|deaf}"/> @@ -354,7 +354,7 @@ <action application="set" data="conference_auto_outcall_caller_id_number=0912"/> <action application="set" data="conference_auto_outcall_timeout=60"/> <action application="set" data="conference_auto_outcall_flags=mute"/> - <action application="set" data="conference_auto_outcall_prefix={sip_auto_answer=true,execute_on_answer='bind_meta_app 2 a s1 intercept::${uuid}'}"/> + <action application="set" data="conference_auto_outcall_prefix={sip_auto_answer=true,execute_on_answer='bind_meta_app 2 a s1 transfer::intercept:${uuid} inline'}"/> <action application="set" data="sip_exclude_contact=${network_addr}"/> <action application="conference_set_auto_outcall" data="loopback/9999"/> <action application="conference" data="madboss_intercom2@default+flags{endconf|deaf}"/>

1 0

[commit] r11310 - freeswitch/trunk
by FreeSWITCH SVN 20 Jan '09

20 Jan '09

Author: mikej Date: Tue Jan 20 10:29:32 2009 New Revision: 11310 Log: fix esl solaris build (FSBUILD-104) Modified: freeswitch/trunk/Makefile.am freeswitch/trunk/configure.in Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Tue Jan 20 10:29:32 2009 @@ -168,7 +168,7 @@ freeswitch_SOURCES = src/switch.c nodist_freeswitch_SOURCES = src/include/switch_version.h fs_cli_CFLAGS = $(AM_CFLAGS) -Ilibs/esl/src/include -fs_cli_LDFLAGS = $(AM_LDFLAGS) -lpthread +fs_cli_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS) freeswitch_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS) freeswitch_LDFLAGS = $(AM_LDFLAGS) -rpath $(libdir) freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Tue Jan 20 10:29:32 2009 @@ -174,7 +174,7 @@ AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"]) - +ESL_LDFLAGS= # tweak platform specific flags case "$host" in *darwin*) @@ -183,6 +183,7 @@ ;; *-solaris2*) APR_ADDTO(SWITCH_AM_CFLAGS, -DPATH_MAX=2048) + APR_ADDTO(ESL_LDFLAGS, -lnsl) ;; *bsd*) APR_ADDTO(SWITCH_AM_CFLAGS, -I/usr/local/include) @@ -194,6 +195,7 @@ AC_SUBST(SWITCH_AM_CFLAGS) AC_SUBST(SWITCH_AM_CXXFLAGS) AC_SUBST(SWITCH_AM_LDFLAGS) +AC_SUBST(ESL_LDFLAGS) AC_SUBST(SOLINK) AC_SUBST(DYNAMIC_LIB_EXTEN)

1 0

[commit] r11309 - freeswitch/trunk/src
by FreeSWITCH SVN 20 Jan '09

20 Jan '09

Author: anthm Date: Tue Jan 20 09:39:32 2009 New Revision: 11309 Log: add ignore_ring_ready tone_detect_sleep and tone_detect_expires Modified: freeswitch/trunk/src/switch_ivr_async.c freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Jan 20 09:39:32 2009 @@ -1197,6 +1197,8 @@ int hits; int sleep; int expires; + int default_sleep; + int default_expires; int once; switch_tone_detect_callback_t callback; } switch_tone_detect_t; @@ -1261,8 +1263,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TONE %s HIT %d/%d\n", cont->list[i].key, cont->list[i].hits, cont->list[i].total_hits); - cont->list[i].sleep = 50; - cont->list[i].expires = 250; + cont->list[i].sleep = cont->list[i].default_sleep; + cont->list[i].expires = cont->list[i].default_expires; if (cont->list[i].hits >= cont->list[i].total_hits) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TONE %s DETECTED\n", cont->list[i].key); @@ -1335,6 +1337,7 @@ char *p, *next; int i = 0, ok = 0; switch_media_bug_flag_t bflags = 0; + const char *var; switch_assert(read_codec != NULL); @@ -1419,6 +1422,24 @@ switch_channel_pre_answer(channel); + cont->list[cont->index].default_sleep = 25; + cont->list[cont->index].default_expires = 250; + + if ((var = switch_channel_get_variable(channel, "tone_detect_sleep"))) { + int tmp = atoi(var); + if (tmp > 0) { + cont->list[cont->index].default_sleep = tmp; + } + } + + if ((var = switch_channel_get_variable(channel, "tone_detect_expires"))) { + int tmp = atoi(var); + if (tmp > 0) { + cont->list[cont->index].default_expires = tmp; + } + } + + if (switch_strlen_zero(flags)) { bflags = SMBF_READ_REPLACE; } else { Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Jan 20 09:39:32 2009 @@ -82,7 +82,6 @@ uint8_t ring_ready; uint8_t early_media; uint8_t answered; - uint8_t dead; uint32_t per_channel_timelimit_sec; uint32_t per_channel_progress_timelimit_sec; } originate_status_t; @@ -101,6 +100,9 @@ uint8_t return_ring_ready; uint8_t monitor_early_media_ring; uint8_t monitor_early_media_fail; + uint8_t gen_ringback; + uint8_t ignore_early_media; + uint8_t ignore_ring_ready; } originate_global_t; @@ -257,11 +259,13 @@ oglobals->progress = 1; } - if (!oglobals->ring_ready) { + if (!oglobals->ring_ready && !oglobals->ignore_ring_ready) { oglobals->ring_ready = 1; } - - oglobals->early_ok = 1; + + if (!oglobals->ignore_early_media && !oglobals->early_ok) { + oglobals->early_ok = 1; + } } } } @@ -417,14 +421,14 @@ } } } - + if (!oglobals->monitor_early_media_ring) { if (!oglobals->progress) { oglobals->progress = 1; } - if (!oglobals->ring_ready) { + if (!oglobals->ring_ready && !oglobals->ignore_ring_ready) { oglobals->ring_ready = 1; } } @@ -965,6 +969,8 @@ ok = 1; } else if (!strcasecmp((char *) hi->name, "ignore_early_media")) { ok = 1; + } else if (!strcasecmp((char *) hi->name, "ignore_ring_ready")) { + ok = 1; } else if (!strcasecmp((char *) hi->name, "monitor_early_media_ring")) { ok = 1; } else if (!strcasecmp((char *) hi->name, "monitor_early_media_fail")) { @@ -1079,6 +1085,11 @@ if ((var_val = switch_event_get_header(var_event, "ignore_early_media")) && switch_true(var_val)) { oglobals.early_ok = 0; + oglobals.ignore_early_media = 1; + } + + if ((var_val = switch_event_get_header(var_event, "ignore_ring_ready")) && switch_true(var_val)) { + oglobals.ignore_ring_ready = 1; } if ((var_val = switch_event_get_header(var_event, "monitor_early_media_ring"))) { @@ -1553,7 +1564,8 @@ if (ringback_data) { char *tmp_data = NULL; - + oglobals.gen_ringback = 1; + if (switch_is_file_path(ringback_data)) { char *ext;

1 0

[commit] r11308 - freeswitch/trunk/conf/sip_profiles
by FreeSWITCH SVN 20 Jan '09

20 Jan '09

Author: brian Date: Tue Jan 20 09:17:53 2009 New Revision: 11308 Log: cleanup the comment Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Tue Jan 20 09:17:53 2009 @@ -158,7 +158,10 @@   -  +

1 0

[commit] r11307 - freeswitch/trunk/src
by FreeSWITCH SVN 20 Jan '09

20 Jan '09

Author: anthm Date: Tue Jan 20 07:55:00 2009 New Revision: 11307 Log: MODAPP-201 Modified: freeswitch/trunk/src/switch_core_media_bug.c Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Tue Jan 20 07:55:00 2009 @@ -235,7 +235,6 @@ bug->flags = flags; bug->stop_time = stop_time; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Attaching BUG to %s\n", switch_channel_get_name(session->channel)); bytes = session->read_codec->implementation->decoded_bytes_per_packet; if (!bug->flags) { @@ -258,6 +257,16 @@ bug->thread_id = switch_thread_self(); } + if (bug->callback) { + switch_bool_t result = bug->callback(bug, bug->user_data, SWITCH_ABC_TYPE_INIT); + if (result == SWITCH_FALSE) { + switch_core_media_bug_remove(session, new_bug); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error attaching BUG to %s\n", switch_channel_get_name(session->channel)); + return SWITCH_STATUS_GENERR; + } + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Attaching BUG to %s\n", switch_channel_get_name(session->channel)); bug->ready = 1; switch_thread_rwlock_wrlock(session->bug_rwlock); bug->next = session->bugs; @@ -265,13 +274,6 @@ switch_thread_rwlock_unlock(session->bug_rwlock); *new_bug = bug; - if (bug->callback) { - switch_bool_t result = bug->callback(bug, bug->user_data, SWITCH_ABC_TYPE_INIT); - if (result == SWITCH_FALSE) { - return switch_core_media_bug_remove(session, new_bug); - } - } - return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r11306 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by FreeSWITCH SVN 20 Jan '09

20 Jan '09

Author: andrew Date: Tue Jan 20 00:25:06 2009 New Revision: 11306 Log: defaultLowOutputLatency -> defaultLowInputLatency (not that it matters, hopefully) Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Tue Jan 20 00:25:06 2009 @@ -1170,7 +1170,7 @@ inputParameters.device = i; inputParameters.channelCount = deviceInfo->maxInputChannels; inputParameters.sampleFormat = paInt16; - inputParameters.suggestedLatency = deviceInfo->defaultLowOutputLatency; /* ignored by Pa_IsFormatSupported() */ + inputParameters.suggestedLatency = deviceInfo->defaultLowInputLatency; /* ignored by Pa_IsFormatSupported() */ inputParameters.hostApiSpecificStreamInfo = NULL; outputParameters.device = i;

1 0

[commit] r11305 - freeswitch/trunk/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 20 Jan '09

20 Jan '09

Author: silik0n Date: Tue Jan 20 00:18:19 2009 New Revision: 11305 Log: better error handling when people dont use --enable-core-odbc-support Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Tue Jan 20 00:18:19 2009 @@ -87,6 +87,7 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_default_gateway, globals.default_gateway); SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_custom_query, globals.custom_query); +#ifdef SWITCH_HAVE_ODBC static int route_callback(void *pArg, int argc, char **argv, char **columnNames) { route_callback_t *cbt = (route_callback_t *) pArg; @@ -100,8 +101,7 @@ return 0; } - - +#endif static switch_status_t load_config(void) { @@ -175,10 +175,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Connection (did you enable it?!)\n"); #ifdef SWITCH_HAVE_ODBC } -#endif reallydone: +#endif if (xml) { switch_xml_free(xml); } @@ -193,7 +193,7 @@ static char SQL_LOOKUP[] = "SELECT gateways.gateway_ip, gateways.group, gateways.limit, gateways.techprofile, numbers.acctcode, numbers.translated from gateways, numbers where numbers.number = '%s' and numbers.gateway_id = gateways.gateway_id limit 1;"; -static switch_status_t route_lookup(char *dn, easyroute_results_t *results) +static switch_status_t route_lookup(char *dn, easyroute_results_t *results, int noat, char *seperator) { switch_status_t sstatus = SWITCH_STATUS_SUCCESS; char sql[1024] = ""; @@ -241,8 +241,13 @@ } else { switch_set_string(results->translated, pdata.translated); } - - switch_snprintf(results->dialstring, 256, "%s/%s@%s", tmp_profile , results->translated, tmp_gateway); + if (noat) { + switch_snprintf(results->dialstring, 256, "%s/%s%s", tmp_profile , results->translated, tmp_gateway); + } else if (seperator) { + switch_snprintf(results->dialstring, 256, "%s/%s%s%s", tmp_profile , results->translated, seperator, tmp_gateway); + } else { + switch_snprintf(results->dialstring, 256, "%s/%s@%s", tmp_profile , results->translated, tmp_gateway); + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "THE ROUTE [%s]\n", results->dialstring); if (switch_strlen_zero(pdata.group)){ @@ -259,10 +264,19 @@ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "DB Error Setting Default Route!\n"); switch_set_string(results->limit, "9999"); - switch_snprintf(results->dialstring, 256, "%s/%s@%s", globals.default_techprofile, dn, globals.default_gateway); + if (noat){ + switch_snprintf(results->dialstring, 256, "%s/%s%s", globals.default_techprofile, dn, globals.default_gateway); + } else if (seperator){ + switch_snprintf(results->dialstring, 256, "%s/%s%s%s", globals.default_techprofile, dn, seperator, globals.default_gateway); + } else { + switch_snprintf(results->dialstring, 256, "%s/%s@%s", globals.default_techprofile, dn, globals.default_gateway); + } switch_set_string(results->group, ""); switch_set_string(results->acctcode, ""); } + +#else + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "mod_easyroute requires core ODBC support. Please refer to the documentation on how to enable this\n"); #endif if (globals.mutex){ switch_mutex_unlock(globals.mutex); @@ -276,6 +290,10 @@ char *argv[4] = { 0 }; char *mydata = NULL; char *destnum = NULL; + + int noat = 0; + char *seperator = NULL; + easyroute_results_t results; switch_channel_t *channel = switch_core_session_get_channel(session); @@ -289,7 +307,16 @@ if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { destnum = argv[0]; - route_lookup(destnum, &results); + if (argc == 2) { + if (!strcasecmp(argv[1], "noat")) { + noat = 1; + } else if (!strcasecmp(argv[1], "seperator")) { + if (argc == 3){ + switch_set_string(seperator, argv[2]); + } + } + } + route_lookup(destnum, &results, noat, seperator); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "EASY ROUTE DEST: [%s]\n", results.dialstring); switch_channel_set_variable(channel, "easy_destnum", results.destnum); switch_channel_set_variable(channel, "easy_dialstring", results.dialstring); @@ -305,12 +332,19 @@ char *argv[4] = { 0 }; char *mydata = NULL; char *destnum = NULL; + char *seperator = NULL; + int noat = 0; easyroute_results_t results; if (session) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "This function cannot be called from the dialplan.\n"); return SWITCH_STATUS_FALSE; } + +#ifdef SWITCH_HAVE_ODBC + stream->write_function(stream, "mod_easyroute requires you enable core odbc support\n"); + return SWITCH_STATUS_SUCCESS; +#endif if (!cmd || !(mydata = strdup(cmd))) { stream->write_function(stream, "Usage: easyroute <number>\n"); @@ -319,12 +353,21 @@ if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { destnum = argv[0]; - if (argc < 1 || argc > 2){ + if (argc < 1 || argc > 3){ stream->write_function(stream, "Invalid Input!\n"); return SWITCH_STATUS_SUCCESS; } + if (argc == 2) { + if (!strcasecmp(argv[1], "noat")) { + noat = 1; + } else if (!strcasecmp(argv[1], "seperator")) { + if (argc == 3){ + switch_set_string(seperator, argv[2]); + } + } + } - if (!route_lookup(destnum, &results) == SWITCH_STATUS_SUCCESS) { + if (!route_lookup(destnum, &results, noat, seperator) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "No Match!\n"); return SWITCH_STATUS_SUCCESS; } @@ -374,7 +417,9 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_easyroute_shutdown) { +#ifdef SWITCH_HAVE_ODBC switch_odbc_handle_disconnect(globals.master_odbc); +#endif return SWITCH_STATUS_UNLOAD; }

1 0