September 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9689 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by Freeswitch SVN 28 Sep '08

28 Sep '08

Author: anthm Date: Sat Sep 27 20:15:29 2008 New Revision: 9689 Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Log: doh 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 Sat Sep 27 20:15:29 2008 @@ -105,7 +105,7 @@ if (codec) { iananame = codec->implementation->iananame; - rate = codec->implementation->actual_samples_per_second; + rate = codec->implementation->samples_per_second; interval = codec->implementation->microseconds_per_frame / 1000; }

1 0

[commit] r9688 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 27 Sep '08

27 Sep '08

Author: brian Date: Sat Sep 27 17:41:09 2008 New Revision: 9688 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: tweak to MODENDP-126 commit 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 Sat Sep 27 17:41:09 2008 @@ -395,7 +395,6 @@ return SWITCH_STATUS_SUCCESS; } - switch_set_flag_locked(tech_pvt, TFLAG_ANS); b_sdp = switch_channel_get_variable(channel, SWITCH_B_SDP_VARIABLE); is_proxy = (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)); @@ -474,6 +473,8 @@ SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); + switch_set_flag_locked(tech_pvt, TFLAG_ANS); + return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Sat Sep 27 17:41:09 2008 @@ -2207,7 +2207,7 @@ if (m->m_proto != sdp_proto_srtp) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "a=crypto in RTP/AVP\n"); match = 0; - break; + goto done; } crypto = attr->a_value; @@ -2506,7 +2506,8 @@ } } } - + + done: switch_set_flag_locked(tech_pvt, TFLAG_SDP);

1 0

[commit] r9687 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 27 Sep '08

27 Sep '08

Author: anthm Date: Sat Sep 27 17:05:18 2008 New Revision: 9687 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: (MODENDP-126) don't accept crypto in the RTP/AVP Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Sat Sep 27 17:05:18 2008 @@ -2203,6 +2203,13 @@ ptime = atoi(attr->a_value); } else if (!got_crypto && !strcasecmp(attr->a_name, "crypto") && !switch_strlen_zero(attr->a_value)) { int crypto_tag; + + if (m->m_proto != sdp_proto_srtp) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "a=crypto in RTP/AVP\n"); + match = 0; + break; + } + crypto = attr->a_value; crypto_tag = atoi(crypto);

1 0

[commit] r9686 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 27 Sep '08

27 Sep '08

Author: anthm Date: Sat Sep 27 16:52:33 2008 New Revision: 9686 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: (SFSIP-83) chat (send an IM) assumes that the user's profile is the same as their domain, which isn't necessarily so Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Sat Sep 27 16:52:33 2008 @@ -52,11 +52,12 @@ switch_status_t sofia_presence_chat_send(char *proto, char *from, char *to, char *subject, char *body, char *hint) { char buf[256]; - char *user = NULL, *host = NULL; + char *prof = NULL, *user = NULL, *host = NULL; sofia_profile_t *profile = NULL; char *ffrom = NULL; nua_handle_t *msg_nh; char *contact; + char *dup = NULL; switch_status_t status = SWITCH_STATUS_FALSE; const char *ct = "text/html"; @@ -69,17 +70,27 @@ goto end; } - user = strdup(to); - switch_assert(user); + dup = strdup(to); + switch_assert(dup); + prof = dup; + + // Do we have a user of the form profile/user[@host]? + if ((user = strchr(prof, '/'))) { + *user++ = '\0'; + } else { + user = prof; + prof = NULL; + } if ((host = strchr(user, '@'))) { *host++ = '\0'; + if (!prof) prof = host; } - if (!host || !(profile = sofia_glue_find_profile(host))) { + if (!host || !(profile = sofia_glue_find_profile(prof))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Chat proto [%s]\nfrom [%s]\nto [%s]\n%s\nInvalid Profile %s\n", proto, from, to, - body ? body : "[no body]", host ? host : "NULL"); + body ? body : "[no body]", prof ? prof : "NULL"); goto end; } @@ -123,7 +134,7 @@ end: switch_safe_free(ffrom); - switch_safe_free(user); + switch_safe_free(dup); if (profile) {

1 0

[commit] r9685 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 27 Sep '08

27 Sep '08

Author: anthm Date: Sat Sep 27 16:34:47 2008 New Revision: 9685 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: (MODAPP-121) Patch to add voicemail preference controlling date announcement new param 'play-date-announcement' to values 'first' 'last' or 'never' defaults to first to retain previous behavior Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Sat Sep 27 16:34:47 2008 @@ -56,6 +56,12 @@ switch_memory_pool_t *pool; } globals; +typedef enum { + VM_DATE_FIRST, + VM_DATE_LAST, + VM_DATE_NEVER +} date_location_t; + struct vm_profile { char *name; char *dbname; @@ -107,6 +113,7 @@ char *web_tail; char *email_from; char *date_fmt; + date_location_t play_date_announcement; uint32_t digit_timeout; uint32_t max_login_attempts; uint32_t min_record_len; @@ -296,6 +303,7 @@ char *notify_email_headers = NULL; char *email_from = ""; char *date_fmt = "%A, %B %d %Y, %I %M %p"; + date_location_t play_date_announcement = VM_DATE_FIRST; char *web_head = NULL; char *web_tail = NULL; uint32_t record_threshold = 200; @@ -490,6 +498,12 @@ callback_context = val; } else if (!strcasecmp(var, "file-extension") && !switch_strlen_zero(val)) { file_ext = val; + } else if (!strcasecmp(var, "play-date-announcement") && !switch_strlen_zero(val)) { + if (!strcmp("last", val)) { + play_date_announcement = VM_DATE_LAST; + } else if (!strcmp("never", val)) { + play_date_announcement = VM_DATE_NEVER; + } } else if (!strcasecmp(var, "record-title") && !switch_strlen_zero(val)) { record_title = val; } else if (!strcasecmp(var, "record-comment") && !switch_strlen_zero(val)) { @@ -687,6 +701,7 @@ } profile->email_from = switch_core_strdup(globals.pool, email_from); profile->date_fmt = switch_core_strdup(globals.pool, date_fmt); + profile->play_date_announcement = play_date_announcement; profile->digit_timeout = timeout; profile->max_login_attempts = max_login_attempts; @@ -1310,21 +1325,24 @@ args.buf = &cc; args.input_callback = control_playback; TRY_CODE(switch_ivr_phrase_macro(session, VM_SAY_MESSAGE_NUMBER_MACRO, input, NULL, &args)); - if (!*cc.buf) { + + play_file: + if (!*cc.buf && (profile->play_date_announcement == VM_DATE_FIRST)) { + cc.fh = NULL; TRY_CODE(switch_ivr_phrase_macro(session, VM_SAY_DATE_MACRO, cbt->created_epoch, NULL, &args)); } - play_file: if (!*cc.buf) { memset(&fh, 0, sizeof(fh)); - args.input_callback = control_playback; - memset(&cc, 0, sizeof(cc)); - cc.profile = profile; cc.fh = &fh; - args.buf = &cc; TRY_CODE(switch_ivr_play_file(session, NULL, cbt->file_path, &args)); } + if (!*cc.buf && (profile->play_date_announcement == VM_DATE_LAST)) { + cc.fh = NULL; + TRY_CODE(switch_ivr_phrase_macro(session, VM_SAY_DATE_MACRO, cbt->created_epoch, NULL, &args)); + } + if (switch_channel_ready(channel)) { if (*cc.buf && *cc.buf != *profile->terminator_key) { *input = *cc.buf;

1 0

[commit] r9684 - in freeswitch/trunk: conf/autoload_configs src src/include
by Freeswitch SVN 27 Sep '08

27 Sep '08

Author: anthm Date: Sat Sep 27 16:26:20 2008 New Revision: 9684 Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/switch_ivr_menu.c Log: (FSCORE-183) ivr_menu max-timeouts option, result in ivr_menu_status var Modified: freeswitch/trunk/conf/autoload_configs/ivr.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/ivr.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/ivr.conf.xml Sat Sep 27 16:26:20 2008 @@ -10,6 +10,7 @@ timeout ="10000" inter-digit-timeout="2000" max-failures="3" + max-timeouts="3" digit-len="4"> <entry action="menu-exec-app" digits="1" param="bridge sofia/$${domain}/888(a)conference.freeswitch.org"/> <entry action="menu-exec-app" digits="2" param="transfer 9996 XML default"/>  @@ -26,7 +27,8 @@ invalid-sound="ivr/ivr-that_was_an_invalid_entry.wav" exit-sound="voicemail/vm-goodbye.wav" timeout="15000" - max-failures="3"> + max-failures="3" + max-timeouts="3"> <entry action="menu-top" digits="*"/> </menu> Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Sat Sep 27 16:26:20 2008 @@ -680,7 +680,8 @@ const char *confirm_macro, const char *confirm_key, int confirm_attempts, - int inter_timeout, int digit_len, int timeout, int max_failures, switch_memory_pool_t *pool); + int inter_timeout, int digit_len, int timeout, int max_failures, + int max_timeouts, switch_memory_pool_t *pool); /*! *\brief switch_ivr_menu_bind_action: Bind a keystroke to an action. Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Sat Sep 27 16:26:20 2008 @@ -47,6 +47,7 @@ int confirm_attempts; int digit_len; int max_failures; + int max_timeouts; int timeout; int inter_timeout; switch_size_t inlen; @@ -102,6 +103,7 @@ int inter_timeout, int digit_len, int timeout, int max_failures, + int max_timeouts, switch_memory_pool_t *pool) { switch_ivr_menu_t *menu; @@ -167,6 +169,8 @@ menu->max_failures = max_failures; + menu->max_timeouts = max_timeouts; + menu->timeout = timeout; menu->inter_timeout = inter_timeout; @@ -345,7 +349,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_menu_execute(switch_core_session_t *session, switch_ivr_menu_t * stack, char *name, void *obj) { - int reps = 0, errs = 0, match = 0, running = 1; + int reps = 0, errs = 0, timeouts = 0, match = 0, running = 1; char *greeting_sound = NULL, *aptr = NULL; char arg[512]; switch_ivr_action_t todo = SWITCH_IVR_ACTION_DIE; @@ -372,11 +376,22 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Executing IVR menu %s\n", menu->name); + switch_channel_set_variable(channel, "ivr_menu_status", "success"); - for (reps = 0; (running && status == SWITCH_STATUS_SUCCESS && errs < menu->max_failures); reps++) { + for (reps = 0; running && status == SWITCH_STATUS_SUCCESS; reps++) { if (!switch_channel_ready(channel)) { break; } + if (errs == menu->max_failures) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Maximum failures\n"); + switch_channel_set_variable(channel, "ivr_menu_status", "failure"); + break; + } + if (timeouts == menu->max_timeouts) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Maximum timeouts\n"); + switch_channel_set_variable(channel, "ivr_menu_status", "timeout"); + break; + } if (reps > 0 && menu->short_greeting_sound) { greeting_sound = menu->short_greeting_sound; @@ -390,7 +405,11 @@ memset(arg, 0, sizeof(arg)); memset(menu->buf, 0, menu->inlen + 1); - status = play_and_collect(session, menu, greeting_sound, menu->inlen); + + if (play_and_collect(session, menu, greeting_sound, menu->inlen) == SWITCH_STATUS_TIMEOUT) { + timeouts++; + continue; + } if (*menu->buf != '\0') { @@ -494,17 +513,12 @@ if (*menu->buf) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IVR menu '%s' caught invalid input '%s'\n", menu->name, menu->buf); if (menu->invalid_sound) { - status = play_and_collect(session, menu, menu->invalid_sound, 0); + play_and_collect(session, menu, menu->invalid_sound, 0); } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IVR menu '%s' no input detected\n", menu->name); } errs++; - - if (status == SWITCH_STATUS_TIMEOUT) { - status = SWITCH_STATUS_SUCCESS; - } - if (status == SWITCH_STATUS_SUCCESS) { status = switch_ivr_sleep(session, 1000, NULL); } @@ -693,6 +707,7 @@ const char *exit_sound = switch_xml_attr(xml_menu, "exit-sound"); /* if the attr doesn't exist, return NULL */ const char *timeout = switch_xml_attr_soft(xml_menu, "timeout"); /* if the attr doesn't exist, return "" */ const char *max_failures = switch_xml_attr_soft(xml_menu, "max-failures"); /* if the attr doesn't exist, return "" */ + const char *max_timeouts = switch_xml_attr_soft(xml_menu, "max-timeouts"); const char *confirm_macro= switch_xml_attr(xml_menu, "confirm-macro"); const char *confirm_key= switch_xml_attr(xml_menu, "confirm-key"); const char *confirm_attempts = switch_xml_attr_soft(xml_menu, "confirm-attempts"); @@ -701,6 +716,10 @@ switch_ivr_menu_t *menu = NULL; + if (switch_strlen_zero(max_timeouts)) { + max_timeouts = max_failures; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "building menu '%s'\n", menu_name); status = switch_ivr_menu_init(&menu, @@ -716,7 +735,8 @@ atoi(inter_timeout), atoi(digit_len), atoi(timeout), - atoi(max_failures), + strlen(max_failures)? atoi(max_failures): 1, + strlen(max_timeouts)? atoi(max_timeouts): 1, xml_menu_ctx->pool); /* set the menu_stack for the caller */ if (status == SWITCH_STATUS_SUCCESS && *menu_stack == NULL) {

1 0

[commit] r9683 - in freeswitch/trunk/src: . include
by Freeswitch SVN 27 Sep '08

27 Sep '08

Author: anthm Date: Sat Sep 27 16:13:57 2008 New Revision: 9683 Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/switch_cpp.cpp Log: swig Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Sat Sep 27 16:13:57 2008 @@ -92,7 +92,8 @@ const char *exit_sound, const char *confirm_macro, const char *confirm_key, - int confirm_attempts, int inter_timeout, int digit_len, int timeout, int max_failures); + int confirm_attempts, int inter_timeout, int digit_len, + int timeout, int max_failures, int max_timeouts); virtual SWITCH_DECLARE_CONSTRUCTOR ~ IVRMenu(); SWITCH_DECLARE(void) bindAction(char *action, const char *arg, const char *bind); SWITCH_DECLARE(void) execute(CoreSession * session, const char *name); Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Sat Sep 27 16:13:57 2008 @@ -112,7 +112,8 @@ int inter_timeout, int digit_len, int timeout, - int max_failures) + int max_failures, + int max_timeouts) { menu = NULL; switch_core_new_memory_pool(&pool); @@ -122,7 +123,7 @@ } switch_ivr_menu_init(&menu, main ? main->menu : NULL, name, greeting_sound, short_greeting_sound, invalid_sound, - exit_sound, confirm_macro, confirm_key, confirm_attempts, inter_timeout, digit_len, timeout, max_failures, pool); + exit_sound, confirm_macro, confirm_key, confirm_attempts, inter_timeout, digit_len, timeout, max_failures, max_timeouts, pool); }

1 0

[commit] r9682 - in freeswitch/trunk/src/mod/languages: mod_java mod_java/src/org/freeswitch/swig mod_lua mod_perl mod_python
by Freeswitch SVN 27 Sep '08

27 Sep '08

Author: anthm Date: Sat Sep 27 16:13:14 2008 New Revision: 9682 Modified: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/IVRMenu.java freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp Log: swig Modified: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/IVRMenu.java ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/IVRMenu.java (original) +++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/IVRMenu.java Sat Sep 27 16:13:14 2008 @@ -33,8 +33,8 @@ swigCPtr = 0; } - public IVRMenu(IVRMenu main, String name, String greeting_sound, String short_greeting_sound, String invalid_sound, String exit_sound, String confirm_macro, String confirm_key, int confirm_attempts, int inter_timeout, int digit_len, int timeout, int max_failures) { - this(freeswitchJNI.new_IVRMenu(IVRMenu.getCPtr(main), main, name, greeting_sound, short_greeting_sound, invalid_sound, exit_sound, confirm_macro, confirm_key, confirm_attempts, inter_timeout, digit_len, timeout, max_failures), true); + public IVRMenu(IVRMenu main, String name, String greeting_sound, String short_greeting_sound, String invalid_sound, String exit_sound, String confirm_macro, String confirm_key, int confirm_attempts, int inter_timeout, int digit_len, int timeout, int max_failures, int max_timeouts) { + this(freeswitchJNI.new_IVRMenu(IVRMenu.getCPtr(main), main, name, greeting_sound, short_greeting_sound, invalid_sound, exit_sound, confirm_macro, confirm_key, confirm_attempts, inter_timeout, digit_len, timeout, max_failures, max_timeouts), true); } public void bindAction(String action, String arg, String bind) { Modified: freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java (original) +++ freeswitch/trunk/src/mod/languages/mod_java/src/org/freeswitch/swig/freeswitchJNI.java Sat Sep 27 16:13:14 2008 @@ -11,7 +11,7 @@ class freeswitchJNI { public final static native void consoleLog(String jarg1, String jarg2); public final static native void consoleCleanLog(String jarg1); - public final static native long new_IVRMenu(long jarg1, IVRMenu jarg1_, String jarg2, String jarg3, String jarg4, String jarg5, String jarg6, String jarg7, String jarg8, int jarg9, int jarg10, int jarg11, int jarg12, int jarg13); + public final static native long new_IVRMenu(long jarg1, IVRMenu jarg1_, String jarg2, String jarg3, String jarg4, String jarg5, String jarg6, String jarg7, String jarg8, int jarg9, int jarg10, int jarg11, int jarg12, int jarg13, int jarg14); public final static native void delete_IVRMenu(long jarg1); public final static native void IVRMenu_bindAction(long jarg1, IVRMenu jarg1_, String jarg2, String jarg3, String jarg4); public final static native void IVRMenu_execute(long jarg1, IVRMenu jarg1_, long jarg2, CoreSession jarg2_, String jarg3); Modified: freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_java/switch_swig_wrap.cpp Sat Sep 27 16:13:14 2008 @@ -244,7 +244,7 @@ } -SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_new_1IVRMenu(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3, jstring jarg4, jstring jarg5, jstring jarg6, jstring jarg7, jstring jarg8, jint jarg9, jint jarg10, jint jarg11, jint jarg12, jint jarg13) { +SWIGEXPORT jlong JNICALL Java_org_freeswitch_swig_freeswitchJNI_new_1IVRMenu(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jstring jarg2, jstring jarg3, jstring jarg4, jstring jarg5, jstring jarg6, jstring jarg7, jstring jarg8, jint jarg9, jint jarg10, jint jarg11, jint jarg12, jint jarg13, jint jarg14) { jlong jresult = 0 ; IVRMenu *arg1 = (IVRMenu *) 0 ; char *arg2 = (char *) 0 ; @@ -259,6 +259,7 @@ int arg11 ; int arg12 ; int arg13 ; + int arg14 ; IVRMenu *result = 0 ; (void)jenv; @@ -305,7 +306,8 @@ arg11 = (int)jarg11; arg12 = (int)jarg12; arg13 = (int)jarg13; - result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12,arg13); + arg14 = (int)jarg14; + result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12,arg13,arg14); *(IVRMenu **)&jresult = result; if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2); if (arg3) jenv->ReleaseStringUTFChars(jarg3, (const char *)arg3); Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp Sat Sep 27 16:13:14 2008 @@ -1593,9 +1593,10 @@ int arg11 ; int arg12 ; int arg13 ; + int arg14 ; IVRMenu *result = 0 ; - SWIG_check_num_args("IVRMenu",13,13) + SWIG_check_num_args("IVRMenu",14,14) if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("IVRMenu",1,"IVRMenu *"); if(!lua_isstring(L,2)) SWIG_fail_arg("IVRMenu",2,"char const *"); if(!lua_isstring(L,3)) SWIG_fail_arg("IVRMenu",3,"char const *"); @@ -1609,6 +1610,7 @@ if(!lua_isnumber(L,11)) SWIG_fail_arg("IVRMenu",11,"int"); if(!lua_isnumber(L,12)) SWIG_fail_arg("IVRMenu",12,"int"); if(!lua_isnumber(L,13)) SWIG_fail_arg("IVRMenu",13,"int"); + if(!lua_isnumber(L,14)) SWIG_fail_arg("IVRMenu",14,"int"); if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_IVRMenu,0))){ SWIG_fail_ptr("new_IVRMenu",1,SWIGTYPE_p_IVRMenu); @@ -1626,7 +1628,8 @@ arg11 = (int)lua_tonumber(L, 11); arg12 = (int)lua_tonumber(L, 12); arg13 = (int)lua_tonumber(L, 13); - result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12,arg13); + arg14 = (int)lua_tonumber(L, 14); + result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12,arg13,arg14); SWIG_arg=0; SWIG_NewPointerObj(L,result,SWIGTYPE_p_IVRMenu,1); SWIG_arg++; return SWIG_arg; Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp Sat Sep 27 16:13:14 2008 @@ -1995,6 +1995,7 @@ int arg11 ; int arg12 ; int arg13 ; + int arg14 ; IVRMenu *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -2029,11 +2030,13 @@ int ecode12 = 0 ; int val13 ; int ecode13 = 0 ; + int val14 ; + int ecode14 = 0 ; int argvi = 0; dXSARGS; - if ((items < 13) || (items > 13)) { - SWIG_croak("Usage: new_IVRMenu(main,name,greeting_sound,short_greeting_sound,invalid_sound,exit_sound,confirm_macro,confirm_key,confirm_attempts,inter_timeout,digit_len,timeout,max_failures);"); + if ((items < 14) || (items > 14)) { + SWIG_croak("Usage: new_IVRMenu(main,name,greeting_sound,short_greeting_sound,invalid_sound,exit_sound,confirm_macro,confirm_key,confirm_attempts,inter_timeout,digit_len,timeout,max_failures,max_timeouts);"); } res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_IVRMenu, 0 | 0 ); if (!SWIG_IsOK(res1)) { @@ -2100,7 +2103,12 @@ SWIG_exception_fail(SWIG_ArgError(ecode13), "in method '" "new_IVRMenu" "', argument " "13"" of type '" "int""'"); } arg13 = static_cast< int >(val13); - result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12,arg13); + ecode14 = SWIG_AsVal_int SWIG_PERL_CALL_ARGS_2(ST(13), &val14); + if (!SWIG_IsOK(ecode14)) { + SWIG_exception_fail(SWIG_ArgError(ecode14), "in method '" "new_IVRMenu" "', argument " "14"" of type '" "int""'"); + } + arg14 = static_cast< int >(val14); + result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12,arg13,arg14); ST(argvi) = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IVRMenu, SWIG_OWNER | SWIG_SHADOW); argvi++ ; if (alloc2 == SWIG_NEWOBJ) delete[] buf2; @@ -2115,6 +2123,7 @@ + XSRETURN(argvi); fail: @@ -2130,6 +2139,7 @@ + SWIG_croak_null(); } } Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp Sat Sep 27 16:13:14 2008 @@ -3084,6 +3084,7 @@ int arg11 ; int arg12 ; int arg13 ; + int arg14 ; IVRMenu *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -3118,6 +3119,8 @@ int ecode12 = 0 ; int val13 ; int ecode13 = 0 ; + int val14 ; + int ecode14 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; @@ -3131,8 +3134,9 @@ PyObject * obj10 = 0 ; PyObject * obj11 = 0 ; PyObject * obj12 = 0 ; + PyObject * obj13 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOOOOO:new_IVRMenu",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOOOOOOOOOOOO:new_IVRMenu",&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7,&obj8,&obj9,&obj10,&obj11,&obj12,&obj13)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IVRMenu, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_IVRMenu" "', argument " "1"" of type '" "IVRMenu *""'"); @@ -3198,7 +3202,12 @@ SWIG_exception_fail(SWIG_ArgError(ecode13), "in method '" "new_IVRMenu" "', argument " "13"" of type '" "int""'"); } arg13 = static_cast< int >(val13); - result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12,arg13); + ecode14 = SWIG_AsVal_int(obj13, &val14); + if (!SWIG_IsOK(ecode14)) { + SWIG_exception_fail(SWIG_ArgError(ecode14), "in method '" "new_IVRMenu" "', argument " "14"" of type '" "int""'"); + } + arg14 = static_cast< int >(val14); + result = (IVRMenu *)new IVRMenu(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,(char const *)arg5,(char const *)arg6,(char const *)arg7,(char const *)arg8,arg9,arg10,arg11,arg12,arg13,arg14); resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IVRMenu, SWIG_POINTER_NEW | 0 ); if (alloc2 == SWIG_NEWOBJ) delete[] buf2; if (alloc3 == SWIG_NEWOBJ) delete[] buf3;

1 0

[commit] r9681 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 27 Sep '08

27 Sep '08

Author: anthm Date: Sat Sep 27 15:52:27 2008 New Revision: 9681 Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: cleanup Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Sat Sep 27 15:52:27 2008 @@ -55,7 +55,6 @@ switch_buffer_t *audio_buffer; switch_memory_pool_t *memory_pool; unsigned char decode_buf[MP3_DCACHE]; - //struct mpstr mp; switch_file_handle_t *handle; mpg123_handle *mh; int err; @@ -251,7 +250,6 @@ lp = sizeof(inbuf); if (!context->eof && ((switch_file_read(context->fd, inbuf, &lp) != SWITCH_STATUS_SUCCESS) || lp == 0)) { context->eof++; - //goto end; } inlen = (int) lp; @@ -404,18 +402,11 @@ x++; } - if (decode_status == MP3_TOOSMALL) { - switch_mutex_lock(context->audio_mutex); - if (context->audio_buffer) { - switch_buffer_write(context->audio_buffer, context->decode_buf, usedlen); - } else { - goto error; - } - out = context->decode_buf; - outlen = sizeof(context->decode_buf); - usedlen = 0; - switch_mutex_unlock(context->audio_mutex); - + if (decode_status == MPG123_NEW_FORMAT) { + continue; + } else if (decode_status == MPG123_OK) { + usedlen = dlen; + break; } else if (decode_status == MPG123_ERR) { if (++context->mp3err >= 20) { @@ -424,11 +415,11 @@ } mpg123_close(context->mh); - //InitMP3(context->mh, OUTSCALE, context->samplerate); context->mh = mpg123_new(NULL, NULL); mpg123_open_feed(context->mh); - mpg123_format(context->mh, context->samplerate, MPG123_MONO, 0); - + mpg123_param(context->mh, MPG123_FORCE_RATE, context->samplerate, 0); + mpg123_param(context->mh, MPG123_FLAGS, MPG123_MONO_MIX, 0); + mpg123_param(context->mh, MPG123_FLAGS, MPG123_SEEKBUFFER|MPG123_MONO_MIX, 0); return realsize; } @@ -617,17 +608,18 @@ } switch_mutex_init(&context->audio_mutex, SWITCH_MUTEX_NESTED, context->memory_pool); - //InitMP3(context->mh, OUTSCALE, context->samplerate); context->mh = mpg123_new(NULL, NULL); mpg123_open_feed(context->mh); + mpg123_format_all(context->mh); mpg123_param(context->mh, MPG123_FORCE_RATE, context->samplerate, 0); - if (handle->handler) { + mpg123_param(context->mh, MPG123_FLAGS, MPG123_SEEKBUFFER|MPG123_MONO_MIX, 0); context->stream_url = switch_core_sprintf(context->memory_pool, "http://%s", path); context->prebuf = handle->prebuf; launch_read_stream_thread(context); } else { + mpg123_param(context->mh, MPG123_FLAGS, MPG123_MONO_MIX, 0); if (switch_file_open(&context->fd, path, SWITCH_FOPEN_READ, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE, handle->memory_pool) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening %s\n", path); @@ -800,7 +792,6 @@ shout_context_t *context = handle->private_info; if (handle->handler) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot seek on a stream.\n"); return SWITCH_STATUS_FALSE; } else { switch_mutex_lock(context->audio_mutex); @@ -812,10 +803,10 @@ } mpg123_close(context->mh); - //InitMP3(context->mh, OUTSCALE, context->samplerate); context->mh = mpg123_new(NULL, NULL); mpg123_open_feed(context->mh); - mpg123_format(context->mh, context->samplerate, MPG123_MONO, 0); + mpg123_param(context->mh, MPG123_FORCE_RATE, context->samplerate, 0); + mpg123_param(context->mh, MPG123_FLAGS, MPG123_MONO_MIX, 0); switch_buffer_zero(context->audio_buffer); } else { @@ -1405,7 +1396,6 @@ //*module_interface = &shout_module_interface; shout_init(); - //InitMP3Constants(); mpg123_init(); SWITCH_ADD_API(shout_api_interface, "telecast", "telecast", telecast_api_function, TELECAST_SYNTAX); @@ -1417,6 +1407,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_shout_shutdown) { curl_global_cleanup(); + mpg123_exit(); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r9680 - in freeswitch/trunk/src: . mod/applications/mod_commands
by Freeswitch SVN 27 Sep '08

27 Sep '08

Author: brian Date: Sat Sep 27 14:49:21 2008 New Revision: 9680 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_ivr_async.c Log: part two of FSCORE-193 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Sat Sep 27 14:49:21 2008 @@ -1421,9 +1421,17 @@ } if (!strcasecmp(action, "start")) { - switch_ivr_record_session(rsession, path, limit, NULL); + if (switch_ivr_record_session(rsession, path, limit, NULL)!= SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "-ERR Cannot record session!\n"); + } else { + stream->write_function(stream, "+OK Success\n"); + } } else if (!strcasecmp(action, "stop")) { - switch_ivr_stop_record_session(rsession, path); + if (switch_ivr_stop_record_session(rsession, path) != SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "-ERR Cannot stop record session!\n"); + } else { + stream->write_function(stream, "+OK Success\n"); + } } else { goto usage; } @@ -1481,9 +1489,17 @@ } if (!strcasecmp(action, "start")) { - switch_ivr_displace_session(rsession, path, limit, flags); + if (switch_ivr_displace_session(rsession, path, limit, flags) != SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "-ERR Cannot displace session!\n"); + } else { + stream->write_function(stream, "+OK Success\n"); + } } else if (!strcasecmp(action, "stop")) { - switch_ivr_stop_displace_session(rsession, path); + if (switch_ivr_stop_displace_session(rsession, path) != SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "-ERR Cannot stop displace session!\n"); + } else { + stream->write_function(stream, "+OK Success\n"); + } } else { goto usage; } Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Sat Sep 27 14:49:21 2008 @@ -345,7 +345,7 @@ if (!switch_channel_media_ready(channel) || !switch_core_session_get_read_codec(session)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can not displace session. Media not enabled on channel\n"); - return status; + return SWITCH_STATUS_FALSE; } if ((bug = switch_channel_get_private(channel, file))) { @@ -816,7 +816,7 @@ if (!switch_channel_media_ready(channel) || !switch_core_session_get_read_codec(session)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can not record session. Media not enabled on channel\n"); - return status; + return SWITCH_STATUS_FALSE; } channels = read_codec->implementation->number_of_channels;

1 0