April 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[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

[commit] r13006 - freeswitch/trunk/src
by FreeSWITCH SVN 11 Apr '09

11 Apr '09

Author: mrene Date: Sat Apr 11 18:21:17 2009 New Revision: 13006 Log: oups that wasnt on a pool Modified: freeswitch/trunk/src/switch_ivr_menu.c Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Sat Apr 11 18:21:17 2009 @@ -291,13 +291,14 @@ switch_status_t status = SWITCH_STATUS_FALSE; switch_input_args_t args = { 0 }; switch_channel_t *channel; + char *sound_expanded = sound; if (!session || !menu || switch_strlen_zero(sound)) { return status; } if ((channel = switch_core_session_get_channel(session))) { - sound = switch_channel_expand_variables(channel, sound); + sound_expanded = switch_channel_expand_variables(channel, sound); } memset(menu->buf, 0, menu->inlen + 1); @@ -313,7 +314,11 @@ args.buf = ptr; args.buflen = len; - status = switch_ivr_play_file(session, NULL, sound, &args); + status = switch_ivr_play_file(session, NULL, sound_expanded, &args); + + if (sound_expanded != sound) { + switch_safe_free(sound_expanded); + } if (!need) { return status;

1 0

[commit] r13005 - freeswitch/trunk/src
by FreeSWITCH SVN 11 Apr '09

11 Apr '09

Author: mrene Date: Sat Apr 11 18:12:26 2009 New Revision: 13005 Log: MODAPP-257 Modified: freeswitch/trunk/src/switch_ivr_menu.c Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Sat Apr 11 18:12:26 2009 @@ -290,11 +290,16 @@ char *ptr; switch_status_t status = SWITCH_STATUS_FALSE; switch_input_args_t args = { 0 }; + switch_channel_t *channel; if (!session || !menu || switch_strlen_zero(sound)) { return status; } + if ((channel = switch_core_session_get_channel(session))) { + sound = switch_channel_expand_variables(channel, sound); + } + memset(menu->buf, 0, menu->inlen + 1); menu->ptr = menu->buf;

1 0

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

11 Apr '09

Author: rupa Date: Sat Apr 11 13:04:48 2009 New Revision: 13004 Log: allow one to specify cid on the app data cmd 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 Sat Apr 11 13:04:48 2009 @@ -437,12 +437,15 @@ } if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { - if (argc > 0) { /* && strcmp("skipurl", argv[0])) { */ + if (argc > 0) { + number = switch_core_session_strdup(session, argv[0]); + } + if (argc > 1) { skipurl = SWITCH_TRUE; } } - if (profile) { + if (!number && profile) { number = switch_caller_get_field_by_name(profile, "caller_id_number"); } @@ -564,7 +567,7 @@ SWITCH_ADD_API(api_interface, "cidlookup", "cidlookup API", cidlookup_function, SYNTAX); SWITCH_ADD_APP(app_interface, "cidlookup", "Perform a CID lookup", "Perform a CID lookup", - cidlookup_app_function, "number [skipurl]", SAF_SUPPORT_NOMEDIA); + cidlookup_app_function, "[number [skipurl]]", SAF_SUPPORT_NOMEDIA); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0

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

11 Apr '09

Author: rupa Date: Sat Apr 11 11:31:55 2009 New Revision: 13003 Log: fix attribution, override profile->caller_id_name 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 Sat Apr 11 11:31:55 2009 @@ -24,9 +24,6 @@ * Contributor(s): * * Rupa Schomaker <rupa(a)rupa.com> - * Anthony Minessale II <anthm(a)freeswitch.org> - * Neal Horman <neal at wanlink dot com> - * * * mod_cidlookup.c -- API for querying cid->name services * @@ -453,10 +450,9 @@ name = do_lookup(pool, event, number, skipurl); } - if (name) { - if (channel) { - switch_channel_set_variable(channel, "effective_caller_id_name", name); - } + if (name && channel) { + switch_channel_set_variable(channel, "original_caller_id_name", switch_core_strdup(pool, profile->caller_id_name)); + profile->caller_id_name = switch_core_strdup(profile->pool, name);; } switch_goto_status(SWITCH_STATUS_SUCCESS, done);

1 0

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

11 Apr '09

Author: anthm Date: Sat Apr 11 11:29:36 2009 New Revision: 13002 Log: add dtmf method to mod_opal 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 Sat Apr 11 11:29:36 2009 @@ -49,6 +49,7 @@ static switch_status_t on_hangup(switch_core_session_t *session); +static switch_status_t on_destroy(switch_core_session_t *session); static switch_io_routines_t opalfs_io_routines = { @@ -69,9 +70,8 @@ /*.on_routing */ FSConnection::on_routing, /*.on_execute */ FSConnection::on_execute, /*.on_hangup */ on_hangup, - /*.on_loopback */ FSConnection::on_loopback, - /*.on_transmit */ FSConnection::on_transmit, - /*.on_soft_execute */ NULL, + /*.on_exchange_media */ FSConnection::on_exchange_media, + /*.on_soft_execute */ FSConnection::on_soft_execute, /*.on_consume_media*/ NULL, /*.on_hibernate*/ NULL, /*.on_reset*/ NULL, @@ -676,6 +676,12 @@ OpalLocalConnection::OnEstablished(); } +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; +} OpalMediaFormatList FSConnection::GetMediaFormats() const { @@ -887,14 +893,14 @@ } -switch_status_t FSConnection::on_loopback() +switch_status_t FSConnection::on_exchange_media() { PTRACE(3, "mod_opal\tLoopback on connection " << *this); return SWITCH_STATUS_SUCCESS; } -switch_status_t FSConnection::on_transmit() +switch_status_t FSConnection::on_soft_execute() { PTRACE(3, "mod_opal\tTransmit on connection " << *this); return SWITCH_STATUS_SUCCESS; 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 Sat Apr 11 11:29:36 2009 @@ -187,6 +187,7 @@ virtual OpalMediaStream *CreateMediaStream(const OpalMediaFormat &, unsigned, PBoolean); virtual PBoolean OnOpenMediaStream(OpalMediaStream & stream); virtual OpalMediaFormatList GetMediaFormats() const; + virtual PBoolean SendUserInputTone(char tone, unsigned duration); void SetCodecs(); @@ -195,8 +196,8 @@ DECLARE_CALLBACK0(on_execute); //DECLARE_CALLBACK0(on_hangup); - DECLARE_CALLBACK0(on_loopback); - DECLARE_CALLBACK0(on_transmit); + DECLARE_CALLBACK0(on_exchange_media); + DECLARE_CALLBACK0(on_soft_execute); DECLARE_CALLBACK1(kill_channel, int, sig); DECLARE_CALLBACK1(send_dtmf, const switch_dtmf_t *, dtmf);

1 0