- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9123 - freeswitch/trunk/src
by Freeswitch SVN 21 Jul '08

21 Jul '08

Author: anthm Date: Mon Jul 21 12:48:05 2008 New Revision: 9123 Modified: freeswitch/trunk/src/switch_stun.c Log: update Modified: freeswitch/trunk/src/switch_stun.c ============================================================================== --- freeswitch/trunk/src/switch_stun.c (original) +++ freeswitch/trunk/src/switch_stun.c Mon Jul 21 12:48:05 2008 @@ -493,6 +493,10 @@ if (funny) { packet = (switch_stun_packet_t *) buf; bytes += 4; + buf[bytes++] = 0; + buf[bytes++] = 0; + buf[bytes++] = 0; + buf[bytes++] = 0; } switch_socket_sendto(sock, remote_addr, 0, (void *) packet, &bytes); @@ -534,6 +538,10 @@ switch (attr->type) { case SWITCH_STUN_ATTR_MAPPED_ADDRESS: if (attr->type) { + if(funny) + { + ((switch_stun_ip_t *) attr->value)->address ^= ntohl(0xabcdabcd); + } switch_stun_packet_attribute_get_mapped_address(attr, rip, &rport); } break;

1 0

[commit] r9122 - in freeswitch/trunk: conf/sip_profiles src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Jul '08

21 Jul '08

Author: anthm Date: Mon Jul 21 12:40:28 2008 New Revision: 9122 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 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_glue.c Log: update Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Mon Jul 21 12:40:28 2008 @@ -122,7 +122,11 @@    - +  +  +  +  +  </settings> </profile> 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 Mon Jul 21 12:40:28 2008 @@ -1201,22 +1201,22 @@ switch_assert(gp->state < REG_STATE_LAST); stream->write_function(stream, "%s\n", line); - stream->write_function(stream, "Name \t%s\n", switch_str_nil(gp->name)); - stream->write_function(stream, "Scheme \t%s\n", switch_str_nil(gp->register_scheme)); - stream->write_function(stream, "Realm \t%s\n", switch_str_nil(gp->register_realm)); - stream->write_function(stream, "Username\t%s\n", switch_str_nil(gp->register_username)); - stream->write_function(stream, "Password\t%s\n", switch_strlen_zero(gp->register_password) ? "no" : "yes"); - stream->write_function(stream, "From \t%s\n", switch_str_nil(gp->register_from)); - stream->write_function(stream, "Contact \t%s\n", switch_str_nil(gp->register_contact)); - stream->write_function(stream, "To \t%s\n", switch_str_nil(gp->register_to)); - stream->write_function(stream, "Proxy \t%s\n", switch_str_nil(gp->register_proxy)); - stream->write_function(stream, "Context \t%s\n", switch_str_nil(gp->register_context)); - stream->write_function(stream, "Expires \t%s\n", switch_str_nil(gp->expires_str)); - stream->write_function(stream, "Freq \t%d\n", gp->freq); - stream->write_function(stream, "Ping \t%d\n", gp->ping); - stream->write_function(stream, "PingFreq\t%d\n", gp->ping_freq); - stream->write_function(stream, "State \t%s\n", sofia_state_names[gp->state]); - stream->write_function(stream, "Status \t%s%s\n", status_names[gp->status], gp->pinging ? " (ping)" : ""); + stream->write_function(stream, "Name \t\t%s\n", switch_str_nil(gp->name)); + stream->write_function(stream, "Scheme \t\t%s\n", switch_str_nil(gp->register_scheme)); + stream->write_function(stream, "Realm \t\t%s\n", switch_str_nil(gp->register_realm)); + stream->write_function(stream, "Username\t\t%s\n", switch_str_nil(gp->register_username)); + stream->write_function(stream, "Password\t\t%s\n", switch_strlen_zero(gp->register_password) ? "no" : "yes"); + stream->write_function(stream, "From \t\t%s\n", switch_str_nil(gp->register_from)); + stream->write_function(stream, "Contact \t\t%s\n", switch_str_nil(gp->register_contact)); + stream->write_function(stream, "To \t\t%s\n", switch_str_nil(gp->register_to)); + stream->write_function(stream, "Proxy \t\t%s\n", switch_str_nil(gp->register_proxy)); + stream->write_function(stream, "Context \t\t%s\n", switch_str_nil(gp->register_context)); + stream->write_function(stream, "Expires \t\t%s\n", switch_str_nil(gp->expires_str)); + stream->write_function(stream, "Freq \t\t%d\n", gp->freq); + stream->write_function(stream, "Ping \t\t%d\n", gp->ping); + stream->write_function(stream, "PingFreq\t\t%d\n", gp->ping_freq); + stream->write_function(stream, "State \t\t%s\n", sofia_state_names[gp->state]); + stream->write_function(stream, "Status \t\t%s%s\n", status_names[gp->status], gp->pinging ? " (ping)" : ""); stream->write_function(stream, "%s\n", line); sofia_reg_release_gateway(gp); } else { @@ -1227,46 +1227,48 @@ if ((profile = sofia_glue_find_profile(argv[1]))) { stream->write_function(stream, "%s\n", line); - stream->write_function(stream, "Name \t%s\n", switch_str_nil(argv[1])); - stream->write_function(stream, "Domain Name \t%s\n", switch_str_nil(profile->domain_name)); + stream->write_function(stream, "Name \t\t%s\n", switch_str_nil(argv[1])); + stream->write_function(stream, "Domain Name \t\t%s\n", switch_str_nil(profile->domain_name)); if (strcasecmp(argv[1], profile->name)) { - stream->write_function(stream, "Alias Of \t%s\n", switch_str_nil(profile->name)); + stream->write_function(stream, "Alias Of \t\t%s\n", switch_str_nil(profile->name)); } - stream->write_function(stream, "DBName \t%s\n", switch_str_nil(profile->dbname)); - stream->write_function(stream, "Dialplan \t%s\n", switch_str_nil(profile->dialplan)); - stream->write_function(stream, "Context \t%s\n", switch_str_nil(profile->context)); - stream->write_function(stream, "RTP-IP \t%s\n", switch_str_nil(profile->rtpip)); + stream->write_function(stream, "DBName \t\t%s\n", switch_str_nil(profile->dbname)); + stream->write_function(stream, "Dialplan \t\t%s\n", switch_str_nil(profile->dialplan)); + stream->write_function(stream, "Context \t\t%s\n", switch_str_nil(profile->context)); + stream->write_function(stream, "RTP-IP \t\t%s\n", switch_str_nil(profile->rtpip)); if (profile->extrtpip) { - stream->write_function(stream, "Ext-RTP-IP \t%s\n", profile->extrtpip); + stream->write_function(stream, "Ext-RTP-IP \t\t%s\n", profile->extrtpip); } - stream->write_function(stream, "SIP-IP \t%s\n", switch_str_nil(profile->sipip)); + stream->write_function(stream, "SIP-IP \t\t%s\n", switch_str_nil(profile->sipip)); if (profile->extsipip) { - stream->write_function(stream, "Ext-SIP-IP \t%s\n", profile->extsipip); + stream->write_function(stream, "Ext-SIP-IP \t\t%s\n", profile->extsipip); } - stream->write_function(stream, "URL \t%s\n", switch_str_nil(profile->url)); - stream->write_function(stream, "BIND-URL \t%s\n", switch_str_nil(profile->bindurl)); + stream->write_function(stream, "URL \t\t%s\n", switch_str_nil(profile->url)); + stream->write_function(stream, "BIND-URL \t\t%s\n", switch_str_nil(profile->bindurl)); if (sofia_test_pflag(profile, PFLAG_TLS)) { - stream->write_function(stream, "TLS-URL \t%s\n", switch_str_nil(profile->tls_url)); - stream->write_function(stream, "TLS-BIND-URL %s\n", switch_str_nil(profile->tls_bindurl)); + stream->write_function(stream, "TLS-URL \t\t%s\n", switch_str_nil(profile->tls_url)); + stream->write_function(stream, "TLS-BIND-URL \t%s\n", switch_str_nil(profile->tls_bindurl)); } - stream->write_function(stream, "HOLD-MUSIC \t%s\n", switch_str_nil(profile->hold_music)); - stream->write_function(stream, "CODECS \t%s\n", switch_str_nil(profile->codec_string)); - stream->write_function(stream, "TEL-EVENT \t%d\n", profile->te); + stream->write_function(stream, "HOLD-MUSIC \t\t%s\n", switch_strlen_zero(profile->hold_music) ? "NONE" : profile->hold_music); + stream->write_function(stream, "CODECS \t\t%s\n", switch_str_nil(profile->codec_string)); + stream->write_function(stream, "TEL-EVENT \t\t%d\n", profile->te); if (profile->dtmf_type == DTMF_2833) { - stream->write_function(stream, "DTMF-MODE \trfc2833\n"); + stream->write_function(stream, "DTMF-MODE \t\trfc2833\n"); } else if (profile->dtmf_type == DTMF_INFO) { - stream->write_function(stream, "DTMF-MODE \tinfo\n"); + stream->write_function(stream, "DTMF-MODE \t\tinfo\n"); } else { - stream->write_function(stream, "DTMF-MODE \tnone\n"); + stream->write_function(stream, "DTMF-MODE \t\tnone\n"); } - stream->write_function(stream, "CNG \t%d\n", profile->cng_pt); - stream->write_function(stream, "SESSION-TO \t%d\n", profile->session_timeout); - stream->write_function(stream, "MAX-DIALOG \t%d\n", profile->max_proceeding); - stream->write_function(stream, "NOMEDIA \t%s\n", switch_test_flag(profile, TFLAG_INB_NOMEDIA) ? "true" : "false"); - stream->write_function(stream, "LATE-NEG \t%s\n", switch_test_flag(profile, TFLAG_LATE_NEGOTIATION) ? "true" : "false"); - stream->write_function(stream, "PROXY-MEDIA \t%s\n", switch_test_flag(profile, TFLAG_PROXY_MEDIA) ? "true" : "false"); - stream->write_function(stream, "AGGRESSIVENAT \t%s\n", sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "true" : "false"); + stream->write_function(stream, "CNG \t\t%d\n", profile->cng_pt); + stream->write_function(stream, "SESSION-TO \t\t%d\n", profile->session_timeout); + stream->write_function(stream, "MAX-DIALOG \t\t%d\n", profile->max_proceeding); + stream->write_function(stream, "NOMEDIA \t\t%s\n", switch_test_flag(profile, TFLAG_INB_NOMEDIA) ? "true" : "false"); + stream->write_function(stream, "LATE-NEG \t\t%s\n", switch_test_flag(profile, TFLAG_LATE_NEGOTIATION) ? "true" : "false"); + stream->write_function(stream, "PROXY-MEDIA \t\t%s\n", switch_test_flag(profile, TFLAG_PROXY_MEDIA) ? "true" : "false"); + stream->write_function(stream, "AGGRESSIVENAT \t\t%s\n", sofia_test_pflag(profile, PFLAG_AGGRESSIVE_NAT_DETECTION) ? "true" : "false"); + stream->write_function(stream, "STUN_ENABLED \t\t%s\n", sofia_test_pflag(profile, PFLAG_STUN_ENABLED) ? "true" : "false"); + stream->write_function(stream, "STUN_AUTO_DISABLE \t%s\n", sofia_test_pflag(profile, PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); stream->write_function(stream, "\nRegistrations:\n%s\n", line); cb.profile = profile; @@ -1376,6 +1378,37 @@ goto done; } + if (!strcasecmp(argv[1], "stun-auto-disable")) { + if (argv[2]) { + int is_true = switch_true(argv[2]); + if (is_true) { + profile->pflags |= PFLAG_STUN_AUTO_DISABLE; + } else { + profile->pflags &= ~PFLAG_STUN_AUTO_DISABLE; + } + } + + stream->write_function(stream, "+OK stun-auto-disable=%s", (profile->pflags & PFLAG_STUN_AUTO_DISABLE) ? "true" : "false"); + + goto done; + } + + if (!strcasecmp(argv[1], "stun-enabled")) { + if (argv[2]) { + int is_true = switch_true(argv[2]); + if (is_true) { + profile->pflags |= PFLAG_STUN_ENABLED; + } else { + profile->pflags &= ~PFLAG_STUN_ENABLED; + } + } + + stream->write_function(stream, "+OK stun-enabled=%s", (profile->pflags & PFLAG_STUN_ENABLED) ? "true" : "false"); + + goto done; + } + + if (!strcasecmp(argv[1], "rescan")) { if (argc > 2 && !strcasecmp(argv[2], "reloadxml")) { 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 Mon Jul 21 12:40:28 2008 @@ -157,7 +157,9 @@ PFLAG_3PCC = (1 << 23), PFLAG_DISABLE_RTP_AUTOADJ = (1 << 24), PFLAG_DISABLE_SRTP_AUTH = (1 << 25), - PFLAG_FUNNY_STUN = (1 << 26) + PFLAG_FUNNY_STUN = (1 << 26), + PFLAG_STUN_ENABLED = (1 << 27), + PFLAG_STUN_AUTO_DISABLE = (1 << 28) } PFLAGS; typedef enum { 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 Mon Jul 21 12:40:28 2008 @@ -982,6 +982,8 @@ /* you could change profile->foo here if it was a minor change like context or dialplan ... */ profile->rport_level = 1; /* default setting */ + profile->acl_count = 0; + profile->pflags |= PFLAG_STUN_ENABLED; if ((settings = switch_xml_child(xprofile, "settings"))) { for (param = switch_xml_child(settings, "param"); param; param = param->next) { @@ -1053,6 +1055,36 @@ } else { profile->pflags &= ~PFLAG_FUNNY_STUN; } + } else if (!strcasecmp(var, "stun-enabled")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_STUN_ENABLED; + } else { + profile->pflags &= ~PFLAG_STUN_ENABLED; + } + } else if (!strcasecmp(var, "stun-auto-disable")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_STUN_AUTO_DISABLE; + } else { + profile->pflags &= ~PFLAG_STUN_AUTO_DISABLE; + } + } else if (!strcasecmp(var, "apply-nat-acl")) { + if (profile->acl_count < SOFIA_MAX_ACL) { + profile->nat_acl[profile->nat_acl_count++] = switch_core_strdup(profile->pool, val); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Max acl records of %d reached\n", SOFIA_MAX_ACL); + } + } else if (!strcasecmp(var, "apply-inbound-acl")) { + if (profile->acl_count < SOFIA_MAX_ACL) { + profile->acl[profile->acl_count++] = switch_core_strdup(profile->pool, val); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Max acl records of %d reached\n", SOFIA_MAX_ACL); + } + } else if (!strcasecmp(var, "apply-register-acl")) { + if (profile->reg_acl_count < SOFIA_MAX_ACL) { + profile->reg_acl[profile->reg_acl_count++] = switch_core_strdup(profile->pool, val); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Max acl records of %d reached\n", SOFIA_MAX_ACL); + } } else if (!strcasecmp(var, "rfc2833-pt")) { profile->te = (switch_payload_t) atoi(val); } else if (!strcasecmp(var, "cng-pt")) { @@ -1173,6 +1205,7 @@ } } + if ((gateways_tag = switch_xml_child(xprofile, "gateways"))) { parse_gateways(profile, gateways_tag); } @@ -1333,6 +1366,7 @@ profile->tls_version = 0; profile->mflags = MFLAG_REFER | MFLAG_REGISTER; profile->rport_level = 1; + profile->pflags |= PFLAG_STUN_ENABLED; for (param = switch_xml_child(settings, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); @@ -1392,6 +1426,18 @@ } else { profile->pflags &= ~PFLAG_FUNNY_STUN; } + } else if (!strcasecmp(var, "stun-enabled")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_STUN_ENABLED; + } else { + profile->pflags &= ~PFLAG_STUN_ENABLED; + } + } else if (!strcasecmp(var, "stun-auto-disable")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_STUN_AUTO_DISABLE; + } else { + profile->pflags &= ~PFLAG_STUN_AUTO_DISABLE; + } } else if (!strcasecmp(var, "rfc2833-pt")) { profile->te = (switch_payload_t) atoi(val); } else if (!strcasecmp(var, "cng-pt")) { @@ -1680,6 +1726,10 @@ profile->dialplan = switch_core_strdup(profile->pool, "XML"); } + if (!profile->context) { + profile->context = switch_core_strdup(profile->pool, "default"); + } + if (!profile->sipdomain) { profile->sipdomain = switch_core_strdup(profile->pool, profile->sipip); } 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 Mon Jul 21 12:40:28 2008 @@ -442,6 +442,12 @@ if (!strncasecmp(sourceip, "stun:", 5)) { char *p; + + if (!(profile->pflags & PFLAG_STUN_ENABLED)) { + *ip = switch_core_strdup(pool, tech_pvt->profile->rtpip); + return SWITCH_STATUS_SUCCESS; + } + stun_ip = strdup(sourceip + 5); if ((p = strchr(stun_ip, ':'))) { @@ -483,6 +489,10 @@ if (tech_pvt) { if (myport == *port && !strcmp(*ip, tech_pvt->profile->rtpip)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stun Not Required ip and port match. [%s]:[%d]\n", *ip, *port); + if (profile->pflags & PFLAG_STUN_AUTO_DISABLE) { + profile->pflags &= ~PFLAG_STUN_ENABLED; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stun completely disabled.\n"); + } } else { tech_pvt->stun_ip = switch_core_session_strdup(tech_pvt->session, stun_ip); tech_pvt->stun_port = stun_port;

1 0

[commit] r9121 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Jul '08

21 Jul '08

Author: brian Date: Mon Jul 21 12:09:23 2008 New Revision: 9121 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: formating tweak 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 Mon Jul 21 12:09:23 2008 @@ -1248,7 +1248,7 @@ stream->write_function(stream, "BIND-URL \t%s\n", switch_str_nil(profile->bindurl)); if (sofia_test_pflag(profile, PFLAG_TLS)) { stream->write_function(stream, "TLS-URL \t%s\n", switch_str_nil(profile->tls_url)); - stream->write_function(stream, "TLS-BIND-URL \t%s\n", switch_str_nil(profile->tls_bindurl)); + stream->write_function(stream, "TLS-BIND-URL %s\n", switch_str_nil(profile->tls_bindurl)); } stream->write_function(stream, "HOLD-MUSIC \t%s\n", switch_str_nil(profile->hold_music)); stream->write_function(stream, "CODECS \t%s\n", switch_str_nil(profile->codec_string));

1 0

[commit] r9120 - freeswitch/trunk/src
by Freeswitch SVN 21 Jul '08

21 Jul '08

Author: anthm Date: Mon Jul 21 10:55:49 2008 New Revision: 9120 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: fix refactor typo Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Jul 21 10:55:49 2008 @@ -268,9 +268,11 @@ switch_frame_t *read_frame = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; int timelimit = 60; - const char *var = switch_channel_get_variable(caller_channel, "call_timeout"); + const char *var; switch_time_t start = 0; + switch_assert(peer_channel); + if (session) { caller_channel = switch_core_session_get_channel(session); } @@ -282,7 +284,7 @@ switch_zmalloc(write_frame.data, SWITCH_RECOMMENDED_BUFFER_SIZE); write_frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE; - if (var) { + if (caller_channel && (var = switch_channel_get_variable(caller_channel, "call_timeout"))) { timelimit = atoi(var); if (timelimit < 0) { timelimit = 60;

1 0

[commit] r9119 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 21 Jul '08

21 Jul '08

Author: anthm Date: Mon Jul 21 09:39:27 2008 New Revision: 9119 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: fix syntax 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 Jul 21 09:39:27 2008 @@ -2129,7 +2129,7 @@ "<ip> <acl | cidr> [<hangup_cause>]", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "sleep", "Pause a channel", SLEEP_LONG_DESC, sleep_function, "<pausemilliseconds>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "delay_echo", "echo audio at a specified delay", "Delay n ms", delay_function, "<delay ms>", SAF_NONE); - SWITCH_ADD_APP(app_interface, "strftime", NULL, NULL, strftime_function, NULL, SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "strftime", "strftime", "strftime", strftime_function, "[<epoch>|]<format string>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "phrase", "Say a Phrase", "Say a Phrase", phrase_function, "<macro_name>,<data>", SAF_NONE); SWITCH_ADD_APP(app_interface, "eval", "Do Nothing", "Do Nothing", eval_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "pre_answer", "Pre-Answer the call", "Pre-Answer the call for a channel.", pre_answer_function, "", SAF_SUPPORT_NOMEDIA);

1 0

[commit] r9118 - in freeswitch/trunk/src: . include
by Freeswitch SVN 21 Jul '08

21 Jul '08

Author: anthm Date: Mon Jul 21 09:12:22 2008 New Revision: 9118 Modified: freeswitch/trunk/src/include/switch_apr.h freeswitch/trunk/src/switch_apr.c Log: add patch from FSCORE-160 Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Mon Jul 21 09:12:22 2008 @@ -303,6 +303,13 @@ SWITCH_DECLARE(switch_status_t) switch_time_exp_lt(switch_time_exp_t *result, switch_time_t input); /** + * convert a time to its human readable components in a specific timezone with offset + * @param result the exploded time + * @param input the time to explode + */ +SWITCH_DECLARE(switch_status_t) switch_time_exp_tz(switch_time_exp_t *result, switch_time_t input, switch_int32_t offs); + +/** * Sleep for the specified number of micro-seconds. * @param t desired amount of time to sleep. * @warning May sleep for longer than the specified time. Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Mon Jul 21 09:12:22 2008 @@ -230,6 +230,11 @@ return apr_time_exp_lt((apr_time_exp_t *) result, input); } +SWITCH_DECLARE(switch_status_t) switch_time_exp_tz(switch_time_exp_t *result, switch_time_t input, switch_int32_t offs) +{ + return apr_time_exp_tz((apr_time_exp_t *) result, input, (apr_int32_t )offs); +} + SWITCH_DECLARE(switch_status_t) switch_time_exp_gmt(switch_time_exp_t *result, switch_time_t input) { return apr_time_exp_gmt((apr_time_exp_t *) result, input);

1 0

[commit] r9115 - freeswitch/trunk/src
by Freeswitch SVN 21 Jul '08

21 Jul '08

Author: mikej Date: Mon Jul 21 01:05:36 2008 New Revision: 9115 Modified: freeswitch/trunk/src/switch.c Log: fix windows running as a service (FSCORE-159) Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Mon Jul 21 01:05:36 2008 @@ -179,6 +179,8 @@ /* update the service status */ SetServiceStatus(hStatus, &status); + switch_core_set_globals(); + /* attempt to initialize freeswitch and load modules */ if (switch_core_init_and_modload(flags, SWITCH_FALSE, &err) != SWITCH_STATUS_SUCCESS) { /* freeswitch did not start sucessfully */

1 0

[commit] r9114 - freeswitch/trunk/docs/phrase
by Freeswitch SVN 20 Jul '08

20 Jul '08

Author: coppice Date: Sun Jul 20 11:52:07 2008 New Revision: 9114 Added: freeswitch/trunk/docs/phrase/phrase_zh_HK.xml Log: A partial translation of the English phrases, but importantly, all the digit and date time stuff is now in Chinese. Added: freeswitch/trunk/docs/phrase/phrase_zh_HK.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/docs/phrase/phrase_zh_HK.xml Sun Jul 20 11:52:07 2008 @@ -0,0 +1,185 @@ +<language> + <en> + <ascii> + <prompt phrase="空" filename="32.wav"/> + <prompt phrase="Pound" filename="35.wav"/> + <prompt phrase="星" filename="42.wav"/> + <prompt phrase="點" filename="46.wav"/> + <prompt phrase="A" filename="97.wav"/> + <prompt phrase="B" filename="98.wav"/> + <prompt phrase="C" filename="99.wav"/> + <prompt phrase="D" filename="100.wav"/> + <prompt phrase="E" filename="101.wav"/> + <prompt phrase="F" filename="102.wav"/> + <prompt phrase="G" filename="103.wav"/> + <prompt phrase="H" filename="104.wav"/> + <prompt phrase="I" filename="105.wav"/> + <prompt phrase="J" filename="106.wav"/> + <prompt phrase="K" filename="107.wav"/> + <prompt phrase="L" filename="108.wav"/> + <prompt phrase="M" filename="109.wav"/> + <prompt phrase="N" filename="110.wav"/> + <prompt phrase="O" filename="111.wav"/> + <prompt phrase="P" filename="112.wav"/> + <prompt phrase="Q" filename="113.wav"/> + <prompt phrase="R" filename="114.wav"/> + <prompt phrase="S" filename="115.wav"/> + <prompt phrase="T" filename="116.wav"/> + <prompt phrase="U" filename="117.wav"/> + <prompt phrase="V" filename="118.wav"/> + <prompt phrase="W" filename="119.wav"/> + <prompt phrase="X" filename="120.wav"/> + <prompt phrase="Y" filename="121.wav"/> + <prompt phrase="Z" filename="122.wav"/> + </ascii> + <phonetic-ascii> + <prompt phrase="Space" filename="32.wav"/> + <prompt phrase="Dot" filename="46.wav"/> + <prompt phrase="Alpha" filename="97.wav"/> + <prompt phrase="Bravo" filename="98.wav"/> + <prompt phrase="Charlie" filename="99.wav"/> + <prompt phrase="Delta" filename="100.wav"/> + <prompt phrase="Echo" filename="101.wav"/> + <prompt phrase="Foxtrot" filename="102.wav"/> + <prompt phrase="Golf" filename="103.wav"/> + <prompt phrase="Hotel" filename="104.wav"/> + <prompt phrase="India" filename="105.wav"/> + <prompt phrase="Juliet" filename="106.wav"/> + <prompt phrase="Kilo" filename="107.wav"/> + <prompt phrase="Lima" filename="108.wav"/> + <prompt phrase="Mike" filename="109.wav"/> + <prompt phrase="November" filename="110.wav"/> + <prompt phrase="Oscar" filename="111.wav"/> + <prompt phrase="Papa" filename="112.wav"/> + <prompt phrase="Quebec" filename="113.wav"/> + <prompt phrase="Romeo" filename="114.wav"/> + <prompt phrase="Sierra" filename="115.wav"/> + <prompt phrase="Tango" filename="116.wav"/> + <prompt phrase="Unifor" filename="117.wav"/> + <prompt phrase="Victor" filename="118.wav"/> + <prompt phrase="Whiskey" filename="119.wav"/> + <prompt phrase="Xray" filename="120.wav"/> + <prompt phrase="Yankee" filename="121.wav"/> + <prompt phrase="Zulu" filename="122.wav"/> + </phonetic-ascii> + <digits> + <prompt phrase="零" filename="0.wav"/> + <prompt phrase="一" filename="1.wav"/> + <prompt phrase="二" filename="2.wav"/> + <prompt phrase="兩" filename="2s.wav"/> + <prompt phrase="三" filename="3.wav"/> + <prompt phrase="四" filename="4.wav"/> + <prompt phrase="五" filename="5.wav"/> + <prompt phrase="六" filename="6.wav"/> + <prompt phrase="七" filename="7.wav"/> + <prompt phrase="八" filename="8.wav"/> + <prompt phrase="九" filename="9.wav"/> + <prompt phrase="十" filename="10.wav"/> + <prompt phrase="百" filename="100.wav"/> + <prompt phrase="千" filename="1000.wav"/> + <prompt phrase="萬" filename="10000.wav"/> + <prompt phrase="憶" filename="100000000.wav"/> + <prompt phrase="點" filename="dot.wav"/> + <prompt phrase="第" filename="ordinal.wav"/> + <prompt phrase="Period" filename="period.wav"/> + <prompt phrase="點" filename="point.wav"/> + <prompt phrase="Pound" filename="pound.wav"/> + <prompt phrase="星" filename="star.wav"/> + </digits> + <currency> + <prompt phrase="Cent" filename="cent.wav"/> + <prompt phrase="Central" filename="central.wav"/> + <prompt phrase="Cents 每一分鐘" filename="cents-per-minute.wav"/> + <prompt phrase="Dollar" filename="dollar.wav"/> + <prompt phrase="Minus" filename="minus.wav"/> + <prompt phrase="Negative" filename="negative.wav"/> + </currency> + <time> + <prompt phrase="上午" filename="a-m.wav"/> + <prompt phrase="星期日" filename="day-0.wav"/> + <prompt phrase="星期一" filename="day-1.wav"/> + <prompt phrase="星期二" filename="day-2.wav"/> + <prompt phrase="星期三" filename="day-3.wav"/> + <prompt phrase="星期四" filename="day-4.wav"/> + <prompt phrase="星期五" filename="day-5.wav"/> + <prompt phrase="星期六" filename="day-6.wav"/> + <prompt phrase="日" filename="day.wav"/> + <prompt phrase="晚上" filename="evening.wav"/> + <prompt phrase="時" filename="hour.wav"/> + <prompt phrase="分鐘" filename="minutes.wav"/> + <prompt phrase="分鐘" filename="minute.wav"/> + <prompt phrase="月" filename="month.wav"/> + <prompt phrase="早上" filename="morning.wav"/> + <prompt phrase="上午" filename="p-m.wav"/> + <prompt phrase="秒鐘" filename="seconds.wav"/> + <prompt phrase="今日" filename="today.wav"/> + <prompt phrase="聽日" filename="tomorrow.wav"/> + <prompt phrase="年" filename="year"/> + <prompt phrase="噙日" filename="yesterday.wav"/> + </time> + <voicemail> + <prompt phrase="The person at extension" filename="vm-person.wav"/> + <prompt phrase="marked urgent" filename="vm-marked_urgent.wav"/> + <prompt phrase="emailed" filename="vm-emailed.wav"/> + <prompt phrase="you have" filename="vm-you_have.wav"/> + <prompt phrase="請輸入你 i d, followed by" filename="vm-enter_id.wav"/> + <prompt phrase="請輸入你密碼, followed by" filename="vm-enter_pass.wav"/> + <prompt phrase="login incorrect" filename="vm-fail_auth.wav"/> + <prompt phrase="welcome to your voicemail" filename="vm-hello.wav"/> + <prompt phrase="byebye" filename="vm-goodbye.wav"/> + <prompt phrase="at the tone please record your name, press any key or stop talking to end the recording." filename="vm-record_name1.wav"/> + <prompt phrase="choose a greeting between 一至九" filename="vm-choose_greeting_choose.wav"/> + <prompt phrase="輸入錯" filename="vm-choose_greeting_fail.wav"/> + <prompt phrase="太多 failed attempts" filename="vm-abort.wav"/> + <prompt phrase="record your greeting at the tone, press any key or stop talking to end the recording" filename="vm-record_greeting.wav"/> + <prompt phrase="record your message at the tone, press any key or stop talking to end the recording" filename="vm-record_message.wav"/> + <prompt phrase="唔喺度" filename="vm-play_greeting.wav"/> + <prompt phrase="urgent 新" filename="vm-urgent-new.wav"/> + <prompt phrase="新" filename="vm-new.wav"/> + <prompt phrase="urgent saved" filename="vm-urgent-saved.wav"/> + <prompt phrase="saved" filename="vm-saved.wav"/> + <prompt phrase="口訊" filename="vm-message.wav"/> + <prompt phrase="按" filename="vm-press.wav"/> + <prompt phrase="to listen to 新口訊" filename="vm-listen_new.wav"/> + <prompt phrase="to listen to saved 口訊" filename="vm-listen_saved.wav"/> + <prompt phrase="for advanced options" filename="vm-advanced.wav"/> + <prompt phrase="to exit" filename="vm-to_exit.wav"/> + <prompt phrase="to record a greeting" filename="vm-record_greeting.wav"/> + <prompt phrase="to choose greeting" filename="vm-choose_greeting.wav"/> + <prompt phrase="to record your name" filename="vm-record_name2.wav"/> + <prompt phrase="for the main menu" filename="vm-main_menu.wav"/> + <prompt phrase="to listen to the recording" filename="vm-listen_to_recording.wav"/> + <prompt phrase="to save the recording" filename="vm-save_recording.wav"/> + <prompt phrase="to rerecord" filename="vm-rerecord.wav"/> + <prompt phrase="to mark this message urgent" filename="vm-mark_urgent.wav"/> + <prompt phrase="to continue" filename="vm-continue.wav"/> + <prompt phrase="to listen to the recording again" filename="vm-listen_to_recording_again.wav"/> + <prompt phrase="to delete the recording" filename="vm-delete_recording.wav"/> + <prompt phrase="to forward the recording to your email" filename="vm-forward_to_email.wav"/> + <prompt phrase="greeting" filename="vm-greeting.wav"/> + <prompt phrase="selected" filename="vm-selected.wav"/> + <prompt phrase="唔喺度" filename="vm-not_available.wav"/> + <prompt phrase="口訊號碼" filename="vm-message_number.wav"/> + <prompt phrase="deleted" filename="vm-deleted.wav"/> + <prompt phrase="in folder inbox" filename="vm-in_folder.wav"/> + <prompt phrase="to return the call now" filename="vm-return_call.wav"/> + <prompt phrase="urgent" filename="vm-urgent.wav"/> + </voicemail> + <conference> + <prompt phrase="NULL" filename="ack.wav" type="tone"/> + <prompt phrase="NULL" filename="nack.wav" type="tone"/> + <prompt phrase="You are now muted." filename="mute.wav"/> + <prompt phrase="You are now unmuted." filename="unmuted.wav"/> + <prompt phrase="You are currently the only person in this conference." filename="alone.wav"/> + <prompt phrase="NULL" filename="perpetual.wav" type="music"/> + <prompt phrase="NULL" filename="enter.wav" type="tone"/> + <prompt phrase="NULL" filename="exit.wav" type="tone"/> + <prompt phrase="You have been kicked from this conference." filename="kicked.wav"/> + <prompt phrase="This conference is locked." filename="locked.wav"/> + <prompt phrase="The conference is now locked." filename="is-locked.wav"/> + <prompt phrase="The conference is now unlocked." filename="is-unlocked.wav"/> + <prompt phrase="Please enter the conference 密碼." filename="pin.wav"/> + <prompt phrase="輸入錯, try again." filename="bad-pin.wav"/> + </conference> + </en> +</language>

1 0

[commit] r9113 - freeswitch/trunk/src/mod/say/mod_say_zh
by Freeswitch SVN 20 Jul '08

20 Jul '08

Author: coppice Date: Sun Jul 20 11:49:57 2008 New Revision: 9113 Modified: freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.c Log: A work in progress, but this speaks numbers dates and times OK in my testing so far. Modified: freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.c Sun Jul 20 11:49:57 2008 @@ -37,10 +37,13 @@ * * Contributor(s): * + * Anthony Minessale II <anthmct(a)yahoo.com> * PeteDao <petekay(a)gmail.com> + * Steve Underwood 0.0.1 <steveu(a)coppice.org> * * - * mod_say_zh.c -- Say for Mandarin + * mod_say_zh.c -- Say for Mandarin, Cantonese, and probably any other Chinese + * dialect. * */ @@ -48,6 +51,10 @@ #include <math.h> #include <ctype.h> +/* SSM_COUNTED means ordinal number + SSM_PRONOUNCED + SSM_ITERATED */ + SWITCH_MODULE_LOAD_FUNCTION(mod_say_zh_load); SWITCH_MODULE_DEFINITION(mod_say_zh, mod_say_zh_load, NULL, NULL); @@ -57,7 +64,8 @@ switch_snprintf(tmp, sizeof(tmp), "%u", (unsigned)num); \ if ((tstatus = zh_say_general_count(session, tmp, SST_ITEMS, t, args)) != SWITCH_STATUS_SUCCESS) {\ return tstatus;\ - }}\ + }\ +}\ #define say_file(...) {\ char tmp[80];\ @@ -68,7 +76,8 @@ }\ if (!switch_channel_ready(switch_core_session_get_channel(session))) {\ return SWITCH_STATUS_FALSE;\ - }}\ + }\ +}\ static switch_status_t zh_spell(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args) @@ -77,8 +86,8 @@ for (p = tosay; p && *p; p++) { int a = tolower((int) *p); - if (a >= 48 && a <= 57) { - say_file("digits/%d.wav", a - 48); + if (a >= '0' && a <= '9') { + say_file("digits/%d.wav", a - '0'); } else { if (type == SST_NAME_SPELLED) { say_file("ascii/%d.wav", a); @@ -91,46 +100,15 @@ return SWITCH_STATUS_SUCCESS; } -static switch_status_t play_group(switch_say_method_t method, int a, int b, int c, char *what, switch_core_session_t *session, switch_input_args_t *args) -{ - - if (a) { - say_file("digits/%d.wav", a); - say_file("digits/hundred.wav"); - } - - if (b) { - if (b > 1) { - say_file("digits/%d0.wav", b); - } else { - say_file("digits/%d%d.wav", b, c); - c = 0; - } - } - - if (c) { - if (method == SSM_COUNTED) { - say_file("digits/h-%d.wav", c); - } else { - say_file("digits/%d.wav", c); - } - } - - if (what && (a || b || c)) { - say_file(what); - } - - return SWITCH_STATUS_SUCCESS; -} - static char *strip_commas(char *in, char *out, switch_size_t len) { - char *p = in, *q = out; + char *p = in; + char *q = out; char *ret = out; switch_size_t x = 0; - for (; p && *p; p++) { - if ((*p > 47 && *p < 58)) { + for ( ; p && *p; p++) { + if ((*p >= '0' && *p <= '9')) { *q++ = *p; } else if (*p != ',') { ret = NULL; @@ -148,12 +126,14 @@ static char *strip_nonnumerics(char *in, char *out, switch_size_t len) { - char *p = in, *q = out; + char *p = in; + char *q = out; char *ret = out; switch_size_t x = 0; - // valid are 0 - 9, period (.), minus (-), and plus (+) - remove all others + + /* valid are 0 - 9, period (.), minus (-), and plus (+) - remove all others */ for (; p && *p; p++) { - if ((*p > 47 && *p < 58) || *p == '.' || *p == '-' || *p == '+') { + if ((*p >= '0' && *p <= '9') || *p == '.' || *p == '-' || *p == '+') { *q++ = *p; } @@ -170,10 +150,9 @@ char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args) { int in; - int x = 0; - int places[9] = { 0 }; char sbuf[13] = ""; - switch_status_t status; + char digits[11]; + int i; if (!(tosay = strip_commas(tosay, sbuf, sizeof(sbuf))) || strlen(tosay) > 9) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); @@ -183,29 +162,118 @@ in = atoi(tosay); if (in != 0) { - for (x = 8; x >= 0; x--) { - int num = (int) pow(10, x); - if ((places[(uint32_t) x] = in / num)) { - in -= places[(uint32_t) x] * num; - } - } - + snprintf(digits, sizeof(digits), "%10.10d", in); switch (method) { case SSM_COUNTED: + say_file("digits/ordinal.wav"); + /* Fall through */ case SSM_PRONOUNCED: - if ((status = play_group(SSM_PRONOUNCED, places[8], places[7], places[6], "digits/million.wav", session, args)) != SWITCH_STATUS_SUCCESS) { - return status; - } - if ((status = play_group(SSM_PRONOUNCED, places[5], places[4], places[3], "digits/thousand.wav", session, args)) != SWITCH_STATUS_SUCCESS) { - return status; - } - if ((status = play_group(method, places[2], places[1], places[0], NULL, session, args)) != SWITCH_STATUS_SUCCESS) { - return status; - } + for (i = 0; i <= 9; i++) + { + switch (i) + { + case 0: + /* Billions column */ + if (digits[i] != '0') + { + if (digits[i] != '1') + say_file("digits/%c.wav", digits[i]); + say_file("digits/10.wav"); + } + break; + case 1: + /* Hundred millions columns */ + if (digits[i] != '0') + say_file("digits/%c.wav", digits[i]); + if (memcmp (digits, "00", 2) != 0) + say_file("digits/100000000.wav"); + break; + case 2: + case 6: + /* Ten millions or thousands column */ + if (digits[i] != '0') + { + say_file("digits/%c.wav", digits[i]); + say_file("digits/1000.wav"); + } + break; + case 3: + case 7: + /* Millions or hundreds column */ + if (digits[i] != '0') + { + say_file("digits/%c.wav", digits[i]); + say_file("digits/100.wav"); + } + break; + case 4: + /* Hundred thousands column */ + if (digits[i] != '0') + { + if (digits[i] != '1' + || + memcmp (digits, "0000", 4) != 0) + { + say_file("digits/%c.wav", digits[i]); + } + } + else + { + if (digits[i + 1] != '0' + && + memcmp (digits, "0000", 4) != 0) + { + say_file("digits/%c.wav", digits[i]); + } + } + if (digits[i] != '0') + say_file("digits/10.wav"); + break; + + case 5: + /* Ten thousands column */ + if (digits[i] != '0') + { + say_file("digits/%c.wav", digits[i]); + if (memcmp (digits + 2, "0000", 4) != 0) + say_file("digits/10000.wav"); + } + break; + case 8: + /* Tens column */ + if (digits[i] != '0') + { + if (digits[i] != '1' + || + memcmp (digits, "00000000", 8) != 0) + { + say_file("digits/%c.wav", digits[i]); + } + } + else + { + if (digits[9] != '0' + && + memcmp (digits, "00000000", 8) != 0) + { + say_file("digits/%c.wav", digits[i]); + } + } + if (digits[8] != '0') + say_file("digits/10.wav"); + break; + case 9: + /* Units column */ + if (digits[9] != '0') + say_file("digits/%c.wav", digits[i]); + break; + } + } break; case SSM_ITERATED: { char *p; + for (p = tosay; p && *p; p++) { say_file("digits/%c.wav", *p); } @@ -224,7 +292,11 @@ static switch_status_t zh_ip(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args) { - char *a, *b, *c, *d; + char *a; + char *b; + char *c; + char *d; + switch_status_t status = SWITCH_STATUS_SUCCESS; if (!(a = strdup(tosay))) { return SWITCH_STATUS_FALSE; @@ -259,19 +331,22 @@ say_file("digits/dot.wav"); say_num(atoi(d), method); - done: +done: switch_safe_free(a); return status; } - -static switch_status_t zh_say_time(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, +static switch_status_t zh_say_time(switch_core_session_t *session, + char *tosay, + switch_say_type_t type, + switch_say_method_t method, switch_input_args_t *args) { int32_t t; switch_time_t target = 0; switch_time_exp_t tm; - uint8_t say_date = 0, say_time = 0; + uint8_t say_date = 0; + uint8_t say_time = 0; if (type == SST_TIME_MEASUREMENT) { int64_t hours = 0; @@ -315,62 +390,54 @@ } if (hours) { - - if (hours == 2) - { - say_file("time/specialtwo.wav"); - } - else - { + if (hours == 2) { + say_file("time/2s.wav"); + } else { say_num(hours, SSM_PRONOUNCED); - } - if (hours == 1) { - say_file("time/hour.wav"); - } else { - say_file("time/hours.wav"); } - } else { - say_file("digits/0.wav"); say_file("time/hours.wav"); } - if (minutes) { - say_num(minutes, SSM_PRONOUNCED); - if (minutes == 1) { - say_file("time/minute.wav"); - } else { - say_file("time/minutes.wav"); + if (minutes == 2) { + say_file("time/2s.wav"); + } else { + say_num(minutes, SSM_PRONOUNCED); } + say_file("time/minute.wav"); } else { - say_file("digits/0.wav"); - say_file("time/minutes.wav"); + if (hours) { + say_file("digits/0.wav"); + say_file("time/minute.wav"); + } } if (seconds) { - say_num(seconds, SSM_PRONOUNCED); - if (seconds == 1) { - say_file("time/second.wav"); - } else { - say_file("time/seconds.wav"); + if (seconds == 2) { + say_file("time/2s.wav"); + } else { + say_num(hours, SSM_PRONOUNCED); } - } else { - say_file("digits/0.wav"); say_file("time/seconds.wav"); + } else { + if (hours || minutes) { + say_file("digits/0.wav"); + say_file("time/seconds.wav"); + } } return SWITCH_STATUS_SUCCESS; } - if ((t = atoi(tosay)) > 0) { + if ((t = atoi(tosay)) > 0) target = switch_time_make(t, 0); - } else { + else target = switch_timestamp_now(); - } switch_time_exp_lt(&tm, target); switch (type) { case SST_CURRENT_DATE_TIME: - say_date = say_time = 1; + say_date = + say_time = 1; break; case SST_CURRENT_DATE: say_date = 1; @@ -385,41 +452,46 @@ if (say_date) { say_num(tm.tm_year + 1900, SSM_ITERATED); say_file("time/year.wav"); - say_file("time/mon-%d.wav", tm.tm_mon); + say_num(tm.tm_mon + 1, SSM_PRONOUNCED); + say_file("time/month.wav"); say_num(tm.tm_mday, SSM_PRONOUNCED); say_file("time/day.wav"); say_file("time/day-%d.wav", tm.tm_wday); - } - if (say_time) { - int32_t hour = tm.tm_hour, pm = 0; + int32_t hour = tm.tm_hour; - if (hour > 12) { + if (hour < 6) { + say_file("time/morning.wav"); + } else if (hour < 12) { + say_file("time/a-m.wav"); + } else if (tm.tm_hour < 18) { + say_file("time/p-m.wav"); + } else { + say_file("time/evening.wav"); + } + if (hour > 12) hour -= 12; - pm = 1; - } else if (hour == 12) { - pm = 1; - } else if (hour == 0) { + if (hour == 0) hour = 12; - pm = 0; - } - - say_file("time/%s.wav", pm ? "p-m" : "a-m"); - - say_num(hour, SSM_PRONOUNCED); - say_file("time/clock-hour.wav"); - say_num(tm.tm_min, SSM_PRONOUNCED); - say_file("time/clock-minute.wav"); - + if (hour == 2) { + say_file("time/2s.wav"); + } else { + say_num(hour, SSM_PRONOUNCED); + } + say_file("time/hour.wav"); + if (tm.tm_min == 2) { + say_file("time/2s.wav"); + } else { + say_num(tm.tm_min, SSM_PRONOUNCED); + } + say_file("time/minute.wav"); } - return SWITCH_STATUS_SUCCESS; } - static switch_status_t zh_say_money(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args) { @@ -454,36 +526,21 @@ /* Say dollar amount */ zh_say_general_count(session, dollars, type, method, args); - if (atoi(dollars) == 1) { - say_file("currency/dollar.wav"); - } else { - say_file("currency/dollars.wav"); - } - - /* Say "and" */ - say_file("currency/and.wav"); + say_file("currency/dollar.wav"); /* Say cents */ if (cents) { zh_say_general_count(session, cents, type, method, args); - if (atoi(cents) == 1) { - say_file("currency/cent.wav"); - } else { - say_file("currency/cents.wav"); - } } else { say_file("digits/0.wav"); - say_file("currency/cents.wav"); } + say_file("currency/cent.wav"); return SWITCH_STATUS_SUCCESS; } - - static switch_status_t zh_say(switch_core_session_t *session, char *tosay, switch_say_type_t type, switch_say_method_t method, switch_input_args_t *args) { - switch_say_callback_t say_cb = NULL; switch (type) {

1 0

[commit] r9112 - in freeswitch/trunk/conf/lang: de/demo en/demo
by Freeswitch SVN 20 Jul '08

20 Jul '08

Author: anthm Date: Sun Jul 20 10:20:29 2008 New Revision: 9112 Modified: freeswitch/trunk/conf/lang/de/demo/demo.xml freeswitch/trunk/conf/lang/en/demo/demo.xml Log: typos Modified: freeswitch/trunk/conf/lang/de/demo/demo.xml ============================================================================== --- freeswitch/trunk/conf/lang/de/demo/demo.xml (original) +++ freeswitch/trunk/conf/lang/de/demo/demo.xml Sun Jul 20 10:20:29 2008 @@ -3,9 +3,9 @@ <input pattern="(.*)"> <match> <action function="execute" data="sleep(1000)"/> - <action function="play-file" data="vm-youhave.wav"/> + <action function="play-file" data="voicemail/vm-you_have.wav"/> <action function="say" data="$1" method="pronounced" type="items"/> - <action function="play-file" data="vm-messages.wav"/> + <action function="play-file" data="voicemail/vm-messages.wav"/>   </match> Modified: freeswitch/trunk/conf/lang/en/demo/demo.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/demo/demo.xml (original) +++ freeswitch/trunk/conf/lang/en/demo/demo.xml Sun Jul 20 10:20:29 2008 @@ -3,9 +3,9 @@ <input pattern="(.*)"> <match> <action function="execute" data="sleep(1000)"/> - <action function="play-file" data="vm-youhave.wav"/> + <action function="play-file" data="voicemail/vm-you_have.wav"/> <action function="say" data="$1" method="pronounced" type="items"/> - <action function="play-file" data="vm-messages.wav"/> + <action function="play-file" data="voicemail/vm-messages.wav"/>   </match>

1 0