- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13016 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by FreeSWITCH SVN 14 Apr '09

14 Apr '09

Author: anthm Date: Tue Apr 14 11:45:35 2009 New Revision: 13016 Log: add destroy method to js Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Apr 14 11:45:35 2009 @@ -2216,6 +2216,40 @@ return ret; } +static JSBool session_detach(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) +{ + struct js_session *jss = JS_GetPrivate(cx, obj); + jsval ret = JS_TRUE; + switch_call_cause_t cause = 0; + switch_channel_t *channel; + switch_core_session_t *session; + METHOD_SANITY_CHECK(); + + if ((session = jss->session)) { + jss->session = NULL; + + if (argc > 1) { + if (JSVAL_IS_INT(argv[0])) { + int32 i = 0; + JS_ValueToInt32(cx, argv[0], &i); + cause = i; + } + } + + if (cause) { + channel = switch_core_session_get_channel(session); + switch_channel_hangup(channel, cause); + } + + switch_core_session_rwunlock(session); + *rval = JS_TRUE; + } else { + *rval = JS_FALSE; + } + + return ret; +} + static JSBool session_execute(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) { JSBool retval = JS_FALSE; @@ -2617,6 +2651,7 @@ {"sendEvent", session_send_event, 0}, {"hangup", session_hangup, 0}, {"execute", session_execute, 0}, + {"destroy", session_detach, 0}, {"sleep", session_sleep, 1}, {0} };

1 0

[commit] r13015 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 14 Apr '09

14 Apr '09

Author: anthm Date: Tue Apr 14 10:24:30 2009 New Revision: 13015 Log: run expand_vars if input contains a special escaped character not just when it contains a variable to eat up back slashes Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_ivr_play_say.c freeswitch/trunk/src/switch_utils.c Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Tue Apr 14 10:24:30 2009 @@ -87,7 +87,20 @@ } +static inline int switch_string_has_escaped_data(const char *in) +{ + const char *i = strchr(in, '\\'); + while (i && *i == '\\') { + i++; + if (*i == '\\' || *i == 'n' || *i == 's' || *i == 't') { + return 1; + } + i = strchr(i, '\\'); + } + + return 0; +} SWITCH_DECLARE(switch_status_t) switch_b64_encode(unsigned char *in, switch_size_t ilen, unsigned char *out, switch_size_t olen); SWITCH_DECLARE(switch_size_t) switch_b64_decode(char *in, char *out, switch_size_t olen); Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Apr 14 10:24:30 2009 @@ -1916,7 +1916,7 @@ return (char *) in; } - nv = switch_string_var_check_const(in); + nv = switch_string_var_check_const(in) || switch_string_has_escaped_data(in); if (!nv) { return (char *) in; Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Apr 14 10:24:30 2009 @@ -1331,7 +1331,7 @@ char *func_val = NULL; int nv = 0; - nv = switch_string_var_check_const(in); + nv = switch_string_var_check_const(in) || switch_string_has_escaped_data(in); if (!nv) { return (char *) in; Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Tue Apr 14 10:24:30 2009 @@ -1559,6 +1559,7 @@ if (switch_strlen_zero(digits_regex)) { return SWITCH_STATUS_SUCCESS; } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Test Regex [%s][%s]\n", digit_buffer, digits_regex); if (switch_regex_match(digit_buffer, digits_regex) == SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_SUCCESS; } else { Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue Apr 14 10:24:30 2009 @@ -61,7 +61,6 @@ } #endif - SWITCH_DECLARE(switch_status_t) switch_frame_alloc(switch_frame_t **frame, switch_size_t size) { switch_frame_t *new_frame;

1 0

[commit] r13014 - freeswitch/trunk/src/mod/endpoints/mod_opal
by FreeSWITCH SVN 14 Apr '09

14 Apr '09

Author: robertj Date: Tue Apr 14 02:10:55 2009 New Revision: 13014 Log: Applied patch to fix some race conditions on call termination, thanks Peter Olsson Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp Tue Apr 14 02:10:55 2009 @@ -72,12 +72,12 @@ /*.on_hangup */ on_hangup, /*.on_exchange_media */ FSConnection::on_exchange_media, /*.on_soft_execute */ FSConnection::on_soft_execute, - /*.on_consume_media*/ NULL, - /*.on_hibernate*/ NULL, - /*.on_reset*/ NULL, - /*.on_park*/ NULL, - /*.on_reporting*/ NULL, - /*.on_destroy*/ on_destroy + /*.on_consume_media*/ NULL, + /*.on_hibernate*/ NULL, + /*.on_reset*/ NULL, + /*.on_park*/ NULL, + /*.on_reporting*/ NULL, + /*.on_destroy*/ on_destroy }; @@ -510,7 +510,20 @@ OpalLocalConnection *FSEndPoint::CreateConnection(OpalCall & call, void *userData) { - return new FSConnection(call, *this, (switch_caller_profile_t *)userData); + FSManager & mgr = (FSManager &) GetManager(); + switch_core_session_t *fsSession = switch_core_session_request(mgr.GetSwitchInterface(), + (switch_caller_profile_t *)userData ? SWITCH_CALL_DIRECTION_OUTBOUND : SWITCH_CALL_DIRECTION_INBOUND, NULL); + if (fsSession == NULL) + return NULL; + + switch_channel_t *fsChannel = switch_core_session_get_channel(fsSession); + + if (fsChannel == NULL) { + switch_core_session_destroy(&fsSession); + return NULL; + } + + return new FSConnection(call, *this, (switch_caller_profile_t *)userData, fsSession, fsChannel); } @@ -543,15 +556,13 @@ /////////////////////////////////////////////////////////////////////// -FSConnection::FSConnection(OpalCall & call, FSEndPoint & endpoint, switch_caller_profile_t *outbound_profile) +FSConnection::FSConnection(OpalCall & call, FSEndPoint & endpoint, switch_caller_profile_t *outbound_profile, switch_core_session_t *fsSession, switch_channel_t *fsChannel) : OpalLocalConnection(call, endpoint, NULL) , m_endpoint(endpoint) + , m_fsSession(fsSession) + , m_fsChannel(fsChannel) { opal_private_t *tech_pvt; - FSManager & mgr = (FSManager &) endpoint.GetManager(); - m_fsSession = switch_core_session_request(mgr.GetSwitchInterface(), - outbound_profile ? SWITCH_CALL_DIRECTION_OUTBOUND : SWITCH_CALL_DIRECTION_INBOUND, NULL); - m_fsChannel = switch_core_session_get_channel(m_fsSession); tech_pvt = (opal_private_t *) switch_core_session_alloc(m_fsSession, sizeof(*tech_pvt)); tech_pvt->me = this; @@ -679,8 +690,7 @@ PBoolean FSConnection::SendUserInputTone(char tone, unsigned duration) { switch_dtmf_t dtmf = { tone, duration }; - - return (switch_channel_queue_dtmf(m_fsChannel, &dtmf) == SWITCH_STATUS_SUCCESS) ? true : false; + return switch_channel_queue_dtmf(m_fsChannel, &dtmf) == SWITCH_STATUS_SUCCESS; } OpalMediaFormatList FSConnection::GetMediaFormats() const @@ -697,37 +707,37 @@ { int numCodecs = 0; const switch_codec_implementation_t *codecs[SWITCH_MAX_CODECS]; - const char *codec_string = NULL, *abs, *ocodec; + const char *codec_string = NULL, *abs, *ocodec; char *tmp_codec_string = NULL; char *codec_order[SWITCH_MAX_CODECS]; int codec_order_last; - if ((abs = switch_channel_get_variable(m_fsChannel, "absolute_codec_string"))) { - codec_string = abs; - } else { - if ((abs = switch_channel_get_variable(m_fsChannel, "codec_string"))) { + if ((abs = switch_channel_get_variable(m_fsChannel, "absolute_codec_string"))) { + codec_string = abs; + } else { + if ((abs = switch_channel_get_variable(m_fsChannel, "codec_string"))) { codec_string = abs; - } + } - if ((ocodec = switch_channel_get_variable(m_fsChannel, SWITCH_ORIGINATOR_CODEC_VARIABLE))) { + if ((ocodec = switch_channel_get_variable(m_fsChannel, SWITCH_ORIGINATOR_CODEC_VARIABLE))) { codec_string = switch_core_session_sprintf(m_fsSession, "%s,%s", ocodec, codec_string); - } - } + } + } if (!codec_string) { codec_string = mod_opal_globals.codec_string; } - if (codec_string) { - if ((tmp_codec_string = strdup(codec_string))) { - codec_order_last = switch_separate_string(tmp_codec_string, ',', codec_order, SWITCH_MAX_CODECS); + if (codec_string) { + if ((tmp_codec_string = strdup(codec_string))) { + codec_order_last = switch_separate_string(tmp_codec_string, ',', codec_order, SWITCH_MAX_CODECS); numCodecs = switch_loadable_module_get_codecs_sorted(codecs, SWITCH_MAX_CODECS, codec_order, codec_order_last); - } - } else { - numCodecs = switch_loadable_module_get_codecs(codecs, sizeof(codecs) / sizeof(codecs[0])); - } + } + } else { + numCodecs = switch_loadable_module_get_codecs(codecs, sizeof(codecs) / sizeof(codecs[0])); + } for (int i = 0; i < numCodecs; i++) { const switch_codec_implementation_t *codec = codecs[i]; @@ -843,34 +853,34 @@ { //switch_channel_t *channel = switch_core_session_get_channel(session); opal_private_t *tech_pvt = (opal_private_t *) switch_core_session_get_private(session); - + if (tech_pvt) { - if (tech_pvt->read_codec.implementation) { - switch_core_codec_destroy(&tech_pvt->read_codec); - } + if (tech_pvt->read_codec.implementation) { + switch_core_codec_destroy(&tech_pvt->read_codec); + } - if (tech_pvt->write_codec.implementation) { - switch_core_codec_destroy(&tech_pvt->write_codec); - } + if (tech_pvt->write_codec.implementation) { + switch_core_codec_destroy(&tech_pvt->write_codec); + } - if (tech_pvt->vid_read_codec.implementation) { - switch_core_codec_destroy(&tech_pvt->vid_read_codec); - } + if (tech_pvt->vid_read_codec.implementation) { + switch_core_codec_destroy(&tech_pvt->vid_read_codec); + } - if (tech_pvt->vid_write_codec.implementation) { - switch_core_codec_destroy(&tech_pvt->vid_write_codec); - } + if (tech_pvt->vid_write_codec.implementation) { + switch_core_codec_destroy(&tech_pvt->vid_write_codec); + } - if (tech_pvt->read_timer.timer_interface) { - switch_core_timer_destroy(&tech_pvt->read_timer); - } + if (tech_pvt->read_timer.timer_interface) { + switch_core_timer_destroy(&tech_pvt->read_timer); + } - if (tech_pvt->vid_read_timer.timer_interface) { - switch_core_timer_destroy(&tech_pvt->vid_read_timer); - } + if (tech_pvt->vid_read_timer.timer_interface) { + switch_core_timer_destroy(&tech_pvt->vid_read_timer); + } } - return SWITCH_STATUS_SUCCESS; + return SWITCH_STATUS_SUCCESS; } /* this function has to be called with the original session beause the FSConnection might already be destroyed and we @@ -888,7 +898,7 @@ tech_pvt->me->ClearCallSynchronous(NULL, H323TranslateToCallEndReason(cause, UINT_MAX)); tech_pvt->me = NULL; } - + return SWITCH_STATUS_SUCCESS; } @@ -974,6 +984,14 @@ OnAlerting(); break; + case SWITCH_MESSAGE_INDICATE_DEFLECT: + { + char transfer_to[128] = ""; + switch_set_string(transfer_to, msg->string_arg); + TransferConnection(transfer_to); + break; + } + case SWITCH_MESSAGE_INDICATE_PROGRESS: case SWITCH_MESSAGE_INDICATE_ANSWER: { @@ -1163,6 +1181,7 @@ m_switchCodec->implementation->samples_per_packet, switch_core_session_get_pool(m_fsSession)) != SWITCH_STATUS_SUCCESS) { switch_core_codec_destroy(m_switchCodec); + m_switchCodec = NULL; return false; } } else { @@ -1189,7 +1208,12 @@ { if (!IsOpen()) return false; - + + /* forget these FS will properly destroy them for us */ + + m_switchTimer = NULL; + m_switchCodec = NULL; + return OpalMediaStream::Close(); } @@ -1205,6 +1229,21 @@ return false; } +bool FSMediaStream::CheckPatchAndLock() +{ + if (GetConnection().GetPhase() >= GetConnection().ReleasingPhase || !IsOpen()) + return false; + + if (LockReadWrite()) { + if (!GetPatch() || !IsOpen()) { + UnlockReadWrite(); + return false; + } + return true; + } else { + return false; + } +} switch_status_t FSMediaStream::read_frame(switch_frame_t **frame, switch_io_flag_t flags) { @@ -1222,16 +1261,27 @@ while(!GetPatch()) { switch_cond_next(); } - GetPatch()->OnPatchStart(); - m_callOnStart = false; + if (CheckPatchAndLock()) { + GetPatch()->OnPatchStart(); + m_callOnStart = false; + UnlockReadWrite(); + } else { + return SWITCH_STATUS_FALSE; + } } m_readFrame.flags = 0; /* while (switch_channel_ready(m_fsChannel)) { - if (!GetPatch()->GetSource().ReadPacket(m_readRTP)) { - return SWITCH_STATUS_FALSE; + if (CheckPatchAndLock()) { + if (!GetPatch()->GetSource().ReadPacket(m_readRTP)) { + UnlockReadWrite(); + return SWITCH_STATUS_FALSE; + } + UnlockReadWrite(); + } else { + return SWITCH_STATUS_FALSE; } if ((m_readFrame.datalen = m_readRTP.GetPayloadSize()) || switch_core_timer_check(&m_switchTimer, SWITCH_FALSE) == SWITCH_STATUS_SUCCESS) { @@ -1249,9 +1299,16 @@ if (switch_channel_test_private_flag(m_fsChannel, CF_NEED_FLUSH)) { switch_channel_clear_private_flag(m_fsChannel, CF_NEED_FLUSH); for(;;) { - if (!GetPatch()->GetSource().ReadPacket(m_readRTP)) { - return SWITCH_STATUS_FALSE; + if (CheckPatchAndLock()) { + if (!GetPatch()->GetSource().ReadPacket(m_readRTP)) { + UnlockReadWrite(); + return SWITCH_STATUS_FALSE; + } + UnlockReadWrite(); + } else { + return SWITCH_STATUS_FALSE; } + if (!m_readRTP.GetPayloadSize()) { m_readFrame.flags = SFF_CNG; break; @@ -1259,8 +1316,14 @@ } } else { - if (!m_switchTimer || !GetPatch()->GetSource().ReadPacket(m_readRTP)) { - return SWITCH_STATUS_FALSE; + if (CheckPatchAndLock()) { + if (!m_switchTimer || !GetPatch()->GetSource().ReadPacket(m_readRTP)) { + UnlockReadWrite(); + return SWITCH_STATUS_FALSE; + } + UnlockReadWrite(); + } else { + return SWITCH_STATUS_FALSE; } switch_core_timer_next(m_switchTimer); @@ -1303,8 +1366,13 @@ } if (m_callOnStart) { - GetPatch()->OnPatchStart(); - m_callOnStart = false; + if (CheckPatchAndLock()) { + GetPatch()->OnPatchStart(); + m_callOnStart = false; + UnlockReadWrite(); + } else { + return SWITCH_STATUS_FALSE; + } } if ((frame->flags & SFF_CNG)) { @@ -1313,8 +1381,15 @@ if ((frame->flags & SFF_RAW_RTP) != 0) { RTP_DataFrame rtp((const BYTE *) frame->packet, frame->packetlen, false); - if (GetPatch()->PushFrame(rtp)) { - return SWITCH_STATUS_SUCCESS; + + if (CheckPatchAndLock()) { + if (GetPatch()->PushFrame(rtp)) { + UnlockReadWrite(); + return SWITCH_STATUS_SUCCESS; + } + UnlockReadWrite(); + } else { + return SWITCH_STATUS_FALSE; } } @@ -1337,8 +1412,14 @@ memcpy(rtp.GetPayloadPtr(), frame->data, frame->datalen); - if (GetPatch()->PushFrame(rtp)) { - return SWITCH_STATUS_SUCCESS; + if (CheckPatchAndLock()) { + if (GetPatch()->PushFrame(rtp)) { + UnlockReadWrite(); + return SWITCH_STATUS_SUCCESS; + } + UnlockReadWrite(); + } else { + return SWITCH_STATUS_FALSE; } Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Tue Apr 14 02:10:55 2009 @@ -177,7 +177,11 @@ PCLASSINFO(FSConnection, OpalLocalConnection) public: - FSConnection(OpalCall & call, FSEndPoint & endpoint, switch_caller_profile_t *outbound_profile); + FSConnection(OpalCall & call, + FSEndPoint & endpoint, + switch_caller_profile_t *outbound_profile, + switch_core_session_t *fsSession, + switch_channel_t *fsChannel); virtual bool OnIncoming(); virtual void OnReleased(); @@ -194,7 +198,6 @@ DECLARE_CALLBACK0(on_init); DECLARE_CALLBACK0(on_routing); DECLARE_CALLBACK0(on_execute); - //DECLARE_CALLBACK0(on_hangup); DECLARE_CALLBACK0(on_exchange_media); DECLARE_CALLBACK0(on_soft_execute); @@ -251,6 +254,8 @@ RTP_DataFrame m_readRTP; bool m_callOnStart; uint32_t m_timeStamp; + + bool CheckPatchAndLock(); };

1 0

[commit] r13013 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 14 Apr '09

14 Apr '09

Author: anthm Date: Mon Apr 13 21:29:34 2009 New Revision: 13013 Log: kill zombies Modified: freeswitch/trunk/libs/esl/ivrd.c Modified: freeswitch/trunk/libs/esl/ivrd.c ============================================================================== --- freeswitch/trunk/libs/esl/ivrd.c (original) +++ freeswitch/trunk/libs/esl/ivrd.c Mon Apr 13 21:29:34 2009 @@ -35,22 +35,25 @@ #include <stdlib.h> #include <esl.h> + static void mycallback(esl_socket_t server_sock, esl_socket_t client_sock, struct sockaddr_in *addr) { esl_handle_t handle = {{0}}; char path_buffer[1024] = { 0 }; const char *path; - + if (fork()) { close(client_sock); return; } + esl_attach_handle(&handle, client_sock, addr); if (!(path = esl_event_get_header(handle.info_event, "variable_ivr_path"))) { + esl_disconnect(&handle); esl_log(ESL_LOG_ERROR, "Missing ivr_path param!\n"); - return; + exit(0); } strncpy(path_buffer, path, sizeof(path_buffer) - 1); @@ -63,12 +66,10 @@ handle.sock = -1; esl_disconnect(&handle); - /* DOH! we're still here! Close the socket. */ - execl(path_buffer, path_buffer, NULL); - esl_log(ESL_LOG_ERROR, "Error %d\n", client_sock); + //system(path_buffer); close(client_sock); - + exit(0); } int main(int argc, char *argv[]) @@ -92,6 +93,8 @@ return -1; } + signal(SIGCHLD, SIG_IGN); + esl_listen(ip, port, mycallback); return 0;

1 0

[commit] r13012 - freeswitch/trunk/libs/esl/perl/ESL
by FreeSWITCH SVN 13 Apr '09

13 Apr '09

Author: anthm Date: Mon Apr 13 18:09:32 2009 New Revision: 13012 Log: fix undef check Modified: freeswitch/trunk/libs/esl/perl/ESL/IVR.pm Modified: freeswitch/trunk/libs/esl/perl/ESL/IVR.pm ============================================================================== --- freeswitch/trunk/libs/esl/perl/ESL/IVR.pm (original) +++ freeswitch/trunk/libs/esl/perl/ESL/IVR.pm Mon Apr 13 18:09:32 2009 @@ -43,14 +43,12 @@ my $input; if ($e) { - $input = $e->getBody() . "\n"; - if ($input eq "_undef_") { + $input = $e->getBody(); + if ($input && $input eq "_undef_") { $input = undef; } } - chomp $input; - return $input; }

1 0

[commit] r13011 - in freeswitch/trunk/src: . include mod/endpoints/mod_loopback
by FreeSWITCH SVN 13 Apr '09

13 Apr '09

Author: anthm Date: Mon Apr 13 13:35:26 2009 New Revision: 13011 Log: clone frames in loopback so we can smooth it out better, now with more memory usage (tm) maybe this will curb pepople from using it like candy Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c freeswitch/trunk/src/switch_utils.c Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Apr 13 13:35:26 2009 @@ -896,6 +896,7 @@ SFF_RTP_HEADER = (1 << 2) - Get the rtp header from the frame header SFF_PLC = (1 << 3) - Frame has generated PLC data SFF_RFC2833 = (1 << 4) - Frame has rfc2833 dtmf data +SFF_DYNAMIC = (1 << 5) - Frame is dynamic and should be freed </pre> */ typedef enum { @@ -905,7 +906,8 @@ SFF_RTP_HEADER = (1 << 2), SFF_PLC = (1 << 3), SFF_RFC2833 = (1 << 4), - SFF_PROXY_PACKET = (1 << 5) + SFF_PROXY_PACKET = (1 << 5), + SFF_DYNAMIC = (1 << 6) } switch_frame_flag_enum_t; typedef uint32_t switch_frame_flag_t; Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Mon Apr 13 13:35:26 2009 @@ -109,6 +109,10 @@ SWITCH_DECLARE(switch_size_t) switch_fd_read_line(int fd, char *buf, switch_size_t len); +SWITCH_DECLARE(switch_status_t) switch_frame_alloc(switch_frame_t **frame, switch_size_t size); +SWITCH_DECLARE(switch_status_t) switch_frame_dup(switch_frame_t *orig, switch_frame_t **clone); +SWITCH_DECLARE(switch_status_t) switch_frame_free(switch_frame_t **frame); + /*! \brief Evaluate the truthfullness of a string expression \param expr a string expression Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Mon Apr 13 13:35:26 2009 @@ -69,7 +69,7 @@ unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE]; switch_frame_t *x_write_frame; - switch_frame_t write_frame; + switch_frame_t *write_frame; unsigned char write_databuf[SWITCH_RECOMMENDED_BUFFER_SIZE]; switch_frame_t cng_frame; @@ -78,6 +78,7 @@ switch_caller_profile_t *caller_profile; int32_t bowout_frame_count; char *other_uuid; + switch_queue_t *frame_queue; }; typedef struct private_object private_t; @@ -157,10 +158,6 @@ tech_pvt->read_frame.data = tech_pvt->databuf; tech_pvt->read_frame.buflen = sizeof(tech_pvt->databuf); tech_pvt->read_frame.codec = &tech_pvt->read_codec; - - tech_pvt->write_frame.data = tech_pvt->write_databuf; - tech_pvt->write_frame.buflen = sizeof(tech_pvt->write_databuf); - tech_pvt->write_frame.codec = &tech_pvt->write_codec; tech_pvt->cng_frame.data = tech_pvt->cng_databuf; @@ -190,6 +187,7 @@ switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_core_session_set_private(session, tech_pvt); + switch_queue_create(&tech_pvt->frame_queue, 50000, switch_core_session_get_pool(session)); tech_pvt->session = session; tech_pvt->channel = switch_core_session_get_channel(session); } @@ -348,6 +346,7 @@ { switch_channel_t *channel = NULL; private_t *tech_pvt = NULL; + void *pop; channel = switch_core_session_get_channel(session); switch_assert(channel != NULL); @@ -364,6 +363,15 @@ if (switch_core_codec_ready(&tech_pvt->write_codec)) { switch_core_codec_destroy(&tech_pvt->write_codec); } + + if (tech_pvt->write_frame) { + switch_frame_free(&tech_pvt->write_frame); + } + + while (switch_queue_trypop(tech_pvt->frame_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { + switch_frame_t *frame = (switch_frame_t *) pop; + switch_frame_free(&frame); + } } @@ -518,6 +526,7 @@ private_t *tech_pvt = NULL; switch_status_t status = SWITCH_STATUS_FALSE; switch_mutex_t *mutex = NULL; + void *pop = NULL; channel = switch_core_session_get_channel(session); switch_assert(channel != NULL); @@ -539,18 +548,19 @@ goto end; } - if (!switch_test_flag(tech_pvt, TFLAG_CNG) && !switch_test_flag(tech_pvt, TFLAG_WRITE)) { - switch_core_timer_next(&tech_pvt->timer); - } - if (switch_test_flag(tech_pvt, TFLAG_WRITE)) { - *frame = &tech_pvt->write_frame; - switch_clear_flag_locked(tech_pvt, TFLAG_WRITE); - switch_clear_flag_locked(tech_pvt, TFLAG_CNG); + switch_core_timer_next(&tech_pvt->timer); + if (switch_queue_trypop(tech_pvt->frame_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) { + if (tech_pvt->write_frame) { + switch_frame_free(&tech_pvt->write_frame); + } + tech_pvt->write_frame = (switch_frame_t *) pop; + tech_pvt->write_frame->codec = &tech_pvt->read_codec; + *frame = tech_pvt->write_frame; } else { switch_set_flag(tech_pvt, TFLAG_CNG); } - + if (switch_test_flag(tech_pvt, TFLAG_CNG)) { *frame = &tech_pvt->cng_frame; tech_pvt->cng_frame.codec = &tech_pvt->read_codec; @@ -622,17 +632,18 @@ } if (switch_test_flag(tech_pvt, TFLAG_LINKED)) { + switch_frame_t *clone; if (frame->codec->implementation != tech_pvt->write_codec.implementation) { /* change codecs to match */ tech_init(tech_pvt, session, frame->codec); tech_init(tech_pvt->other_tech_pvt, tech_pvt->other_session, frame->codec); } + + if (switch_frame_dup(frame, &clone) != SWITCH_STATUS_SUCCESS) { + abort(); + } - memcpy(&tech_pvt->other_tech_pvt->write_frame, frame, sizeof(*frame)); - tech_pvt->other_tech_pvt->write_frame.data = tech_pvt->other_tech_pvt->write_databuf; - tech_pvt->other_tech_pvt->write_frame.buflen = sizeof(tech_pvt->other_tech_pvt->write_databuf); - //tech_pvt->other_tech_pvt->write_frame.codec = &tech_pvt->other_tech_pvt->write_codec; - memcpy(tech_pvt->other_tech_pvt->write_frame.data, frame->data, frame->datalen); + switch_queue_push(tech_pvt->other_tech_pvt->frame_queue, clone); switch_set_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE); status = SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Mon Apr 13 13:35:26 2009 @@ -61,6 +61,56 @@ } #endif + +SWITCH_DECLARE(switch_status_t) switch_frame_alloc(switch_frame_t **frame, switch_size_t size) +{ + switch_frame_t *new_frame; + + switch_zmalloc(new_frame, sizeof(*new_frame)); + + switch_set_flag(new_frame, SFF_DYNAMIC); + new_frame->buflen = size; + new_frame->data = malloc(size); + switch_assert(new_frame->data); + + *frame = new_frame; + + return SWITCH_STATUS_SUCCESS; +} + + +SWITCH_DECLARE(switch_status_t) switch_frame_dup(switch_frame_t *orig, switch_frame_t **clone) +{ + switch_frame_t *new_frame; + + new_frame = malloc(sizeof(*new_frame)); + + *new_frame = *orig; + switch_set_flag(new_frame, SFF_DYNAMIC); + new_frame->data = malloc(new_frame->buflen); + switch_assert(new_frame->data); + + memcpy(new_frame->data, orig->data, orig->datalen); + new_frame->codec = NULL; + + *clone = new_frame; + + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_DECLARE(switch_status_t) switch_frame_free(switch_frame_t **frame) +{ + if (!frame || !*frame || !switch_test_flag((*frame), SFF_DYNAMIC)) { + return SWITCH_STATUS_FALSE; + } + + free((*frame)->data); + free(*frame); + *frame = NULL; + + return SWITCH_STATUS_SUCCESS; +} + SWITCH_DECLARE(switch_status_t) switch_network_list_create(switch_network_list_t **list, switch_bool_t default_type, switch_memory_pool_t *pool) { switch_network_list_t *new_list;

1 0

[commit] r13010 - freeswitch/trunk/src/mod/codecs/mod_dahdi_codec
by FreeSWITCH SVN 13 Apr '09

13 Apr '09

Author: brian Date: Mon Apr 13 11:15:32 2009 New Revision: 13010 Log: add patch from ml Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Modified: freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_dahdi_codec/mod_dahdi_codec.c Mon Apr 13 11:15:32 2009 @@ -133,9 +133,6 @@ #endif return SWITCH_STATUS_FALSE; } - /* ulaw requires 8 times more storage than g729 and 12 times more than G723, right? */ - context->codec_r = (codec->implementation->ianacode == CODEC_G729_IANA_CODE) - ? 8 : 12; #ifdef DEBUG_DAHDI_CODEC switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Encoding requested and granted with %d/%d.\n", fmts.srcfmt, fmts.dstfmt); @@ -197,6 +194,10 @@ context->encoding_fd = -1; context->decoding_fd = -1; + /* ulaw requires 8 times more storage than g729 and 12 times more than G723, right? */ + context->codec_r = (codec->implementation->ianacode == CODEC_G729_IANA_CODE) + ? 8 : 12; + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r13009 - freeswitch/trunk/src/mod/say/mod_say_ru
by FreeSWITCH SVN 13 Apr '09

13 Apr '09

Author: buklov Date: Mon Apr 13 10:35:10 2009 New Revision: 13009 Log: change char million,thousand to enum Modified: freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.c Modified: freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.c Mon Apr 13 10:35:10 2009 @@ -63,7 +63,13 @@ when, //какого - когда -- без пола what_ //какая/какой/какое с полом } question_t; //вопрос - + +typedef enum { + million, + thousand, + zero, + empty +} unit_t; SWITCH_MODULE_LOAD_FUNCTION(mod_say_ru_load); @@ -111,7 +117,7 @@ //воспроизводить по 3 цифры static switch_status_t play_group( sex_t sex,question_t question, int a, int b, int c, - char *what,int last, switch_core_session_t *session, switch_input_args_t *args) + unit_t what,int last, switch_core_session_t *session, switch_input_args_t *args) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "play group %d %d %d sex=%d q=%d last=%d\n", a,b,c,sex,question,last); if (a) { @@ -122,10 +128,10 @@ switch (sex) { //пол case male: //мужчина say_file("digits/%d00.wav", a); //сто - if (what=="thousand") { + if (what==thousand) { say_file("digits/thousands.wav");//тысяч } - else if (what=="million") { + else if (what==million) { say_file("digits/millions.wav");//миллионов } //------------- @@ -133,20 +139,20 @@ case female: //женщина say_file("digits/%d00.wav", a);//сто - if (what=="thousand") { + if (what==thousand) { say_file("digits/thousands.wav");//тысяч } - else if (what=="million") { + else if (what==million) { say_file("digits/millions.wav");//миллионов } break; //------------- case it: //оно say_file("digits/%d00.wav", a);//сто - if (what=="thousand") { + if (what==thousand) { say_file("digits/thousands.wav"); //тысяч } - else if (what=="million") { + else if (what==million) { say_file("digits/millions.wav");//миллионов } break; @@ -157,7 +163,7 @@ case what_: //какой/я/ое switch (sex) { //пол case male: //мужчина - if (what=="thousand") { + if (what==thousand) { if (last==0) { say_file("digits/h-%d00xx.wav", a);//двухсот say_file("digits/h-millionx.wav");//тысячный @@ -167,7 +173,7 @@ say_file("digits/thousands.wav");//тысяч } } - else if (what=="million") { + else if (what==million) { if (last==0) { say_file("digits/h-%d00xx.wav", a);//двухсот say_file("digits/h-millionm.wav");//Миллионный @@ -183,7 +189,7 @@ break; case female: //женщина - if (what=="thousand") { + if (what==thousand) { if (last==0) { say_file("digits/h-%d00xx.wav", a);//двухсот say_file("digits/h-millionf.wav");//тысячная @@ -193,7 +199,7 @@ say_file("digits/thousands.wav");//тысяч } } - else if (what=="million") { + else if (what==million) { if (last==0) { say_file("digits/h-%d00xx.wav", a);//двухсот say_file("digits/h-millionf.wav");//Миллионная @@ -208,7 +214,7 @@ } break; case it: //оно - if (what=="thousand") { + if (what==thousand) { if (last==0) { say_file("digits/h-%d00xx.wav", a);//двухсот say_file("digits/h-millionn.wav");//тысячное @@ -218,7 +224,7 @@ say_file("digits/thousands.wav");//тысяч } } - else if (what=="million") { + else if (what==million) { if (last==0) { say_file("digits/h-%d00xx.wav", a);//двухсот say_file("digits/h-millionn.wav");//Миллионное @@ -236,7 +242,7 @@ break; //------------------------------------------------------- case when: //какого - когда без пола - if (what=="thousand") { + if (what==thousand) { if (last==0) { say_file("digits/h-%d00xx.wav", a);//двухсот say_file("digits/h-millionx.wav");//тысячного @@ -246,7 +252,7 @@ say_file("digits/thousands.wav");//тысяч } } - else if (what=="million") { + else if (what==million) { if (last==0) { say_file("digits/h-%d00xx.wav", a);//двухсот say_file("digits/h-millionx.wav");//Миллионного @@ -297,10 +303,10 @@ switch (sex) { //пол case male: //мужчина say_file("digits/%d0.wav", b); //двадцать - if (what=="thousand") { + if (what==thousand) { say_file("digits/thousands.wav", b); //тысяч } - else if (what=="millon") { + else if (what==million) { say_file("digits/millions.wav", b); //миллионов } //------------- @@ -308,20 +314,20 @@ case female: //женщина say_file("digits/%d0.wav", b);//двадцать - if (what=="thousand") { + if (what==thousand) { say_file("digits/thousands.wav", b); //тысяч } - else if (what=="millon") { + else if (what==million) { say_file("digits/millions.wav", b); //миллионов } break; //------------- case it: //оно say_file("digits/%d0.wav", b);// двадцать - if (what=="thousand") { + if (what==thousand) { say_file("digits/thousands.wav", b); //тысяч } - else if (what=="millon") { + else if (what==million) { say_file("digits/millions.wav", b); //миллионов } break; @@ -332,7 +338,7 @@ case what_: //какой/я/ое >19 и c==0 20-30-40 switch (sex) { //пол case male: //мужчина - if (what=="thousand") { + if (what==thousand) { if (last==0) { say_file("digits/h-%d0xx.wav", b);//двадцати say_file("digits/h-thousandm.wav", b); //тысячный @@ -342,7 +348,7 @@ say_file("digits/h-thousand.wav", b); //тысяч } } - else if (what=="million") { + else if (what==million) { if (last==0) { say_file("digits/h-%d0xx.wav", b);//двадцати say_file("digits/h-millionm.wav", b); //миллионный @@ -362,7 +368,7 @@ } break; case female: //женщина - if (what=="thousand") { + if (what==thousand) { if (last==0) { say_file("digits/h-%d0xx.wav", b);//двадцати say_file("digits/h-thousandf.wav", b); //тысячная @@ -372,7 +378,7 @@ say_file("digits/h-thousand.wav", b); //тысяч } } - else if (what=="million") { + else if (what==million) { if (last==0) { say_file("digits/h-%d0xx.wav", b);//двадцати say_file("digits/h-millionf.wav", b); //миллионная @@ -392,7 +398,7 @@ } break; case it: //оно - if (what=="thousand") { + if (what==thousand) { if (last==0) { say_file("digits/h-%d0xx.wav", b);//двадцати say_file("digits/h-thousandn.wav", b); //тысячное @@ -402,7 +408,7 @@ say_file("digits/h-thousand.wav", b); //тысяч } } - else if (what=="million") { + else if (what==million) { if (last==0) { say_file("digits/h-%d0xx.wav", b);//двадцати say_file("digits/h-millionn.wav", b); //миллионное @@ -425,7 +431,7 @@ break; //------------------------------------------------------- case when: //какого - когда без пола - if (what=="thousand") { + if (what==thousand) { if (last==0) { say_file("digits/h-%d0xx.wav", b);//двадцати say_file("digits/h-thousandx.wav", b); //тысячного @@ -435,7 +441,7 @@ say_file("digits/h-thousand.wav", b); //тысяч } } - else if (what=="million") { + else if (what==million) { if (last==0) { say_file("digits/h-%d0xx.wav", b);//двадцати say_file("digits/h-millionx.wav", b); //миллионного @@ -468,30 +474,30 @@ switch (sex) { //пол case male: //мужчина say_file("digits/%d%d.wav",b ,c); //девятнадцать - if (what=="thousand") { + if (what==thousand) { say_file("digits/thousands.wav"); //тысяч } - else if (what=="million") { + else if (what==million) { say_file("digits/millions.wav"); //миллионов } //------------- break; case female: //женщина say_file("digits/%d%d.wav",b ,c);//девятнадцать - if (what=="thousand") { + if (what==thousand) { say_file("digits/thousands.wav"); //тысяч } - else if (what=="million") { + else if (what==million) { say_file("digits/millions.wav"); //миллионов } break; //------------- case it: //оно say_file("digits/%d%d.wav",b ,c);// девятнадцать - if (what=="thousand") { + if (what==thousand) { say_file("digits/thousands.wav"); //тысяч } - else if (what=="million") { + else if (what==million) { say_file("digits/millions.wav"); //миллионов } break; @@ -502,7 +508,7 @@ case what_: //какой/я/ое switch (sex) { //пол case male: //женщина - if (what=="thousand") { + if (what==thousand) { if (last==0) { say_file("digits/h-%d%dxx.wav", b,c);//десяти, пятнадцати .. say_file("digits/h-thousandm.wav"); //тысячный @@ -512,7 +518,7 @@ say_file("digits/h-thousand.wav"); //тысяч } } - else if (what=="million") { + else if (what==million) { if (last==0) { say_file("digits/h-%d%dxx.wav", b,c);//десяти, пятнадцати .. say_file("digits/h-millionm.wav"); //миллионный @@ -531,7 +537,7 @@ } } case female: //женщина - if (what=="thousand") { + if (what==thousand) { if (last==0) { say_file("digits/h-%d%dxx.wav", b,c);//десяти, пятнадцати .. say_file("digits/h-thousandf.wav"); //тысячная @@ -541,7 +547,7 @@ say_file("digits/h-thousand.wav"); //тысяч } } - else if (what=="million") { + else if (what==million) { if (last==0) { say_file("digits/h-%d%dxx.wav", b,c);//десяти, пятнадцати .. say_file("digits/h-millionf.wav"); //миллионная @@ -561,7 +567,7 @@ } break; case it: //оно - if (what=="thousand") { + if (what==thousand) { if (last==0) { say_file("digits/h-%d%dxx.wav", b,c);//десяти, пятнадцати .. say_file("digits/h-thousandn.wav"); //тысячное @@ -571,7 +577,7 @@ say_file("digits/h-thousand.wav"); //тысяч } } - else if (what=="million") { + else if (what==million) { if (last==0) { say_file("digits/h-%d%dxx.wav", b,c);//десяти, пятнадцати .. say_file("digits/h-millionn.wav"); //миллионное @@ -594,7 +600,7 @@ break; //------------------------------------------------------- case when: //какого - когда без пола - if (what=="thousand") { + if (what==thousand) { if (last==0) { say_file("digits/h-%d%dxx.wav", b,c);//десяти, пятнадцати .. say_file("digits/h-thousandx.wav"); //тысячного @@ -604,7 +610,7 @@ say_file("digits/h-thousand.wav"); //тысяч } } - else if (what=="million") { + else if (what==million) { if (last==0) { say_file("digits/h-%d%dxx.wav", b,c);//десяти, пятнадцати .. say_file("digits/h-millionx.wav"); //миллионного @@ -633,7 +639,7 @@ - if ((c)||(what=="zero")) {// последняя цифра (самая сложная) или проговорить ноль , для случает когда первые цифры нули + if ((c)||(what==zero)) {// последняя цифра (самая сложная) или проговорить ноль , для случает когда первые цифры нули if (c>2||c==0) {//0 и 3-9 switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "play group c 1\n"); @@ -644,7 +650,7 @@ switch (sex) { //пол case male: //мужчина - if (what=="thousand") { //тысяч + if (what==thousand) { //тысяч if ((c>2)&&(c<5)) { say_file("digits/%d.wav", c);// три - четыре say_file("digits/thousands-i.wav"); //тысячи @@ -654,7 +660,7 @@ say_file("digits/thousands.wav"); //тысяч } } - else if (what=="million") { //миллионов + else if (what==million) { //миллионов if ((c>2)&&(c<5)) { say_file("digits/%d.wav", c);// три четыре say_file("digits/million-a.wav"); //миллиона @@ -670,7 +676,7 @@ break; case female: //женщина - if (what=="thousand") { //тысяч + if (what==thousand) { //тысяч if ((c>2)&&(c<5)) { say_file("digits/%d.wav", c);// три - четыре say_file("digits/thousands-i.wav"); //тысячи @@ -680,7 +686,7 @@ say_file("digits/thousands.wav"); //тысяч } } - else if (what=="million") { //миллионов + else if (what==million) { //миллионов if ((c>2)&&(c<5)) { say_file("digits/%d.wav", c);// три четыре say_file("digits/million-a.wav"); //миллиона @@ -697,7 +703,7 @@ //------------- case it: //оно - if (what=="thousand") { //тысяч + if (what==thousand) { //тысяч if ((c>2)&&(c<5)) { say_file("digits/%d.wav", c);// три - четыре say_file("digits/thousands-i.wav"); //тысячи @@ -707,7 +713,7 @@ say_file("digits/thousands.wav"); //тысяч } } - else if (what=="million") { //миллионов + else if (what==million) { //миллионов if ((c>2)&&(c<5)) { say_file("digits/%d.wav", c);// три четыре say_file("digits/million-a.wav"); //миллиона @@ -728,7 +734,7 @@ switch (sex) { //пол case male: //мужчина - if (what=="thousand") { + if (what==thousand) { if (last==0) {// если дальше нету цифр значит говорить двух, 3-х, 4-х ... say_file("digits/h-%dxx.wav", c);//одна, двух, трёх say_file("digits/h-thousandm.wav"); //тысячный @@ -738,7 +744,7 @@ say_file("digits/thousand.wav"); //тысячи } } - else if (what=="million") { + else if (what==million) { if (last==0) {// если дальше нету цифр значит говорить двух, 3-х, 4-х ... say_file("digits/h-%dxx.wav", c);//одна, двух, трёх say_file("digits/h-millionm.wav"); //миллионный @@ -753,7 +759,7 @@ } break; case female: //женщина - if (what=="thousand") { + if (what==thousand) { if (last==0) {// если дальше нету цифр значит говорить двух, 3-х, 4-х ... say_file("digits/h-%dxx.wav", c);//одна, двух, трёх say_file("digits/h-thousandf.wav"); //тысячная @@ -763,7 +769,7 @@ say_file("digits/thousand.wav"); //тысячи } } - else if (what=="million") { + else if (what==million) { if (last==0) {// если дальше нету цифр значит говорить двух, 3-х, 4-х ... say_file("digits/h-%dxx.wav", c);//одна, двух, трёх say_file("digits/h-millionf.wav"); //миллионная @@ -778,7 +784,7 @@ } break; case it: //оно - if (what=="thousand") { + if (what==thousand) { if (last==0) {// если дальше нету цифр значит говорить двух, 3-х, 4-х ... say_file("digits/h-%dxx.wav", c);//одна, двух, трёх say_file("digits/h-thousandn.wav"); //тысячное @@ -788,7 +794,7 @@ say_file("digits/thousand.wav"); //тысячи } } - else if (what=="million") { + else if (what==million) { if (last==0) {// если дальше нету цифр значит говорить двух, 3-х, 4-х ... say_file("digits/h-%dxx.wav", c);//одна, двух, трёх say_file("digits/h-millionn.wav"); //миллионное @@ -806,7 +812,7 @@ break; //------------------------------------------------------- case when: //какого - когда без пола - if (what=="thousand") { + if (what==thousand) { if (last==0) {// если дальше нету цифр значит говорить двух, 3-х, 4-х ... say_file("digits/h-%dxx.wav", c);//одна, двух, трёх say_file("digits/h-thousandx.wav"); //тысячного @@ -816,7 +822,7 @@ say_file("digits/thousand.wav"); //тысячи } } - else if (what=="million") { + else if (what==million) { if (last==0) {// если дальше нету цифр значит говорить двух, 3-х, 4-х ... say_file("digits/h-%dxx.wav", c);//одна, двух, трёх say_file("digits/h-millionx.wav"); //миллионого @@ -839,7 +845,7 @@ switch (sex) { //пол case male: //мужчина - if (what=="thousand") { + if (what==thousand) { if (c==1) { say_file("digits/%df.wav", c); // одна две say_file("digits/thousand.wav"); //тысяча @@ -849,7 +855,7 @@ say_file("digits/thousands-i.wav"); //тысячи } } - else if (what=="million") { + else if (what==million) { say_file("digits/%d.wav", c); // один два if (c==1) { say_file("digits/million.wav", c); //миллион @@ -864,7 +870,7 @@ break; //------------- case female: //женщина - if (what=="thousand") { + if (what==thousand) { if (c==1) { say_file("digits/%df.wav", c); // одна две say_file("digits/thousand.wav"); //тысяча @@ -874,7 +880,7 @@ say_file("digits/thousands-i.wav"); //тысячи } } - else if (what=="million") { + else if (what==million) { say_file("digits/%d.wav", c); // один два if (c==1) { say_file("digits/million.wav"); //миллион @@ -889,7 +895,7 @@ break; //------------- case it: //оно - if (what=="thousand") { + if (what==thousand) { if (c==1) { say_file("digits/%df.wav", c); // одна две say_file("digits/thousand.wav"); //тысяча @@ -899,7 +905,7 @@ say_file("digits/thousands-i.wav"); //тысячи } } - else if (what=="million") { + else if (what==million) { say_file("digits/%d.wav", c); // один два if (c==1) { say_file("digits/million.wav"); //миллион @@ -919,7 +925,7 @@ switch (sex) { //пол case male: //мужчина - if (what=="thousand") { + if (what==thousand) { if (last==0) {// если дальше нету цифр значит говорить двух,одна 2-х, ... if (c!=1) { //не произность одна тысячный say_file("digits/h-%dxx.wav", c);//одна, двух @@ -931,7 +937,7 @@ say_file("digits/thousands-i.wav"); //тысячи } } - else if (what=="million") { + else if (what==million) { if (last==0) {// если дальше нету цифр значит говорить двух, 3-х, 4-х ... if (c!=1) { say_file("digits/h-%dxx.wav", c);//одна, двух, трёх @@ -948,7 +954,7 @@ } break; case female: //женщина - if (what=="thousand") { + if (what==thousand) { if (last==0) {// если дальше нету цифр значит говорить двух, 1-х, 2-х ... if (c!=1) { //не произность одна тысячная say_file("digits/h-%dxx.wav", c);//одна, двух @@ -960,7 +966,7 @@ say_file("digits/thousands-i.wav"); //тысячи } } - else if (what=="million") { + else if (what==million) { if (last==0) {// если дальше нету цифр значит говорить двух, 3-х, 4-х ... if (c!=1) { say_file("digits/h-%dxx.wav", c);//одна, двух, трёх @@ -977,7 +983,7 @@ } break; case it: //оно - if (what=="thousand") { + if (what==thousand) { if (last==0) {// если дальше нету цифр значит говорить двух, 1-х, 2-х ... if (c!=1) { //не произность одна тысячное say_file("digits/h-%dxx.wav", c);//одна, двух @@ -989,7 +995,7 @@ say_file("digits/thousands-i.wav"); //тысячи } } - else if (what=="million") { + else if (what==million) { if (last==0) {// если дальше нету цифр значит говорить двух, 3-х, 4-х ... if (c!=1) { say_file("digits/h-%dxx.wav", c);//одна, двух @@ -1009,7 +1015,7 @@ break; //------------------------------------------------------- case when: //какого - когда без пола - if (what=="thousand") { + if (what==thousand) { if (last==0) {// если дальше нету цифр значит говорить двух, 3-х, 4-х ... if (c!=1) { //не произность одна тысячного say_file("digits/h-%dxx.wav", c);//одна, двух @@ -1021,7 +1027,7 @@ say_file("digits/thousands-i.wav"); //тысячи } } - else if (what=="million") { + else if (what==million) { if (last==0) {// если дальше нету цифр значит говорить двух, 3-х, 4-х ... if (c!=1) { say_file("digits/h-%dxx.wav", c);//одна, двух, трёх @@ -1120,21 +1126,21 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "int in=%d \n", in); - if ((status = play_group(sex,question, places[8], places[7], places[6], "million",in%1000000, session, args)) != SWITCH_STATUS_SUCCESS) { + if ((status = play_group(sex,question, places[8], places[7], places[6], million,in%1000000, session, args)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "play group %d %d %d million!\n", places[8], places[7], places[6]); return status; } - if ((status = play_group(sex,question, places[5], places[4], places[3], "thousand",in_%1000,session, args)) != SWITCH_STATUS_SUCCESS) { + if ((status = play_group(sex,question, places[5], places[4], places[3], thousand,in_%1000,session, args)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "play group %d %d %d thousand!\n", places[5], places[4], places[3]); return status; } - if ((status = play_group(sex,question, places[2], places[1], places[0], NULL, 0,session, args)) != SWITCH_STATUS_SUCCESS) + if ((status = play_group(sex,question, places[2], places[1], places[0], empty, 0,session, args)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "play group %d %d %d other!\n", places[2], places[1], places[0]); return status; } } else { //если ноль что бы и его проговаривать в правильных падежах - if ((status = play_group(sex,question, places[2], places[1], places[0], "zero",0, session, args)) != SWITCH_STATUS_SUCCESS) + if ((status = play_group(sex,question, places[2], places[1], places[0], zero,0, session, args)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "play group %d %d %d other!\n", places[2], places[1], places[0]); return status;

1 0

[commit] r13008 - freeswitch/trunk/src/mod/applications/mod_cidlookup
by FreeSWITCH SVN 12 Apr '09

12 Apr '09

Author: rupa Date: Sun Apr 12 18:29:04 2009 New Revision: 13008 Log: forgot an ifdef Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c (original) +++ freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c Sun Apr 12 18:29:04 2009 @@ -154,9 +154,11 @@ #endif done: +#ifdef SWITCH_HAVE_ODBC if (globals.db_mutex) { switch_mutex_unlock(globals.db_mutex); } +#endif return status; }

1 0

[commit] r13007 - freeswitch/trunk/src/mod/applications/mod_limit
by FreeSWITCH SVN 12 Apr '09

12 Apr '09

Author: mrene Date: Sun Apr 12 13:35:09 2009 New Revision: 13007 Log: mod_limit: Add more error checking to hash api/app Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Sun Apr 12 13:35:09 2009 @@ -537,6 +537,8 @@ char *hash_key = NULL; char *value = NULL; + switch_mutex_lock(globals.db_hash_mutex); + if (!switch_strlen_zero(data)) { mydata = strdup(data); switch_assert(mydata); @@ -544,14 +546,15 @@ } if (argc < 3 || !argv[0]) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "USAGE: hash %s\n", HASH_USAGE); - goto end; + goto usage; } hash_key = switch_mprintf("%s_%s", argv[1], argv[2]); - switch_mutex_lock(globals.db_hash_mutex); if (!strcasecmp(argv[0], "insert")) { + if (argc < 4) { + goto usage; + } if ((value = switch_core_hash_find(globals.db_hash, hash_key))) { free(value); switch_core_hash_delete(globals.db_hash, hash_key); @@ -564,10 +567,17 @@ switch_safe_free(value); switch_core_hash_delete(globals.db_hash, hash_key); } + } else { + goto usage; } - switch_mutex_unlock(globals.db_hash_mutex); -end: + goto done; + +usage: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "USAGE: hash %s\n", HASH_USAGE); + +done: + switch_mutex_unlock(globals.db_hash_mutex); switch_safe_free(mydata); switch_safe_free(hash_key); } @@ -590,16 +600,14 @@ } if (argc < 3 || !argv[0]) { - stream->write_function(stream, "-ERR Usage: hash %s\n", HASH_API_USAGE); - goto end; + goto usage; } hash_key = switch_mprintf("%s_%s", argv[1], argv[2]); if (!strcasecmp(argv[0], "insert")) { if (argc < 4) { - stream->write_function(stream, "-ERR Usage: hash %s\n", HASH_API_USAGE); - goto end; + goto usage; } if ((value = switch_core_hash_find(globals.db_hash, hash_key))) { switch_safe_free(value); @@ -613,15 +621,24 @@ if ((value = switch_core_hash_find(globals.db_hash, hash_key))) { switch_safe_free(value); switch_core_hash_delete(globals.db_hash, hash_key); + stream->write_function(stream, "+OK\n"); + } else { + stream->write_function(stream, "-ERR Not found\n"); } - stream->write_function(stream, "+OK\n"); } else if (!strcasecmp(argv[0], "select")) { if ((value = switch_core_hash_find(globals.db_hash, hash_key))) { stream->write_function(stream, "%s", value); } + } else { + goto usage; } -end: + goto done; + +usage: + stream->write_function(stream, "-ERR Usage: hash %s\n", HASH_API_USAGE); + +done: switch_mutex_unlock(globals.db_hash_mutex); switch_safe_free(mydata); switch_safe_free(hash_key);

1 0