- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6779 - freeswitch/trunk/src/include
by Freeswitch SVN 14 Dec '07

14 Dec '07

Author: mikej Date: Thu Dec 13 19:43:08 2007 New Revision: 6779 Modified: freeswitch/trunk/src/include/switch_bitpack.h Log: assert some bounds values that should never be out of bounds (or the arrays would be out of bounds anyways) Modified: freeswitch/trunk/src/include/switch_bitpack.h ============================================================================== --- freeswitch/trunk/src/include/switch_bitpack.h (original) +++ freeswitch/trunk/src/include/switch_bitpack.h Thu Dec 13 19:43:08 2007 @@ -99,10 +99,7 @@ pack->bits_cur = pack->over; if (pack->mode == SWITCH_BITPACK_MODE_RFC3551) { - while (pack->over > 8) { - pack->over -= 8; - } - if (pack->over > 8) return; + switch_assert(pack->over <= 8); this_byte &= SWITCH_BITPACKED_MASKS[pack->over]; this_byte <<= pack->under; *pack->cur |= this_byte;

1 0

[commit] r6778 - freeswitch/trunk/src/include
by Freeswitch SVN 14 Dec '07

14 Dec '07

Author: mikej Date: Thu Dec 13 19:42:11 2007 New Revision: 6778 Modified: freeswitch/trunk/src/include/switch_bitpack.h Log: assert some bounds values that should never be out of bounds (or the arrays would be out of bounds anyways) Modified: freeswitch/trunk/src/include/switch_bitpack.h ============================================================================== --- freeswitch/trunk/src/include/switch_bitpack.h (original) +++ freeswitch/trunk/src/include/switch_bitpack.h Thu Dec 13 19:42:11 2007 @@ -99,12 +99,17 @@ pack->bits_cur = pack->over; if (pack->mode == SWITCH_BITPACK_MODE_RFC3551) { + while (pack->over > 8) { + pack->over -= 8; + } + if (pack->over > 8) return; this_byte &= SWITCH_BITPACKED_MASKS[pack->over]; this_byte <<= pack->under; *pack->cur |= this_byte; pack->cur++; } else { switch_byte_t mask = SWITCH_BITS_PER_BYTE - pack->over; + switch_assert(mask < 8); /* if pack->over this will allways be true */ this_byte &= SWITCH_REVERSE_BITPACKED_MASKS[mask]; this_byte >>= mask;

1 0

[commit] r6777 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 Dec '07

14 Dec '07

Author: anthm Date: Thu Dec 13 19:29:17 2007 New Revision: 6777 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: sip is fun 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 Thu Dec 13 19:29:17 2007 @@ -886,7 +886,9 @@ SIPTAG_CONTACT_STR(contact_str), TAG_END()); - nua_notify(nh, SIPTAG_EVENT_STR(event), TAG_END()); + nua_notify(nh, SIPTAG_SUBSCRIPTION_STATE_STR(sstr), SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR("text/html"), + SIPTAG_PAYLOAD_STR("Come to ClueCon http://www.cluecon.com\n\n"), + TAG_END()); switch_safe_free(sstr);

1 0

[commit] r6776 - freeswitch/trunk/src/mod/formats/mod_local_stream
by Freeswitch SVN 14 Dec '07

14 Dec '07

Author: mikej Date: Thu Dec 13 19:05:50 2007 New Revision: 6776 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Log: fix windows build. Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Thu Dec 13 19:05:50 2007 @@ -62,7 +62,7 @@ uint8_t channels; int rate; int interval; - int samples; + switch_size_t samples; uint32_t prebuf; char *timer_name; local_stream_context_t *context_list;

1 0

[commit] r6775 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 14 Dec '07

14 Dec '07

Author: brian Date: Thu Dec 13 19:04:41 2007 New Revision: 6775 Modified: freeswitch/trunk/conf/directory/default/1000.xml freeswitch/trunk/conf/directory/default/1001.xml freeswitch/trunk/conf/directory/default/1002.xml freeswitch/trunk/conf/directory/default/1003.xml freeswitch/trunk/conf/directory/default/1004.xml freeswitch/trunk/conf/directory/default/1005.xml freeswitch/trunk/conf/directory/default/1006.xml freeswitch/trunk/conf/directory/default/1007.xml freeswitch/trunk/conf/directory/default/1008.xml freeswitch/trunk/conf/directory/default/1009.xml freeswitch/trunk/conf/directory/default/1010.xml freeswitch/trunk/conf/directory/default/1011.xml freeswitch/trunk/conf/directory/default/1012.xml freeswitch/trunk/conf/directory/default/1013.xml freeswitch/trunk/conf/directory/default/1014.xml freeswitch/trunk/conf/directory/default/1015.xml freeswitch/trunk/conf/directory/default/1016.xml freeswitch/trunk/conf/directory/default/1017.xml freeswitch/trunk/conf/directory/default/1018.xml freeswitch/trunk/conf/directory/default/1019.xml freeswitch/trunk/conf/directory/default/brian.xml Log: Lets show how this is done Modified: freeswitch/trunk/conf/directory/default/1000.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1000.xml (original) +++ freeswitch/trunk/conf/directory/default/1000.xml Thu Dec 13 19:04:41 2007 @@ -8,6 +8,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Brian West"/> + <variable name="effective_caller_id_number" value="1000"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1001.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1001.xml (original) +++ freeswitch/trunk/conf/directory/default/1001.xml Thu Dec 13 19:04:41 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1001"/> + <variable name="effective_caller_id_number" value="1001"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1002.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1002.xml (original) +++ freeswitch/trunk/conf/directory/default/1002.xml Thu Dec 13 19:04:41 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1002"/> + <variable name="effective_caller_id_number" value="1002"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1003.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1003.xml (original) +++ freeswitch/trunk/conf/directory/default/1003.xml Thu Dec 13 19:04:41 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1003"/> + <variable name="effective_caller_id_number" value="1003"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1004.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1004.xml (original) +++ freeswitch/trunk/conf/directory/default/1004.xml Thu Dec 13 19:04:41 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1004"/> + <variable name="effective_caller_id_number" value="1004"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1005.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1005.xml (original) +++ freeswitch/trunk/conf/directory/default/1005.xml Thu Dec 13 19:04:41 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1005"/> + <variable name="effective_caller_id_number" value="1005"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1006.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1006.xml (original) +++ freeswitch/trunk/conf/directory/default/1006.xml Thu Dec 13 19:04:41 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1006"/> + <variable name="effective_caller_id_number" value="1006"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1007.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1007.xml (original) +++ freeswitch/trunk/conf/directory/default/1007.xml Thu Dec 13 19:04:41 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1007"/> + <variable name="effective_caller_id_number" value="1007"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1008.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1008.xml (original) +++ freeswitch/trunk/conf/directory/default/1008.xml Thu Dec 13 19:04:41 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1008"/> + <variable name="effective_caller_id_number" value="1008"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1009.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1009.xml (original) +++ freeswitch/trunk/conf/directory/default/1009.xml Thu Dec 13 19:04:41 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1009"/> + <variable name="effective_caller_id_number" value="1009"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1010.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1010.xml (original) +++ freeswitch/trunk/conf/directory/default/1010.xml Thu Dec 13 19:04:41 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1010"/> + <variable name="effective_caller_id_number" value="1010"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1011.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1011.xml (original) +++ freeswitch/trunk/conf/directory/default/1011.xml Thu Dec 13 19:04:41 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1011"/> + <variable name="effective_caller_id_number" value="1011"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1012.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1012.xml (original) +++ freeswitch/trunk/conf/directory/default/1012.xml Thu Dec 13 19:04:41 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1012"/> + <variable name="effective_caller_id_number" value="1012"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1013.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1013.xml (original) +++ freeswitch/trunk/conf/directory/default/1013.xml Thu Dec 13 19:04:41 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1013"/> + <variable name="effective_caller_id_number" value="1013"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1014.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1014.xml (original) +++ freeswitch/trunk/conf/directory/default/1014.xml Thu Dec 13 19:04:41 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1014"/> + <variable name="effective_caller_id_number" value="1014"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1015.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1015.xml (original) +++ freeswitch/trunk/conf/directory/default/1015.xml Thu Dec 13 19:04:41 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1015"/> + <variable name="effective_caller_id_number" value="1015"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1016.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1016.xml (original) +++ freeswitch/trunk/conf/directory/default/1016.xml Thu Dec 13 19:04:41 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1016"/> + <variable name="effective_caller_id_number" value="1016"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1017.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1017.xml (original) +++ freeswitch/trunk/conf/directory/default/1017.xml Thu Dec 13 19:04:41 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1017"/> + <variable name="effective_caller_id_number" value="1017"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1018.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1018.xml (original) +++ freeswitch/trunk/conf/directory/default/1018.xml Thu Dec 13 19:04:41 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1018"/> + <variable name="effective_caller_id_number" value="1018"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1019.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1019.xml (original) +++ freeswitch/trunk/conf/directory/default/1019.xml Thu Dec 13 19:04:41 2007 @@ -5,6 +5,8 @@ </params> <variables> <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Extension 1019"/> + <variable name="effective_caller_id_number" value="1019"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/trunk/conf/directory/default/brian.xml Thu Dec 13 19:04:41 2007 @@ -50,6 +50,8 @@ <variables>  <variable name="user_context" value="default"/> + <variable name="effective_caller_id_name" value="Brian West"/> + <variable name="effective_caller_id_number" value="1000"/>

1 0

[commit] r6774 - in freeswitch/trunk: conf/autoload_configs libs/curl/lib src/mod/applications/mod_voicemail src/mod/endpoints/mod_sofia
by Freeswitch SVN 14 Dec '07

14 Dec '07

Author: anthm Date: Thu Dec 13 19:00:57 2007 New Revision: 6774 Modified: freeswitch/trunk/conf/autoload_configs/console.conf.xml freeswitch/trunk/libs/curl/lib/config.h.in freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: sip is fun Modified: freeswitch/trunk/conf/autoload_configs/console.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/console.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/console.conf.xml Thu Dec 13 19:00:57 2007 @@ -6,7 +6,7 @@ name can be a file name, function name or 'all' value is one or more of debug,info,notice,warning,err,crit,alert,all --> - <map name="all" value="info,notice,warning,err,crit,alert"/> + <map name="all" value="debug,info,notice,warning,err,crit,alert"/> </mappings> <settings>  Modified: freeswitch/trunk/libs/curl/lib/config.h.in ============================================================================== --- freeswitch/trunk/libs/curl/lib/config.h.in (original) +++ freeswitch/trunk/libs/curl/lib/config.h.in Thu Dec 13 19:00:57 2007 @@ -621,16 +621,16 @@ /* Define to the function return type for send. */ #undef SEND_TYPE_RETV -/* The size of `curl_off_t', as computed by sizeof. */ +/* The size of a `curl_off_t', as computed by sizeof. */ #undef SIZEOF_CURL_OFF_T -/* The size of `long', as computed by sizeof. */ +/* The size of a `long', as computed by sizeof. */ #undef SIZEOF_LONG -/* The size of `size_t', as computed by sizeof. */ +/* The size of a `size_t', as computed by sizeof. */ #undef SIZEOF_SIZE_T -/* The size of `time_t', as computed by sizeof. */ +/* The size of a `time_t', as computed by sizeof. */ #undef SIZEOF_TIME_T /* Define to 1 if you have the ANSI C header files. */ @@ -685,7 +685,7 @@ /* type to use in place of in_addr_t if not defined */ #undef in_addr_t -/* Define to `unsigned int' if <sys/types.h> does not define. */ +/* Define to `unsigned' if <sys/types.h> does not define. */ #undef size_t /* type to use in place of socklen_t if not defined */ 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 Thu Dec 13 19:00:57 2007 @@ -1361,6 +1361,8 @@ listen_callback_t cbt; char sql[256]; int cur_message, total_messages; + switch_event_t *event; + message_count(profile, myid, domain_name, myfolder, &total_new_messages, &total_saved_messages, &total_new_urgent_messages, &total_saved_urgent_messages); memset(&cbt, 0, sizeof(cbt)); @@ -1402,6 +1404,26 @@ switch_snprintf(sql, sizeof(sql), "delete from voicemail_data where user='%s' and domain='%s' and flags='delete'", myid, domain_name); vm_execute_sql(profile, sql, profile->mutex); vm_check_state = VM_CHECK_FOLDER_SUMMARY; + + + message_count(profile, id, domain_name, myfolder, &total_new_messages, &total_saved_messages, + &total_new_urgent_messages, &total_saved_urgent_messages); + + if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { + char *mwi_id; + const char *yn = "no"; + if (total_new_messages || total_saved_messages || total_new_urgent_messages || total_saved_urgent_messages) { + yn = "yes"; + } + mwi_id = switch_mprintf("%s@%s", myid, domain_name); + switch_assert(mwi_id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "%s", yn); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", mwi_id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d (%d/%d)", + total_new_messages, total_saved_messages, total_new_urgent_messages, total_saved_urgent_messages); + switch_event_fire(&event); + switch_safe_free(mwi_id); + } } break; case VM_CHECK_CONFIG: @@ -1907,8 +1929,12 @@ &total_new_urgent_messages, &total_saved_urgent_messages); if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { + const char *yn = "no"; + if (total_new_messages || total_saved_messages || total_new_urgent_messages || total_saved_urgent_messages) { + yn = "yes"; + } mwi_id = switch_mprintf("%s@%s", id, domain_name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "yes"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "%s", yn); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", mwi_id); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d (%d/%d)", total_new_messages, total_saved_messages, total_new_urgent_messages, total_saved_urgent_messages); @@ -2163,7 +2189,11 @@ &total_new_urgent_messages, &total_saved_urgent_messages); if (total_new_messages || total_saved_messages) { if (switch_event_create(&new_event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "yes"); + const char *yn = "no"; + if (total_new_messages || total_saved_messages || total_new_urgent_messages || total_saved_urgent_messages) { + yn = "yes"; + } + switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "%s", yn); switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", account); switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d (%d/%d)", total_new_messages, total_saved_messages, total_new_urgent_messages, total_saved_urgent_messages); 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 Thu Dec 13 19:00:57 2007 @@ -1736,7 +1736,7 @@ switch_odbc_handle_exec(profile->master_odbc, reg_sql, NULL); } - if (switch_odbc_handle_exec(profile->master_odbc, "select * from sip_subscriptions where sip_user == ''", NULL) != SWITCH_ODBC_SUCCESS) { + if (switch_odbc_handle_exec(profile->master_odbc, "delete from sip_subscriptions where sip_user != ''", NULL) != SWITCH_ODBC_SUCCESS) { switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_subscriptions", NULL); switch_odbc_handle_exec(profile->master_odbc, sub_sql, NULL); } @@ -1754,7 +1754,7 @@ } switch_core_db_test_reactive(profile->master_db, "select sip_user from sip_registrations", "DROP TABLE sip_registrations", reg_sql); - switch_core_db_test_reactive(profile->master_db, "select * from sip_subscriptions where sip_user == ''", "DROP TABLE sip_subscriptions", sub_sql); + switch_core_db_test_reactive(profile->master_db, "delete * from sip_subscriptions where sip_user != ''", "DROP TABLE sip_subscriptions", sub_sql); switch_core_db_test_reactive(profile->master_db, "select * from sip_authentication", "DROP TABLE sip_authentication", auth_sql); } 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 Thu Dec 13 19:00:57 2007 @@ -647,7 +647,7 @@ nua_handle_t *nh; int expire_sec = atoi(expires); int *total = (int *) pArg; - + if (!(profile = sofia_glue_find_profile(sub_to_host))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile for host %s\n", sub_to_host); return 0; @@ -673,7 +673,7 @@ switch_safe_free(exp); sofia_glue_release_profile(profile); - *total++; + (*total)++; return 0; } @@ -689,27 +689,32 @@ sofia_profile_t *profile = NULL; char *id = NULL; nua_handle_t *nh; - + char *contact; + if (!(profile = sofia_glue_find_profile(sub_to_host))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile for host %s\n", sub_to_host); return 0; } id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); + + contact = sofia_glue_get_url_from_contact(argv[3], 0); nh = nua_handle(profile->nua, NULL, + NUTAG_URL(contact), SIPTAG_FROM_STR(id), - SIPTAG_TO_STR(id), SIPTAG_CONTACT_STR(profile->url), TAG_END()); - + SIPTAG_TO_STR(id), + SIPTAG_CONTACT_STR(profile->url), + TAG_END()); nua_notify(nh, NUTAG_NEWSUB(1), SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR("application/simple-message-summary"), SIPTAG_PAYLOAD_STR(body), TAG_END()); switch_safe_free(id); - + sofia_glue_release_profile(profile); - + return 0; }

1 0

[commit] r6773 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 13 Dec '07

13 Dec '07

Author: anthm Date: Thu Dec 13 18:30:16 2007 New Revision: 6773 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: update 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 Thu Dec 13 18:30:16 2007 @@ -1736,7 +1736,7 @@ switch_odbc_handle_exec(profile->master_odbc, reg_sql, NULL); } - if (switch_odbc_handle_exec(profile->master_odbc, "delete from sip_subscriptions where sip_user != ''", NULL) != SWITCH_ODBC_SUCCESS) { + if (switch_odbc_handle_exec(profile->master_odbc, "select * from sip_subscriptions where sip_user == ''", NULL) != SWITCH_ODBC_SUCCESS) { switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_subscriptions", NULL); switch_odbc_handle_exec(profile->master_odbc, sub_sql, NULL); } @@ -1754,7 +1754,7 @@ } switch_core_db_test_reactive(profile->master_db, "select sip_user from sip_registrations", "DROP TABLE sip_registrations", reg_sql); - switch_core_db_test_reactive(profile->master_db, "delete from sip_subscriptions where sip_user != ''", "DROP TABLE sip_subscriptions", sub_sql); + switch_core_db_test_reactive(profile->master_db, "select * from sip_subscriptions where sip_user == ''", "DROP TABLE sip_subscriptions", sub_sql); switch_core_db_test_reactive(profile->master_db, "select * from sip_authentication", "DROP TABLE sip_authentication", auth_sql); } 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 Thu Dec 13 18:30:16 2007 @@ -35,6 +35,7 @@ #include "mod_sofia.h" static int sofia_presence_mwi_callback(void *pArg, int argc, char **argv, char **columnNames); +static int sofia_presence_mwi_callback2(void *pArg, int argc, char **argv, char **columnNames); static int sofia_presence_sub_reg_callback(void *pArg, int argc, char **argv, char **columnNames); static int sofia_presence_resub_callback(void *pArg, int argc, char **argv, char **columnNames); static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char **columnNames); @@ -182,7 +183,8 @@ sofia_profile_t *profile = NULL; switch_stream_handle_t stream = { 0 }; switch_event_header_t *hp; - + int count = 0; + switch_assert(event != NULL); if (!(account = switch_event_get_header(event, "mwi-message-account"))) { @@ -224,7 +226,7 @@ sql = switch_mprintf("select *,'%q' from sip_subscriptions where event='message-summary' and sub_to_user='%q' and sub_to_host='%q'", stream.data, user, host); - switch_safe_free(stream.data); + switch_assert (sql != NULL); sofia_glue_execute_sql_callback(profile, @@ -232,9 +234,31 @@ profile->ireg_mutex, sql, sofia_presence_mwi_callback, - profile); + &count); switch_safe_free(sql); + + + if (!count) { + sql = switch_mprintf("select *,'%q' from sip_registrations where sip_user='%q' and sip_host='%q'", + stream.data, user, host); + + + + switch_assert (sql != NULL); + sofia_glue_execute_sql_callback(profile, + SWITCH_FALSE, + profile->ireg_mutex, + sql, + sofia_presence_mwi_callback2, + profile); + + switch_safe_free(sql); + } + + + switch_safe_free(stream.data); + switch_safe_free(dup_account); if (profile) { sofia_glue_release_profile(profile); @@ -622,6 +646,7 @@ char *id = NULL; nua_handle_t *nh; int expire_sec = atoi(expires); + int *total = (int *) pArg; if (!(profile = sofia_glue_find_profile(sub_to_host))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile for host %s\n", sub_to_host); @@ -643,11 +668,47 @@ nua_notify(nh, SIPTAG_SUBSCRIPTION_STATE_STR(exp), SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR("application/simple-message-summary"), SIPTAG_PAYLOAD_STR(body), TAG_END()); - + switch_safe_free(id); switch_safe_free(exp); sofia_glue_release_profile(profile); + *total++; + return 0; +} + + + + +static int sofia_presence_mwi_callback2(void *pArg, int argc, char **argv, char **columnNames) +{ + char *sub_to_user = argv[1]; + char *sub_to_host = argv[2]; + char *event = "message-summary"; + char *body = argv[7]; + sofia_profile_t *profile = NULL; + char *id = NULL; + nua_handle_t *nh; + + if (!(profile = sofia_glue_find_profile(sub_to_host))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find profile for host %s\n", sub_to_host); + return 0; + } + + id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); + + nh = nua_handle(profile->nua, NULL, + SIPTAG_FROM_STR(id), + SIPTAG_TO_STR(id), SIPTAG_CONTACT_STR(profile->url), TAG_END()); + + + nua_notify(nh, + NUTAG_NEWSUB(1), + SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR("application/simple-message-summary"), SIPTAG_PAYLOAD_STR(body), TAG_END()); + + switch_safe_free(id); + + sofia_glue_release_profile(profile); return 0; }

1 0

[commit] r6772 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 13 Dec '07

13 Dec '07

Author: brian Date: Thu Dec 13 17:47:06 2007 New Revision: 6772 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: the answer is... Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Thu Dec 13 17:47:06 2007 @@ -108,6 +108,8 @@ </condition> <condition field="destination_number" expression="^${caller_id_number}$"> <action application="set" data="voicemail_authorized=${sip_authorized}"/> + <action application="answer"/> + <action application="sleep" data="1000"/> <action application="voicemail" data="check default $${domain} ${dialed_ext}"/> <anti-action application="set" data="call_timeout=30000"/> <anti-action application="set" data="hangup_after_bridge=true"/> @@ -115,6 +117,8 @@ <anti-action application="db" data="insert/call_return/${dialed_ext}/${caller_id_number}"/> <anti-action application="db" data="insert/last_dial_ext/${dialed_ext}/${uuid}"/> <anti-action application="bridge" data="USER/${dialed_ext}@$${domain}"/> + <anti-action application="answer"/> + <anti-action application="sleep" data="1000"/> <anti-action application="voicemail" data="default $${domain} ${dialed_ext}"/> </condition> </extension>

1 0

[commit] r6771 - in freeswitch/trunk/src: . include mod/applications/mod_commands mod/applications/mod_dptools
by Freeswitch SVN 13 Dec '07

13 Dec '07

Author: anthm Date: Thu Dec 13 17:17:20 2007 New Revision: 6771 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_state_machine.c freeswitch/trunk/src/switch_ivr.c Log: add park_state Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Thu Dec 13 17:17:20 2007 @@ -719,6 +719,7 @@ switch_input_args_t *args); SWITCH_DECLARE(void) switch_ivr_delay_echo(switch_core_session_t *session, uint32_t delay_ms); SWITCH_DECLARE(void) switch_ivr_intercept_session(switch_core_session_t *session, const char *uuid); +SWITCH_DECLARE(void) switch_ivr_park_session(switch_core_session_t *session); /** @} */ Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Thu Dec 13 17:17:20 2007 @@ -53,6 +53,7 @@ SWITCH_SHN_ON_HANGUP, SWITCH_SHN_ON_LOOPBACK, SWITCH_SHN_ON_TRANSMIT, + SWITCH_SHN_ON_PARK, SWITCH_SHN_ON_HOLD, SWITCH_SHN_ON_HIBERNATE, SWITCH_SHN_ON_RESET @@ -71,6 +72,8 @@ switch_state_handler_t on_loopback; /*! executed when the state changes to transmit */ switch_state_handler_t on_transmit; + /*! executed when the state changes to park */ + switch_state_handler_t on_park; /*! executed when the state changes to hold */ switch_state_handler_t on_hold; /*! executed when the state changes to hibernate */ Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu Dec 13 17:17:20 2007 @@ -560,6 +560,7 @@ CS_TRANSMIT - Channel is in a passive transmit state CS_EXECUTE - Channel is executing it's dialplan CS_LOOPBACK - Channel is in loopback +CS_PARK - Channel is parked CS_HOLD - Channel is on hold CS_HIBERNATE - Channel is in a sleep state CS_RESET - Channel is in a reset state @@ -574,6 +575,7 @@ CS_TRANSMIT, CS_EXECUTE, CS_LOOPBACK, + CS_PARK, CS_HOLD, CS_HIBERNATE, CS_RESET, 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 Thu Dec 13 17:17:20 2007 @@ -685,6 +685,29 @@ return SWITCH_STATUS_SUCCESS; } + +#define PARK_SYNTAX "<uuid>" +SWITCH_STANDARD_API(park_function) +{ + switch_core_session_t *ksession = NULL; + + if (session) { + return SWITCH_STATUS_FALSE; + } + + if (!cmd) { + stream->write_function(stream, "-USAGE: %s\n", PARK_SYNTAX); + } else if ((ksession = switch_core_session_locate(cmd))) { + switch_ivr_park_session(ksession); + switch_core_session_rwunlock(ksession); + stream->write_function(stream, "+OK\n"); + } else { + stream->write_function(stream, "-ERR No Such Channel!\n"); + } + + return SWITCH_STATUS_SUCCESS; +} + #define TRANSFER_SYNTAX "<uuid> [-bleg|-both] <dest-exten> [<dialplan>] [<context>]" SWITCH_STANDARD_API(transfer_function) { @@ -1994,11 +2017,14 @@ SWITCH_ADD_API(commands_api_interface, "originate", "Originate a Call", originate_function, ORIGINATE_SYNTAX); SWITCH_ADD_API(commands_api_interface, "tone_detect", "Start Tone Detection on a channel", tone_detect_session_function, TONE_DETECT_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "killchan", "Kill Channel", kill_function, KILL_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "killchan", "Kill Channel (depricated)", kill_function, KILL_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "uuid_kill", "Kill Channel", kill_function, KILL_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "uuid_park", "Park Channel", park_function, PARK_SYNTAX); SWITCH_ADD_API(commands_api_interface, "reloadxml", "Reload XML", reload_function, ""); SWITCH_ADD_API(commands_api_interface, "unload", "Unload Module", unload_function, LOAD_SYNTAX); SWITCH_ADD_API(commands_api_interface, "load", "Load Module", load_function, LOAD_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "transfer", "Transfer Module", transfer_function, TRANSFER_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "transfer", "Transfer (depricated)", transfer_function, TRANSFER_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "uuid_transfer", "Transfer a session", transfer_function, TRANSFER_SYNTAX); SWITCH_ADD_API(commands_api_interface, "pause", "Pause", pause_function, PAUSE_SYNTAX); SWITCH_ADD_API(commands_api_interface, "break", "Break", break_function, BREAK_SYNTAX); SWITCH_ADD_API(commands_api_interface, "show", "Show", show_function, SHOW_SYNTAX); @@ -2008,11 +2034,17 @@ SWITCH_ADD_API(commands_api_interface, "uuid_getvar", "uuid_getvar", uuid_getvar_function, GETVAR_SYNTAX); SWITCH_ADD_API(commands_api_interface, "global_setvar", "global_setvar", global_setvar_function, GLOBAL_SETVAR_SYNTAX); SWITCH_ADD_API(commands_api_interface, "global_getvar", "global_getvar", global_getvar_function, GLOBAL_GETVAR_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "session_displace", "session displace", session_displace_function, "<uuid> [start|stop] <path> [<limit>] [mux]"); - SWITCH_ADD_API(commands_api_interface, "session_record", "session record", session_record_function, SESS_REC_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "broadcast", "broadcast", uuid_broadcast_function, BROADCAST_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "hold", "hold", uuid_hold_function, HOLD_SYNTAX); - SWITCH_ADD_API(commands_api_interface, "media", "media", uuid_media_function, MEDIA_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "session_displace", "session displace (depricated)", + session_displace_function, "<uuid> [start|stop] <path> [<limit>] [mux]"); + SWITCH_ADD_API(commands_api_interface, "uuid_displace", "session displace", session_displace_function, "<uuid> [start|stop] <path> [<limit>] [mux]"); + SWITCH_ADD_API(commands_api_interface, "session_record", "session record (depricated)", session_record_function, SESS_REC_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "uuid_record", "session record", session_record_function, SESS_REC_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "broadcast", "broadcast (depricated)", uuid_broadcast_function, BROADCAST_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "uuid_broadcast", "broadcast", uuid_broadcast_function, BROADCAST_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "hold", "hold (depricated)", uuid_hold_function, HOLD_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "uuid_hold", "hold", uuid_hold_function, HOLD_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "media", "media (depricated)", uuid_media_function, MEDIA_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "uuid media", "media", uuid_media_function, MEDIA_SYNTAX); SWITCH_ADD_API(commands_api_interface, "fsctl", "control messages", ctl_function, CTL_SYNTAX); SWITCH_ADD_API(commands_api_interface, "help", "Show help for all the api commands", help_function, ""); SWITCH_ADD_API(commands_api_interface, "version", "Show version of the switch", version_function, ""); Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Thu Dec 13 17:17:20 2007 @@ -1027,6 +1027,12 @@ } +SWITCH_STANDARD_APP(park_state_function) +{ + switch_ivr_park_session(session); + +} + /********************************************************************************/ /* Playback/Record Functions */ /********************************************************************************/ @@ -1637,7 +1643,8 @@ SWITCH_ADD_APP(app_interface, "fax_detect", "Detect faxes", "Detect fax send tone", fax_detect_session_function, "", SAF_NONE); SWITCH_ADD_APP(app_interface, "tone_detect", "Detect tones", "Detect tones", tone_detect_session_function, "", SAF_NONE); SWITCH_ADD_APP(app_interface, "echo", "Echo", "Perform an echo test against the calling channel", echo_function, "", SAF_NONE); - SWITCH_ADD_APP(app_interface, "park", NULL, NULL, park_function, NULL, SAF_NONE); + SWITCH_ADD_APP(app_interface, "park", "Park", "Park", park_function, "", SAF_NONE); + SWITCH_ADD_APP(app_interface, "park_state", "Park State", "Park State", park_state_function, "", SAF_NONE); SWITCH_ADD_APP(app_interface, "gentones", "Generate Tones", "Generate tones to the channel", gentones_function, "<tgml_script>[|<loops>]", SAF_NONE); SWITCH_ADD_APP(app_interface, "playback", "Playback File", "Playback a file to the channel", playback_function, "<path>", SAF_NONE); SWITCH_ADD_APP(app_interface, "stop_record_session", "Stop Record Session", STOP_SESS_REC_DESC, stop_record_session_function, "<path>", SAF_NONE); Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Thu Dec 13 17:17:20 2007 @@ -553,6 +553,7 @@ "CS_TRANSMIT", "CS_EXECUTE", "CS_LOOPBACK", + "CS_PARK", "CS_HOLD", "CS_HIBERNATE", "CS_RESET", @@ -666,6 +667,7 @@ case CS_TRANSMIT: case CS_RING: case CS_EXECUTE: + case CS_PARK: case CS_HOLD: case CS_HIBERNATE: case CS_RESET: @@ -680,6 +682,7 @@ case CS_TRANSMIT: case CS_RING: case CS_EXECUTE: + case CS_PARK: case CS_HOLD: case CS_HIBERNATE: case CS_RESET: @@ -694,6 +697,7 @@ case CS_LOOPBACK: case CS_RING: case CS_EXECUTE: + case CS_PARK: case CS_HOLD: case CS_HIBERNATE: case CS_RESET: @@ -703,6 +707,21 @@ } break; + case CS_PARK: + switch (state) { + case CS_LOOPBACK: + case CS_RING: + case CS_EXECUTE: + case CS_TRANSMIT: + case CS_HIBERNATE: + case CS_RESET: + case CS_HOLD: + ok++; + default: + break; + } + break; + case CS_HOLD: switch (state) { case CS_LOOPBACK: @@ -711,6 +730,7 @@ case CS_TRANSMIT: case CS_HIBERNATE: case CS_RESET: + case CS_PARK: ok++; default: break; @@ -723,6 +743,7 @@ case CS_RING: case CS_EXECUTE: case CS_TRANSMIT: + case CS_PARK: case CS_HOLD: case CS_RESET: ok++; @@ -737,6 +758,7 @@ case CS_LOOPBACK: case CS_EXECUTE: case CS_TRANSMIT: + case CS_PARK: case CS_HOLD: case CS_HIBERNATE: case CS_RESET: @@ -751,6 +773,7 @@ case CS_LOOPBACK: case CS_TRANSMIT: case CS_RING: + case CS_PARK: case CS_HOLD: case CS_HIBERNATE: case CS_RESET: Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Thu Dec 13 17:17:20 2007 @@ -205,6 +205,15 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard TRANSMIT\n"); } +static void switch_core_standard_on_park(switch_core_session_t *session) +{ + switch_assert(session != NULL); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Standard PARK\n"); + switch_channel_clear_flag(session->channel, CF_TRANSFER); + switch_core_session_reset(session); + switch_ivr_park(session, NULL); +} + static void switch_core_standard_on_hold(switch_core_session_t *session) { switch_assert(session != NULL); @@ -419,6 +428,9 @@ case CS_TRANSMIT: /* send/recieve data to/from another channel */ STATE_MACRO(transmit, "TRANSMIT"); break; + case CS_PARK: /* wait in limbo */ + STATE_MACRO(park, "PARK"); + break; case CS_HOLD: /* wait in limbo */ STATE_MACRO(hold, "HOLD"); break; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Dec 13 17:17:20 2007 @@ -1494,6 +1494,13 @@ return SWITCH_STATUS_FALSE; } +SWITCH_DECLARE(void) switch_ivr_park_session(switch_core_session_t *session) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_set_state_flag(channel, CF_TRANSFER); + switch_channel_set_state(channel, CS_PARK); +} + SWITCH_DECLARE(void) switch_ivr_delay_echo(switch_core_session_t *session, uint32_t delay_ms) { stfu_instance_t *jb;

1 0

[commit] r6770 - in freeswitch/trunk/src: . mod/formats/mod_local_stream
by Freeswitch SVN 13 Dec '07

13 Dec '07

Author: anthm Date: Thu Dec 13 16:34:13 2007 New Revision: 6770 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/trunk/src/switch_core_file.c Log: add buffering to local_stream Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Thu Dec 13 16:34:13 2007 @@ -31,7 +31,7 @@ */ #include <switch.h> /* for apr_pstrcat */ -#define DEFAULT_PREBUFFER_SIZE 1024 * 64 +#define DEFAULT_PREBUFFER_SIZE 1024 * 16 SWITCH_MODULE_LOAD_FUNCTION(mod_local_stream_load); SWITCH_MODULE_DEFINITION(mod_local_stream, mod_local_stream_load, NULL, NULL); @@ -85,10 +85,6 @@ switch_byte_t *dist_buf; switch_size_t used; - if (switch_core_timer_init(&timer, source->timer_name, source->interval, source->samples, source->pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Can't start timer.\n"); - return NULL; - } if (!source->prebuf) { source->prebuf = DEFAULT_PREBUFFER_SIZE; @@ -154,7 +150,16 @@ continue; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Playing %s\n", fname); + source->rate = fh.samplerate; + source->samples = switch_bytes_per_frame(fh.native_rate, source->interval); + + if (switch_core_timer_init(&timer, source->timer_name, source->interval, source->samples, source->pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Can't start timer.\n"); + return NULL; + } + + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Playing %s rate: %d\n", fname, source->rate); while (RUNNING) { switch_core_timer_next(&timer); @@ -164,19 +169,13 @@ switch_core_file_close(&fh); break; } - + switch_buffer_write(audio_buffer, abuf, olen * 2); used = switch_buffer_inuse(audio_buffer); - - if (!source->total) { - if (used >= source->prebuf) { - switch_buffer_read(audio_buffer, abuf, olen * 2); - } - } else { - int dist_len = ((source->prebuf * 95) / 100); - - if (used >= dist_len) { - switch_buffer_read(audio_buffer, dist_buf, used); + + if (used >= source->prebuf || (source->total && used > source->samples * 2)) { + used = switch_buffer_read(audio_buffer, dist_buf, source->samples * 2); + if (source->total) { switch_mutex_lock(source->mutex); for (cp = source->context_list; cp; cp = cp->next) { switch_mutex_lock(cp->audio_mutex); @@ -188,6 +187,8 @@ } } + switch_core_timer_destroy(&timer); + } switch_dir_close(source->dir_handle); @@ -300,6 +301,24 @@ static switch_status_t local_stream_file_read(switch_file_handle_t *handle, void *data, size_t *len) { + local_stream_context_t *context = handle->private_info; + switch_size_t bytes = 0; + size_t need = *len * 2; + + switch_mutex_lock(context->audio_mutex); + if ((bytes = switch_buffer_read(context->audio_buffer, data, need))) { + *len = bytes / 2; + } else { + if (need > 2560) { + need = 2560; + } + memset(data, 255, need); + *len = need / 2; + } + switch_mutex_unlock(context->audio_mutex); + handle->sample_count += *len; + return SWITCH_STATUS_SUCCESS; +#if 0 local_stream_context_t *context = handle->private_info; switch_size_t bytes = 0; size_t need = *len * 2; @@ -320,6 +339,7 @@ handle->sample_count += *len; return SWITCH_STATUS_SUCCESS; +#endif } static switch_status_t local_stream_file_write(switch_file_handle_t *handle, void *data, size_t *len) Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Thu Dec 13 16:34:13 2007 @@ -95,7 +95,7 @@ fh->native_rate = rate; } - if (fh->samplerate != rate) { + if (fh->samplerate && rate && fh->samplerate != rate) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Sample rate doesn't match\n"); if ((flags & SWITCH_FILE_FLAG_READ)) { fh->samplerate = rate;

1 0