December 2006 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r3799 - in freeswitch/trunk/src: . mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 22 Dec '06

22 Dec '06

Author: mikej Date: Fri Dec 22 14:03:25 2006 New Revision: 3799 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/trunk/src/switch_ivr.c Log: change types for len to uint32_t. Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Fri Dec 22 14:03:25 2006 @@ -151,11 +151,11 @@ char *application = (char*) switch_xml_attr_soft(xaction, "application"); char *data = (char *) switch_xml_attr_soft(xaction, "data"); char *substituted = NULL; - switch_size_t len = 0; + uint32_t len = 0; char *app_data = NULL; if (field && strchr(expression, '(')) { - len = strlen(data) + strlen(field_data) + 10; + len = (uint32_t)(strlen(data) + strlen(field_data) + 10); if (!(substituted = malloc(len))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); proceed = 0; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Dec 22 14:03:25 2006 @@ -4488,7 +4488,7 @@ pcre *re = NULL; int proceed = 0, ovector[30]; char *substituted = NULL; - switch_size_t len = 0; + uint32_t len = 0; char *odata = NULL; char *expanded = NULL; @@ -4498,7 +4498,7 @@ char *func = (char *) switch_xml_attr_soft(action, "function"); if (strchr(pattern, '(') && strchr(adata, '$')) { - len = strlen(data) + strlen(adata) + 10; + len = (uint32_t)(strlen(data) + strlen(adata) + 10); if (!(substituted = malloc(len))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); switch_clean_re(re);

1 0

[commit] r3798 - in freeswitch/trunk: libs/win32/apr-iconv libs/win32/apr-util src/mod/event_handlers/mod_xmpp_event src/mod/xml_int/mod_xml_curl src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 22 Dec '06

22 Dec '06

Author: mikej Date: Fri Dec 22 14:02:52 2006 New Revision: 3798 Modified: freeswitch/trunk/libs/win32/apr-iconv/libapriconv.vcproj freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj Log: fix windows build paths from moving libs in tree. Modified: freeswitch/trunk/libs/win32/apr-iconv/libapriconv.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/apr-iconv/libapriconv.vcproj (original) +++ freeswitch/trunk/libs/win32/apr-iconv/libapriconv.vcproj Fri Dec 22 14:02:52 2006 @@ -48,7 +48,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + AdditionalIncludeDirectories=""..\..\apr-iconv-1.1.1\include";..\..\apr\include" PreprocessorDefinitions="_DEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS" RuntimeLibrary="3" PrecompiledHeaderFile=".\Debug/libapriconv.pch" @@ -147,7 +147,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + AdditionalIncludeDirectories=""..\..\apr-iconv-1.1.1\include";..\..\apr\include" PreprocessorDefinitions="NDEBUG;API_DECLARE_EXPORT;WIN32;_WINDOWS" StringPooling="true" RuntimeLibrary="2" Modified: freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj (original) +++ freeswitch/trunk/libs/win32/apr-util/libaprutil.vcproj Fri Dec 22 14:02:52 2006 @@ -49,7 +49,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/EHsc " Optimization="0" - AdditionalIncludeDirectories="..\..\apr-util\include,..\..\apr-util\include/private,..\..\apr-util\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include" PreprocessorDefinitions="_DEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS" RuntimeLibrary="3" PrecompiledHeaderFile=".\Debug/libaprutil.pch" @@ -149,7 +149,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\apr-util\include,..\..\apr-util\include/private,..\..\apr-util\dbm/sdbm,..\..\apr-iconv-1.1.1\include,..\..\apr-1.2.7\include" + AdditionalIncludeDirectories=""..\..\apr-util\include";"..\..\apr-util\include/private";"..\..\apr-util\dbm/sdbm";"..\..\apr-iconv-1.1.1\include";..\..\apr\include" PreprocessorDefinitions="NDEBUG;APU_DECLARE_EXPORT;APU_USE_SDBM;WIN32;_WINDOWS" StringPooling="true" RuntimeLibrary="2" Modified: freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/mod_xmpp_event.vcproj Fri Dec 22 14:02:52 2006 @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\iksemel-1.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\iksemel\include"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -126,7 +126,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\iksemel-1.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\iksemel\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.vcproj Fri Dec 22 14:02:52 2006 @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14\include";"$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -125,7 +125,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14\include";"$(InputDir)..\..\..\..\libs\xmlcurl-c-1.03.14";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" RuntimeLibrary="2" UsePrecompiledHeader="0" Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.vcproj Fri Dec 22 14:02:52 2006 @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c-1.03.14\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c-1.03.14";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -125,7 +125,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c-1.03.14\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c-1.03.14";"$(InputDir)..\..\..\..\libs\curl-7.15.2\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c\include";"$(InputDir)..\..\..\..\libs\xmlrpc-c";"$(InputDir)..\..\..\..\libs\curl\include"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;ABYSS_WIN32;CURL_STATICLIB" RuntimeLibrary="2" UsePrecompiledHeader="0"

1 0

[commit] r3797 - in freeswitch/trunk: libs/srtp/include libs/srtp/srtp src
by Freeswitch SVN 22 Dec '06

22 Dec '06

Author: mikej Date: Fri Dec 22 14:02:10 2006 New Revision: 3797 Modified: freeswitch/trunk/libs/srtp/include/srtp.h freeswitch/trunk/libs/srtp/srtp/srtp.c freeswitch/trunk/src/switch_rtp.c Log: change around types for better c99 compliance, fixes windows srtp build and builds that do not default to 8 bit stuct alignment. Modified: freeswitch/trunk/libs/srtp/include/srtp.h ============================================================================== --- freeswitch/trunk/libs/srtp/include/srtp.h (original) +++ freeswitch/trunk/libs/srtp/include/srtp.h Fri Dec 22 14:02:10 2006 @@ -51,7 +51,6 @@ #endif #ifdef _MSC_VER -#pragma pack(4) #pragma warning(disable:4214) #endif @@ -895,6 +894,10 @@ * is not identical) */ +#ifdef _MSC_VER +#pragma pack(push, r1, 1) +#endif + #ifndef WORDS_BIGENDIAN typedef struct { @@ -904,9 +907,9 @@ unsigned version:2; /* protocol version */ unsigned pt:7; /* payload type */ unsigned m:1; /* marker bit */ - uint16_t seq; /* sequence number */ - uint32_t ts; /* timestamp */ - uint32_t ssrc; /* synchronization source */ + unsigned seq:16; /* sequence number */ + unsigned ts:32; /* timestamp */ + unsigned ssrc:32; /* synchronization source */ } srtp_hdr_t; #else /* BIG_ENDIAN */ @@ -918,9 +921,9 @@ unsigned cc:4; /* CSRC count */ unsigned m:1; /* marker bit */ unsigned pt:7; /* payload type */ - uint16_t seq; /* sequence number */ - uint32_t ts; /* timestamp */ - uint32_t ssrc; /* synchronization source */ + unsigned seq:16; /* sequence number */ + unsigned ts:32; /* timestamp */ + unsigned ssrc:32; /* synchronization source */ } srtp_hdr_t; #endif @@ -945,8 +948,8 @@ unsigned p:1; /* padding flag */ unsigned version:2; /* protocol version */ unsigned pt:8; /* payload type */ - uint16_t len; /* length */ - uint32_t ssrc; /* synchronization source */ + unsigned len:16; /* length */ + unsigned ssrc:32; /* synchronization source */ } srtcp_hdr_t; typedef struct { @@ -964,8 +967,8 @@ unsigned p:1; /* padding flag */ unsigned rc:5; /* reception report count */ unsigned pt:8; /* payload type */ - uint16_t len; /* length */ - uint32_t ssrc; /* synchronization source */ + unsigned len:16; /* length */ + unsigned ssrc:32; /* synchronization source */ } srtcp_hdr_t; typedef struct { @@ -973,7 +976,7 @@ unsigned int p:1; /* padding flag */ unsigned int count:5; /* varies by packet type */ unsigned int pt:8; /* payload type */ - uint16_t length; /* len of uint32s of packet less header */ + unsigned length:16; /* len of uint32s of packet less header */ } rtcp_common_t; typedef struct { @@ -992,7 +995,7 @@ #define SRTCP_INDEX_MASK 0x7fffffff #ifdef _MSC_VER -#pragma pack() +#pragma pack(pop, r1) #endif #ifdef __cplusplus Modified: freeswitch/trunk/libs/srtp/srtp/srtp.c ============================================================================== --- freeswitch/trunk/libs/srtp/srtp/srtp.c (original) +++ freeswitch/trunk/libs/srtp/srtp/srtp.c Fri Dec 22 14:02:10 2006 @@ -684,7 +684,7 @@ * estimate the packet index using the start of the replay window * and the sequence number from the header */ - delta = rdbx_estimate_index(&stream->rtp_rdbx, &est, ntohs(hdr->seq)); + delta = rdbx_estimate_index(&stream->rtp_rdbx, &est, ntohs((uint16_t)hdr->seq)); status = rdbx_check(&stream->rtp_rdbx, delta); if (status) return status; /* we've been asked to reuse an index */ @@ -842,7 +842,7 @@ est = (xtd_seq_num_t) make64(0,ntohs(hdr->seq)); delta = low32(est); #else - est = (xtd_seq_num_t) ntohs(hdr->seq); + est = (xtd_seq_num_t) ntohs((uint16_t)hdr->seq); delta = (int)est; #endif } else { @@ -856,7 +856,7 @@ } else { /* estimate packet index from seq. num. in header */ - delta = rdbx_estimate_index(&stream->rtp_rdbx, &est, ntohs(hdr->seq)); + delta = rdbx_estimate_index(&stream->rtp_rdbx, &est, ntohs((uint16_t)hdr->seq)); /* check replay database */ status = rdbx_check(&stream->rtp_rdbx, delta); Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Dec 22 14:02:10 2006 @@ -467,7 +467,7 @@ rtp_session->recv_msg.header.x = 0; rtp_session->recv_msg.header.cc = 0; - rtp_session->seq = rtp_session->send_msg.header.seq; + rtp_session->seq = (uint16_t)rtp_session->send_msg.header.seq; rtp_session->payload = payload; rtp_session->ms_per_packet = ms_per_packet; rtp_session->packet_size = packet_size; @@ -896,7 +896,7 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_GOOGLEHACK) && rtp_session->recv_msg.header.pt == 102) { rtp_session->recv_msg.header.pt = 97; } - rtp_session->rseq = ntohs(rtp_session->recv_msg.header.seq); + rtp_session->rseq = ntohs((uint16_t)rtp_session->recv_msg.header.seq); rtp_session->rpayload = (switch_payload_t)rtp_session->recv_msg.header.pt; } else { if (rtp_session->recv_msg.header.version == 0 && rtp_session->ice_user) { @@ -1296,7 +1296,7 @@ if (!rtp_session->mini && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_MINI)) { rtp_session->mini++; rtp_session->rpayload = (switch_payload_t)send_msg->header.pt; - rtp_session->rseq = ntohs(send_msg->header.seq); + rtp_session->rseq = ntohs((uint16_t)send_msg->header.seq); } }

1 0

[commit] r3796 - in freeswitch/trunk/src/mod: applications/mod_conference event_handlers/mod_event_socket
by Freeswitch SVN 22 Dec '06

22 Dec '06

Author: mikej Date: Fri Dec 22 13:39:36 2006 New Revision: 3796 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: api commands should not return false unless there is a fatal error warnings about no such command etc still considered sucess cos it has io Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Dec 22 13:39:36 2006 @@ -3153,7 +3153,7 @@ } if (argc >= 2) { - status = conf_api_dispatch(conference, stream, argc, argv, (const char *)buf, 1); + conf_api_dispatch(conference, stream, argc, argv, (const char *)buf, 1); } else { stream->write_function(stream, "Conference command, not specified.\nTry 'help'\n"); } Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Fri Dec 22 13:39:36 2006 @@ -415,7 +415,9 @@ if (stream.data) { if (switch_api_execute(acs->api_cmd, acs->arg, NULL, &stream) == SWITCH_STATUS_SUCCESS) { - + if (!stream.data) { + stream.write_function(&stream, "Command returned no output!\n"); + } if (acs->bg) { switch_event_t *event;

1 0

[commit] r3795 - in freeswitch/trunk/src: . mod/endpoints/mod_dingaling mod/endpoints/mod_sofia
by Freeswitch SVN 22 Dec '06

22 Dec '06

Author: mikej Date: Fri Dec 22 10:55:52 2006 New Revision: 3795 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_rtp.c Log: refactor 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 Fri Dec 22 10:55:52 2006 @@ -1280,17 +1280,19 @@ } if (tech_pvt->read_frame.datalen > 0) { - if (tech_pvt->read_codec.implementation->encoded_bytes_per_frame) { - bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; - frames = (tech_pvt->read_frame.datalen / bytes); - } else { - frames = 1; - } - samples = frames * tech_pvt->read_codec.implementation->samples_per_frame; - ms = frames * tech_pvt->read_codec.implementation->microseconds_per_frame; - tech_pvt->timestamp_recv += (int32_t) samples; - tech_pvt->read_frame.samples = (int) samples; - tech_pvt->last_read = tech_pvt->read_frame.datalen; + if (!switch_test_flag((&tech_pvt->read_frame), SFF_CNG)) { + if (tech_pvt->read_codec.implementation->encoded_bytes_per_frame && bytes) { + bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; + frames = (tech_pvt->read_frame.datalen / bytes); + } else { + frames = 1; + } + samples = frames * tech_pvt->read_codec.implementation->samples_per_frame; + ms = frames * tech_pvt->read_codec.implementation->microseconds_per_frame; + tech_pvt->timestamp_recv += (int32_t) samples; + tech_pvt->read_frame.samples = (int) samples; + tech_pvt->last_read = tech_pvt->read_frame.datalen; + } break; } 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 Fri Dec 22 10:55:52 2006 @@ -1614,9 +1614,12 @@ size_t bytes = 0; int frames = 0; //tech_pvt->last_read = switch_time_now(); - bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame; - frames = (tech_pvt->read_frame.datalen / bytes); - tech_pvt->read_frame.samples = (int) (frames * tech_pvt->read_codec.implementation->samples_per_frame); + if (!switch_test_flag((&tech_pvt->read_frame), SFF_CNG)) { + if ((bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame)) { + frames = (tech_pvt->read_frame.datalen / bytes); + tech_pvt->read_frame.samples = (int) (frames * tech_pvt->read_codec.implementation->samples_per_frame); + } + } break; } } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Fri Dec 22 10:55:52 2006 @@ -782,7 +782,7 @@ *flags |= SFF_CNG; /* Return a CNG frame */ *payload_type = SWITCH_RTP_CNG_PAYLOAD; - return SWITCH_RTP_CNG_PAYLOAD; + return SWITCH_RTP_CNG_PAYLOAD + rtp_header_len; } if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO)) { @@ -857,7 +857,7 @@ *flags |= SFF_CNG; /* Return a CNG frame */ *payload_type = SWITCH_RTP_CNG_PAYLOAD; - return SWITCH_RTP_CNG_PAYLOAD; + return SWITCH_RTP_CNG_PAYLOAD + rtp_header_len; } }

1 0

[commit] r3794 - in freeswitch/trunk/src: . mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 22 Dec '06

22 Dec '06

Author: anthm Date: Fri Dec 22 09:50:48 2006 New Revision: 3794 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/trunk/src/switch_ivr.c Log: make substitution dynamic Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Fri Dec 22 09:50:48 2006 @@ -150,11 +150,19 @@ for (xaction = switch_xml_child(xcond, "action"); xaction; xaction = xaction->next) { char *application = (char*) switch_xml_attr_soft(xaction, "application"); char *data = (char *) switch_xml_attr_soft(xaction, "data"); - char substituted[1024] = ""; + char *substituted = NULL; + switch_size_t len = 0; char *app_data = NULL; if (field && strchr(expression, '(')) { - switch_perform_substitution(re, proceed, data, field_data, substituted, sizeof(substituted), ovector); + len = strlen(data) + strlen(field_data) + 10; + if (!(substituted = malloc(len))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); + proceed = 0; + goto done; + } + memset(substituted, 0, len); + switch_perform_substitution(re, proceed, data, field_data, substituted, len, ovector); app_data = substituted; } else { app_data = data; @@ -170,6 +178,7 @@ } switch_caller_extension_add_application(session, *extension, application, app_data); + switch_safe_free(substituted); } switch_clean_re(re); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Fri Dec 22 09:50:48 2006 @@ -4487,17 +4487,26 @@ if (pattern) { pcre *re = NULL; int proceed = 0, ovector[30]; - char substituted[1024] = ""; + char *substituted = NULL; + switch_size_t len = 0; char *odata = NULL; char *expanded = NULL; - + if ((proceed = switch_perform_regex(data, pattern, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) { for (action = switch_xml_child(input, "action"); action; action = action->next) { char *adata = (char *) switch_xml_attr_soft(action, "data"); char *func = (char *) switch_xml_attr_soft(action, "function"); if (strchr(pattern, '(') && strchr(adata, '$')) { - switch_perform_substitution(re, proceed, adata, data, substituted, sizeof(substituted), ovector); + len = strlen(data) + strlen(adata) + 10; + if (!(substituted = malloc(len))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); + switch_clean_re(re); + switch_safe_free(expanded); + goto done; + } + memset(substituted, 0, len); + switch_perform_substitution(re, proceed, adata, data, substituted, len, ovector); odata = substituted; } else { odata = adata; @@ -4566,6 +4575,7 @@ switch_clean_re(re); switch_safe_free(expanded); + switch_safe_free(substituted); } input = input->next;

1 0

[commit] r3792 - freeswitch/trunk/src/mod/say/mod_say_en
by Freeswitch SVN 22 Dec '06

22 Dec '06

Author: mikej Date: Thu Dec 21 22:00:43 2006 New Revision: 3792 Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Log: fix var type and make sure all code paths return a value Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Thu Dec 21 22:00:43 2006 @@ -76,7 +76,7 @@ { char *p = in, *q = out; char *ret = out; - int x = 0; + switch_size_t x = 0; for(;p && *p; p++) { if ((*p > 47 && *p < 58)) { @@ -150,7 +150,7 @@ default: break; } - + return SWITCH_STATUS_SUCCESS; } static switch_status_t en_say(switch_core_session_t *session,

1 0

[commit] r3791 - in freeswitch/trunk/src: include mod/formats/mod_sndfile mod/say/mod_say_en
by Freeswitch SVN 22 Dec '06

22 Dec '06

Author: anthm Date: Thu Dec 21 21:13:56 2006 New Revision: 3791 Modified: freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Log: refactor say api to try and develop a good working example template Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Thu Dec 21 21:13:56 2006 @@ -417,13 +417,7 @@ /*! the name of the interface */ const char *interface_name; /*! function to pass down to the module */ - switch_status_t (*say_function)(switch_core_session_t *session, - char *tosay, - switch_say_type_t type, - switch_say_method_t method, - switch_input_callback_function_t dtmf_callback, - void *buf, - uint32_t buflen); + switch_say_callback_t say_function; const struct switch_say_interface *next; }; Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu Dec 21 21:13:56 2006 @@ -891,7 +891,6 @@ typedef struct switch_asr_interface switch_asr_interface_t; typedef struct switch_directory_interface switch_directory_interface_t; typedef struct switch_chat_interface switch_chat_interface_t; -typedef struct switch_say_interface switch_say_interface_t; typedef struct switch_core_port_allocator switch_core_port_allocator_t; typedef struct switch_media_bug switch_media_bug_t; typedef void (*switch_media_bug_callback_t)(switch_media_bug_t *, void *, switch_abc_type_t); @@ -917,6 +916,14 @@ switch_input_type_t input_type, void *buf, unsigned int buflen); +typedef struct switch_say_interface switch_say_interface_t; +typedef switch_status_t (*switch_say_callback_t)(switch_core_session_t *session, + char *tosay, + switch_say_type_t type, + switch_say_method_t method, + switch_input_callback_function_t input_callback, + void *buf, + uint32_t buflen); typedef int (*switch_core_db_callback_func_t)(void *pArg, int argc, char **argv, char **columnNames); typedef switch_status_t (*switch_module_load_t) (switch_loadable_module_interface_t **, char *); typedef switch_status_t (*switch_module_reload_t) (void); Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Thu Dec 21 21:13:56 2006 @@ -135,7 +135,7 @@ return SWITCH_STATUS_GENERR; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Opening File [%s] %dhz\n", path, context->sfinfo.samplerate); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Opening File [%s] %dhz\n", path, context->sfinfo.samplerate); handle->samples = (unsigned int) context->sfinfo.frames; handle->samplerate = context->sfinfo.samplerate; handle->channels = (uint8_t)context->sfinfo.channels; Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Thu Dec 21 21:13:56 2006 @@ -33,115 +33,152 @@ static const char modname[] = "mod_say_en"; -static switch_status_t en_say(switch_core_session_t *session, - char *tosay, - switch_say_type_t type, - switch_say_method_t method, - switch_input_callback_function_t input_callback, - void *buf, - uint32_t buflen) +typedef struct { + switch_core_session_t *session; + switch_input_callback_function_t input_callback; + void *buf; + uint32_t buflen; +} common_args_t; + +static void play_group(int a, int b, int c, char *what, common_args_t *args) { - switch_channel_t *channel; + char tmp[80] = ""; - assert(session != NULL); - channel = switch_core_session_get_channel(session); - assert(channel != NULL); - - switch(type) { - case SST_NUMBER: - case SST_ITEMS: - case SST_PERSONS: - case SST_MESSAGES: - { - int in; - int x, places[7] = {0}; - char tmp[25]; + if (a) { + snprintf(tmp, sizeof(tmp), "digits/%d.wav", a); + switch_ivr_play_file(args->session, NULL, tmp, NULL, args->input_callback, args->buf, args->buflen); + switch_ivr_play_file(args->session, NULL, "digits/hundred.wav", NULL, args->input_callback, args->buf, args->buflen); + } - in = atoi(tosay); + if (b) { + if (b > 1) { + snprintf(tmp, sizeof(tmp), "digits/%d0.wav", b); + switch_ivr_play_file(args->session, NULL, tmp, NULL, args->input_callback, args->buf, args->buflen); + } else { + snprintf(tmp, sizeof(tmp), "digits/%d%d.wav", b, c); + switch_ivr_play_file(args->session, NULL, tmp, NULL, args->input_callback, args->buf, args->buflen); + c = 0; + } + } - for(x = 6; x >= 0; x--) { - int num = (int)pow(10, x); - if ((places[x] = in / num)) { - in -= places[x] * num; - } - } + if (c) { + snprintf(tmp, sizeof(tmp), "digits/%d.wav", c); + switch_ivr_play_file(args->session, NULL, tmp, NULL, args->input_callback, args->buf, args->buflen); + } - switch (method) { - case SSM_PRONOUNCED: - if (places[6]) { - snprintf(tmp, sizeof(tmp), "digits/%d.wav", places[6]); - switch_ivr_play_file(session, NULL, tmp, NULL, input_callback, buf, buflen); - switch_ivr_play_file(session, NULL, "digits/million.wav", NULL, input_callback, buf, buflen); - } + if (what && (a || b || c)) { + switch_ivr_play_file(args->session, NULL, what, NULL, args->input_callback, args->buf, args->buflen); + } - if (places[5]) { - snprintf(tmp, sizeof(tmp), "digits/%d.wav", places[5]); - switch_ivr_play_file(session, NULL, tmp, NULL, input_callback, buf, buflen); - switch_ivr_play_file(session, NULL, "digits/hundred.wav", NULL, input_callback, buf, buflen); - } - - if (places[4]) { - if (places[4] > 1) { - snprintf(tmp, sizeof(tmp), "digits/%d0.wav", places[4]); - switch_ivr_play_file(session, NULL, tmp, NULL, input_callback, buf, buflen); - } else { - snprintf(tmp, sizeof(tmp), "digits/%d%d.wav", places[4], places[3]); - switch_ivr_play_file(session, NULL, tmp, NULL, input_callback, buf, buflen); - places[3] = 0; - } - } - - if (places[3]) { - snprintf(tmp, sizeof(tmp), "digits/%d.wav", places[3]); - switch_ivr_play_file(session, NULL, tmp, NULL, input_callback, buf, buflen); - } +} + +static char *strip_commas(char *in, char *out, switch_size_t len) +{ + char *p = in, *q = out; + char *ret = out; + int x = 0; + + for(;p && *p; p++) { + if ((*p > 47 && *p < 58)) { + *q++ = *p; + } else if (*p != ',') { + ret = NULL; + break; + } - if (places[5] || places[4] || places[3]) { - switch_ivr_play_file(session, NULL, "digits/thousand.wav", NULL, input_callback, buf, buflen); - } + if (++x > len) { + ret = NULL; + break; + } + } - if (places[2]) { - snprintf(tmp, sizeof(tmp), "digits/%d.wav", places[2]); - switch_ivr_play_file(session, NULL, tmp, NULL, input_callback, buf, buflen); - switch_ivr_play_file(session, NULL, "digits/hundred.wav", NULL, input_callback, buf, buflen); - } + return ret; +} - if (places[1]) { - if (places[1] > 1) { - snprintf(tmp, sizeof(tmp), "digits/%d0.wav", places[1]); - switch_ivr_play_file(session, NULL, tmp, NULL, input_callback, buf, buflen); - } else { - snprintf(tmp, sizeof(tmp), "digits/%d%d.wav", places[1], places[0]); - switch_ivr_play_file(session, NULL, tmp, NULL, input_callback, buf, buflen); - places[0] = 0; - } - } +static switch_status_t en_say_general_count(switch_core_session_t *session, + char *tosay, + switch_say_type_t type, + switch_say_method_t method, + switch_input_callback_function_t input_callback, + void *buf, + uint32_t buflen) +{ + switch_channel_t *channel; + int in; + int x = 0, places[9] = {0}; + char tmp[80] = ""; + char sbuf[13] = ""; + common_args_t args = {0}; - if (places[0]) { - snprintf(tmp, sizeof(tmp), "digits/%d.wav", places[0]); - switch_ivr_play_file(session, NULL, tmp, NULL, input_callback, buf, buflen); - } + assert(session != NULL); + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + args.session = session; + args.input_callback = input_callback; + args.buf = buf; + args.buflen = buflen; + + if (!(tosay = strip_commas(tosay, sbuf, sizeof(sbuf))) || strlen(tosay) > 9) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n"); + return SWITCH_STATUS_GENERR; + } - break; - case SSM_ITERATED: - for(x = 7; x >= 0; x--) { - if (places[x]) { - snprintf(tmp, sizeof(tmp), "digits/%d.wav", places[x]); - switch_ivr_play_file(session, NULL, tmp, NULL, input_callback, buf, buflen); - } - } - break; - default: - break; + in = atoi(tosay); + + for(x = 8; x >= 0; x--) { + int num = (int)pow(10, x); + if ((places[x] = in / num)) { + in -= places[x] * num; + } + } + + switch (method) { + case SSM_PRONOUNCED: + play_group(places[8], places[7], places[6], "digits/million.wav", &args); + play_group(places[5], places[4], places[3], "digits/thousand.wav", &args); + play_group(places[2], places[1], places[0], NULL, &args); + break; + case SSM_ITERATED: + for(x = 8; x >= 0; x--) { + if (places[x]) { + snprintf(tmp, sizeof(tmp), "digits/%d.wav", places[x]); + switch_ivr_play_file(session, NULL, tmp, NULL, input_callback, buf, buflen); } } break; default: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Finish ME!\n"); break; } +} +static switch_status_t en_say(switch_core_session_t *session, + char *tosay, + switch_say_type_t type, + switch_say_method_t method, + switch_input_callback_function_t input_callback, + void *buf, + uint32_t buflen) +{ + + switch_say_callback_t say_cb = NULL; + + switch(type) { + case SST_NUMBER: + case SST_ITEMS: + case SST_PERSONS: + case SST_MESSAGES: + say_cb = en_say_general_count; + break; + default: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Finish ME!\n"); + break; + } + + if (say_cb) { + say_cb(session, tosay, type, method, input_callback, buf, buflen); + } return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r3790 - freeswitch/trunk/src/mod/say/mod_say_en
by Freeswitch SVN 21 Dec '06

21 Dec '06

Author: mikej Date: Thu Dec 21 17:48:25 2006 New Revision: 3790 Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Log: fix it to say thousand for the hundred thousands place. Modified: freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_en/mod_say_en.c Thu Dec 21 17:48:25 2006 @@ -96,7 +96,7 @@ switch_ivr_play_file(session, NULL, tmp, NULL, input_callback, buf, buflen); } - if (places[4] || places[3]) { + if (places[5] || places[4] || places[3]) { switch_ivr_play_file(session, NULL, "digits/thousand.wav", NULL, input_callback, buf, buflen); }

1 0

[commit] r3789 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 21 Dec '06

21 Dec '06

Author: mikej Date: Thu Dec 21 17:01:20 2006 New Revision: 3789 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: disable controls until there is security 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 Thu Dec 21 17:01:20 2006 @@ -3818,12 +3818,17 @@ if (strcasecmp(argv[0], "list") == 0) { conference_list_pretty(conference, &stream); /* provide help */ - } else if (strcasecmp(argv[0], "help") == 0 || strcasecmp(argv[0], "commands") == 0) { - stream.write_function(&stream, "%s\n", conf_api_interface.syntax); - /* find a normal command */ - } else { - conf_api_dispatch(conference, &stream, argc, argv, (const char *)body, 0); + } +#if 0 + else { + if (strcasecmp(argv[0], "help") == 0 || strcasecmp(argv[0], "commands") == 0) { + stream.write_function(&stream, "%s\n", conf_api_interface.syntax); + /* find a normal command */ + } else { + conf_api_dispatch(conference, &stream, argc, argv, (const char *)body, 0); + } } +#endif } else { stream.write_function(&stream, "No parameters specified.\nTry 'help'\n"); }

1 0