June 2008 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r8827 - freeswitch/trunk/scripts
by Freeswitch SVN 23 Jun '08

23 Jun '08

Author: anthm Date: Mon Jun 23 15:17:47 2008 New Revision: 8827 Added: freeswitch/trunk/scripts/api.lua Log: add example Added: freeswitch/trunk/scripts/api.lua ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/api.lua Mon Jun 23 15:17:47 2008 @@ -0,0 +1,24 @@ +stream:write("Content-Type: text/html\n\n"); +stream:write("<title>FreeSWITCH Command Portal</title>"); +stream:write("<h2>FreeSWITCH Command Portal</h2>"); +stream:write("<form method=post><input name=command size=40> "); +stream:write("<input type=submit value=\"Execute\">"); +stream:write("</form><hr noshade size=1><br>"); + +command = env:getHeader("command"); + +if (command) then + api = freeswitch.API(); + reply = api:executeString(command); + + if (reply) then + stream:write("<br><B>Command Result</b><br><pre>" .. reply .. "\n</pre>"); + end + +end + +env:addHeader("cool", "true"); +stream:write("<pre>" .. env:serialize() .. "</pre>"); + + +

1 0

[Freeswitch-svn] [commit] r8826 - freeswitch/trunk/src/include
by Freeswitch SVN 23 Jun '08

23 Jun '08

Author: anthm Date: Mon Jun 23 15:15:17 2008 New Revision: 8826 Modified: freeswitch/trunk/src/include/switch_cpp.h Log: fix MODLANG-65 Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Mon Jun 23 15:15:17 2008 @@ -234,7 +234,7 @@ * receiving dtmf digits. For that, use collectDigits. */ SWITCH_DECLARE(char *) getDigits(int maxdigits, char *terminators, int timeout); - SWITCH_DECLARE(char *) getDigits(int maxdigits, char *terminators, int timeout, int interdigit = 0); + SWITCH_DECLARE(char *) getDigits(int maxdigits, char *terminators, int timeout, int interdigit); SWITCH_DECLARE(int) transfer(char *extensions, char *dialplan, char *context);

1 0

[Freeswitch-svn] [commit] r8825 - in freeswitch/trunk/src: . mod/applications/mod_dptools
by Freeswitch SVN 23 Jun '08

23 Jun '08

Author: anthm Date: Mon Jun 23 15:04:17 2008 New Revision: 8825 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_originate.c Log: fix issue with user channel and cid 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 Jun 23 15:04:17 2008 @@ -1961,6 +1961,13 @@ char *d_dest = NULL; switch_channel_t *channel; switch_originate_flag_t myflags = SOF_NONE; + char *cid_name_override = NULL; + char *cid_num_override = NULL; + + if (var_event) { + cid_name_override = switch_event_get_header(var_event, "origination_caller_id_name"); + cid_num_override = switch_event_get_header(var_event, "origination_caller_id_number"); + } if (session) { channel = switch_core_session_get_channel(session); @@ -1992,7 +1999,8 @@ myflags |= SOF_NOBLOCK; } - if (switch_ivr_originate(session, new_session, &cause, d_dest, timelimit, NULL, NULL, NULL, NULL, myflags) == SWITCH_STATUS_SUCCESS) { + if (switch_ivr_originate(session, new_session, &cause, d_dest, timelimit, NULL, + cid_name_override, cid_num_override, NULL, myflags) == SWITCH_STATUS_SUCCESS) { const char *context; switch_caller_profile_t *cp; Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Jun 23 15:04:17 2008 @@ -708,11 +708,15 @@ } } - if (!cid_name_override) { + if (cid_name_override) { + switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "origination_caller_id_name", cid_name_override); + } else { cid_name_override = switch_event_get_header(var_event, "origination_caller_id_name"); } - if (!cid_num_override) { + if (cid_num_override) { + switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "origination_caller_id_number", cid_num_override); + } else { cid_num_override = switch_event_get_header(var_event, "origination_caller_id_number"); } @@ -861,9 +865,9 @@ } } - if (vdata && (var_begin = switch_stristr("effective_caller_id_number=", vdata))) { + if (vdata && (var_begin = switch_stristr("origination_caller_id_number=", vdata))) { char tmp[512] = ""; - var_begin += strlen("effective_caller_id_number="); + var_begin += strlen("origination_caller_id_number="); var_end = strchr(var_begin, '|'); if (var_end) { strncpy(tmp, var_begin, var_end-var_begin); @@ -873,9 +877,9 @@ new_profile->caller_id_number = switch_core_strdup(new_profile->pool, tmp); } - if (vdata && (var_begin = switch_stristr("effective_caller_id_name=", vdata))) { + if (vdata && (var_begin = switch_stristr("origination_caller_id_name=", vdata))) { char tmp[512] = ""; - var_begin += strlen("effective_caller_id_name="); + var_begin += strlen("origination_caller_id_name="); var_end = strchr(var_begin, '|'); if (var_end) { strncpy(tmp, var_begin, var_end-var_begin);

1 0

[Freeswitch-svn] [commit] r8824 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 23 Jun '08

23 Jun '08

Author: brian Date: Mon Jun 23 14:44:17 2008 New Revision: 8824 Modified: freeswitch/trunk/conf/directory/default/brian.xml Log: EUREKA, what they are allowed to do Modified: freeswitch/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/trunk/conf/directory/default/brian.xml Mon Jun 23 14:44:17 2008 @@ -50,6 +50,8 @@    +  +  </params> <variables>

1 0

[Freeswitch-svn] [commit] r8823 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 23 Jun '08

23 Jun '08

Author: anthm Date: Mon Jun 23 14:26:08 2008 New Revision: 8823 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_rtp.c Log: deal with complex codec mapping bs 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 Jun 23 14:26:08 2008 @@ -132,9 +132,9 @@ if (tech_pvt->rm_encoding) { rate = tech_pvt->rm_rate; - switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", tech_pvt->pt, tech_pvt->rm_encoding, rate); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%d\n", tech_pvt->agreed_pt, tech_pvt->rm_encoding, rate); if (tech_pvt->fmtp_out) { - switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", tech_pvt->pt, tech_pvt->fmtp_out); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", tech_pvt->agreed_pt, tech_pvt->fmtp_out); } if (tech_pvt->read_codec.implementation && !ptime) { ptime = tech_pvt->read_codec.implementation->microseconds_per_frame / 1000; @@ -229,7 +229,7 @@ /*****************************/ if (tech_pvt->video_rm_encoding) { sofia_glue_tech_set_video_codec(tech_pvt, 0); - switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->video_pt); + switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->video_agreed_pt); } else if (tech_pvt->num_codecs) { int i; int already_did[128] = { 0 }; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Jun 23 14:26:08 2008 @@ -1914,6 +1914,9 @@ send_msg = frame->packet; len = frame->packetlen; ts = 0; + if (frame->codec && frame->codec->agreed_pt == frame->payload) { + send_msg->header.pt = payload; + } } else { data = frame->data; len = frame->datalen;

1 0

[Freeswitch-svn] [commit] r8822 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 23 Jun '08

23 Jun '08

Author: brian Date: Mon Jun 23 13:33:42 2008 New Revision: 8822 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: add debugging tool to default. Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Mon Jun 23 13:33:42 2008 @@ -270,6 +270,15 @@ </condition> </extension> + <extension name="show_info"> + <condition field="destination_number" expression="^9992$"> + <action application="answer"/> + <action application="info"/> + <action application="sleep" data="250"/> + <action application="hangup"/> + </condition> + </extension> + <extension name="video_record"> <condition field="destination_number" expression="^9993$"> <action application="answer"/>

1 0

[Freeswitch-svn] [commit] r8821 - in freeswitch/trunk: conf/autoload_configs src/mod/endpoints/mod_sofia
by Freeswitch SVN 23 Jun '08

23 Jun '08

Author: mikej Date: Mon Jun 23 12:52:38 2008 New Revision: 8821 Modified: freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: Linksys P-RTP-Stat SIP header values (SFSIP-66) Modified: freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml Mon Jun 23 12:52:38 2008 @@ -13,6 +13,7 @@ <template name="sql">INSERT INTO cdr VALUES ("${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}", "${accountcode}");</template> <template name="example">"${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}", "${accountcode}","${read_codec}","${write_codec}"</template> <template name="snom">"${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}", "${accountcode}","${read_codec}","${write_codec}","${sip_user_agent}","${call_clientcode}","${sip_rtp_rxstat}","${sip_rtp_txstat}","${sofia_record_file}"</template> + <template name="linksys">"${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}","${accountcode}","${read_codec}","${write_codec}","${sip_user_agent}","${sip_rtp_p_rtp_stat}"</template> <template name="asterisk">"${accountcode}","${caller_id_number}","${destination_number}","${context}","${caller_id}","${channel_name}","${bridge_channel}","${last_app}","${last_arg}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${amaflags}","${uuid}","${userfield}"</template> </templates> </configuration> 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 Jun 23 12:52:38 2008 @@ -144,6 +144,10 @@ if ((tmp = sofia_glue_get_unknown_header(sip, "rtp-rxstat"))) { switch_channel_set_variable(channel, "sip_rtp_rxstat", tmp); } + if ((tmp = sofia_glue_get_unknown_header(sip, "P-RTP-Stat"))) { + switch_channel_set_variable(channel, "sip_p_rtp_stat", tmp); + } + return; }

1 0

[Freeswitch-svn] [commit] r8820 - in freeswitch/trunk/src: . include
by Freeswitch SVN 23 Jun '08

23 Jun '08

Author: mikej Date: Mon Jun 23 12:31:09 2008 New Revision: 8820 Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/switch_cpp.cpp Log: add inter digit timeout to swigged embedded languages getDigits method. (MODLANG-65) Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Mon Jun 23 12:31:09 2008 @@ -234,7 +234,7 @@ * receiving dtmf digits. For that, use collectDigits. */ SWITCH_DECLARE(char *) getDigits(int maxdigits, char *terminators, int timeout); - + SWITCH_DECLARE(char *) getDigits(int maxdigits, char *terminators, int timeout, int interdigit = 0); SWITCH_DECLARE(int) transfer(char *extensions, char *dialplan, char *context); Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Mon Jun 23 12:31:09 2008 @@ -583,9 +583,15 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_DECLARE(char *) CoreSession::getDigits(int maxdigits, char *terminators, int timeout) +{ + return getDigits(maxdigits, terminators, timeout, 0); +} + SWITCH_DECLARE(char *) CoreSession::getDigits(int maxdigits, char *terminators, - int timeout) + int timeout, + int interdigit) { switch_status_t status; this_check((char *)""); @@ -600,7 +606,7 @@ maxdigits, terminators, &terminator, - (uint32_t) timeout, 0, 0); + (uint32_t) timeout, (uint32_t)interdigit, 0); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "getDigits dtmf_buf: %s\n", dtmf_buf); end_allow_threads();

1 0

[Freeswitch-svn] [commit] r8819 - freeswitch/trunk/src/mod/say/mod_say_zh
by Freeswitch SVN 23 Jun '08

23 Jun '08

Author: mikej Date: Mon Jun 23 12:00:44 2008 New Revision: 8819 Modified: freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.c Log: update zh say module to implement some special rules (MODLANG-64) 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 Mon Jun 23 12:00:44 2008 @@ -315,7 +315,15 @@ } if (hours) { - say_num(hours, SSM_PRONOUNCED); + + if (hours == 2) + { + say_file("time/specialtwo.wav"); + } + else + { + say_num(hours, SSM_PRONOUNCED); + } if (hours == 1) { say_file("time/hour.wav"); } else { @@ -375,12 +383,16 @@ } if (say_date) { - say_file("time/day-%d.wav", tm.tm_wday); + 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_mday, SSM_COUNTED); - say_num(tm.tm_year + 1900, SSM_PRONOUNCED); + 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; @@ -394,18 +406,14 @@ pm = 0; } - say_num(hour, SSM_PRONOUNCED); + say_file("time/%s.wav", pm ? "p-m" : "a-m"); - if (tm.tm_min > 9) { - say_num(tm.tm_min, SSM_PRONOUNCED); - } else if (tm.tm_min) { - say_file("time/oh.wav"); - say_num(tm.tm_min, SSM_PRONOUNCED); - } else { - say_file("time/oclock.wav"); - } + say_num(hour, SSM_PRONOUNCED); + say_file("time/clock-hour.wav"); + say_num(tm.tm_min, SSM_PRONOUNCED); + say_file("time/clock-minute.wav"); - say_file("time/%s.wav", pm ? "p-m" : "a-m"); + } return SWITCH_STATUS_SUCCESS;

1 0

[Freeswitch-svn] [commit] r8818 - freeswitch/trunk/src
by Freeswitch SVN 23 Jun '08

23 Jun '08

Author: mikej Date: Mon Jun 23 11:56:24 2008 New Revision: 8818 Modified: freeswitch/trunk/src/switch_apr.c Log: attempt to fix MODEVENT-25 (WSAWOULDBLOCK error on socket send in windows) Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Mon Jun 23 11:56:24 2008 @@ -564,9 +564,10 @@ switch_size_t req = *len, wrote = 0, need = *len; int to_count = 0; - while ((wrote < req && status == SWITCH_STATUS_SUCCESS) || (need == 0 && status == SWITCH_STATUS_BREAK)) { + while ((wrote < req && status == SWITCH_STATUS_SUCCESS) || (need == 0 && status == SWITCH_STATUS_BREAK) || status == 730035) { need = req - wrote; - if ((status = apr_socket_send(sock, buf + wrote, &need)) == SWITCH_STATUS_BREAK) { + status = apr_socket_send(sock, buf + wrote, &need); + if (status == SWITCH_STATUS_BREAK || status == 730035) { if (++to_count > 10000) { status = SWITCH_STATUS_FALSE; break;

1 0