- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9403 - freeswitch/trunk/src
by Freeswitch SVN 02 Sep '08

02 Sep '08

Author: brian Date: Tue Sep 2 06:46:44 2008 New Revision: 9403 Modified: freeswitch/trunk/src/switch_console.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_ivr_originate.c freeswitch/trunk/src/switch_regex.c Log: getting rid of c++ comments in c files... OCD at work Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Tue Sep 2 06:46:44 2008 @@ -73,7 +73,7 @@ if ((i < 1) || (i > 12)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "keybind %s is invalid, range is from 1 to 12\n", var); } else { - // Add the command to the fnkey array + /* Add the command to the fnkey array */ console_fnkeys[i - 1] = switch_core_permanent_strdup(val); } } @@ -323,7 +323,7 @@ c = console_fnkeys[i - 1]; - // This new line is necessary to avoid output to begin after the ">" of the CLI's prompt + /* This new line is necessary to avoid output to begin after the ">" of the CLI's prompt */ switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, "\n"); if (c == NULL) { Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Tue Sep 2 06:46:44 2008 @@ -761,7 +761,7 @@ switch (status) { case SWITCH_STATUS_RESAMPLE: - //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "fixme 2\n"); + /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "fixme 2\n"); */ case SWITCH_STATUS_SUCCESS: session->enc_write_frame.codec = session->write_codec; session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t); Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Sep 2 06:46:44 2008 @@ -684,8 +684,8 @@ switch_copy_string(file, var, sizeof(file)); } } - // When using the AND operator, the fail_on_single_reject flag may be set in order to indicate that a single - // rejections should terminate the attempt rather than a timeout, answer, or rejection by all. + /* When using the AND operator, the fail_on_single_reject flag may be set in order to indicate that a single + rejections should terminate the attempt rather than a timeout, answer, or rejection by all. */ if ((var = switch_event_get_header(var_event, "fail_on_single_reject")) && switch_true(var)) { fail_on_single_reject = 1; } @@ -1011,10 +1011,11 @@ } if (!switch_core_session_running(peer_sessions[i])) { - //if (!(flags & SOF_NOBLOCK)) { - //switch_channel_set_state(peer_channels[i], CS_ROUTING); - //} - //} else { + /*if (!(flags & SOF_NOBLOCK)) { + switch_channel_set_state(peer_channels[i], CS_ROUTING); + } + } else { + */ switch_core_session_thread_launch(peer_sessions[i]); } } @@ -1143,8 +1144,9 @@ teletone_init_session(&ringback.ts, 0, teletone_handler, &ringback); ringback.ts.rate = read_codec->implementation->actual_samples_per_second; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Play Ringback Tone [%s]\n", ringback_data); - //ringback.ts.debug = 1; - //ringback.ts.debug_stream = switch_core_get_console(); + /* ringback.ts.debug = 1; + ringback.ts.debug_stream = switch_core_get_console(); + */ if (teletone_run(&ringback.ts, ringback_data)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Playing Tone\n"); teletone_destroy_session(&ringback.ts); @@ -1173,7 +1175,7 @@ switch_channel_ring_ready(caller_channel); sent_ring = 1; } - // When the AND operator is being used, and fail_on_single_reject is set, a hangup indicates that the call should fail. + /* When the AND operator is being used, and fail_on_single_reject is set, a hangup indicates that the call should fail. */ if ((to = (uint8_t) ((switch_timestamp(NULL) - start) >= (time_t) timelimit_sec)) || (fail_on_single_reject && hups)) { idx = IDX_TIMEOUT; Modified: freeswitch/trunk/src/switch_regex.c ============================================================================== --- freeswitch/trunk/src/switch_regex.c (original) +++ freeswitch/trunk/src/switch_regex.c Tue Sep 2 06:46:44 2008 @@ -163,33 +163,33 @@ SWITCH_DECLARE(switch_status_t) switch_regex_match(const char *target, const char *expression) { - const char *error = NULL; //Used to hold any errors - int error_offset = 0; //Holds the offset of an error - pcre *pcre_prepared = NULL; //Holds the compiled regex - int match_count = 0; //Number of times the regex was matched - int offset_vectors[2]; //not used, but has to exist or pcre won't even try to find a match + const char *error = NULL; /* Used to hold any errors */ + int error_offset = 0; /* Holds the offset of an error */ + pcre *pcre_prepared = NULL; /* Holds the compiled regex */ + int match_count = 0; /* Number of times the regex was matched */ + int offset_vectors[2]; /* not used, but has to exist or pcre won't even try to find a match */ - //Compile the expression + /* Compile the expression */ pcre_prepared = pcre_compile(expression, 0, &error, &error_offset, NULL); - //See if there was an error in the expression + /* See if there was an error in the expression */ if (error != NULL) { - //Clean up after ourselves + /* Clean up after ourselves */ if (pcre_prepared) { pcre_free(pcre_prepared); pcre_prepared = NULL; } - //Note our error + /* Note our error */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Regular Expression Error expression[%s] error[%s] location[%d]\n", expression, error, error_offset); - //We definitely didn't match anything + /* We definitely didn't match anything */ return SWITCH_STATUS_FALSE; } - //So far so good, run the regex + /* So far so good, run the regex */ match_count = pcre_exec(pcre_prepared, NULL, target, (int) strlen(target), 0, 0, offset_vectors, sizeof(offset_vectors) / sizeof(offset_vectors[0])); - //Clean up + /* Clean up */ if (pcre_prepared) { pcre_free(pcre_prepared); pcre_prepared = NULL; @@ -197,7 +197,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "number of matches: %d\n", match_count); - //Was it a match made in heaven? + /* Was it a match made in heaven? */ if (match_count > 0) { return SWITCH_STATUS_SUCCESS; } else {

1 0

[commit] r9402 - freeswitch/trunk/src
by Freeswitch SVN 02 Sep '08

02 Sep '08

Author: brian Date: Tue Sep 2 06:39:39 2008 New Revision: 9402 Modified: freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_ivr_play_say.c Log: comment cleanup and such Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Sep 2 06:39:39 2008 @@ -1160,7 +1160,7 @@ if (parser != NULL) { int pool_auto_created = 0; - // if the caller didn't provide a pool, make one + /* if the caller didn't provide a pool, make one */ if (pool == NULL) { switch_core_new_memory_pool(&pool); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "created a memory pool\n"); @@ -1168,11 +1168,11 @@ pool_auto_created = 1; } } - // if we have a pool, make a parser object + /* if we have a pool, make a parser object */ if (pool != NULL) { *parser = (switch_ivr_digit_stream_parser_t *) switch_core_alloc(pool, sizeof(switch_ivr_digit_stream_parser_t)); } - // if we have parser object, initialize it for the caller + /* if we have parser object, initialize it for the caller */ if (pool && *parser != NULL) { memset(*parser, 0, sizeof(switch_ivr_digit_stream_parser_t)); (*parser)->pool_auto_created = pool_auto_created; @@ -1183,7 +1183,7 @@ status = SWITCH_STATUS_SUCCESS; } else { status = SWITCH_STATUS_MEMERR; - // if we can't create a parser object,clean up the pool if we created it + /* if we can't create a parser object,clean up the pool if we created it */ if (pool != NULL && pool_auto_created) { switch_core_destroy_memory_pool(&pool); } @@ -1202,7 +1202,7 @@ switch_core_hash_destroy(&parser->hash); parser->hash = NULL; } - // free the memory pool if we created it + /* free the memory pool if we created it */ if (parser->pool_auto_created && parser->pool != NULL) { status = switch_core_destroy_memory_pool(&parser->pool); } @@ -1215,7 +1215,7 @@ { switch_status_t status = SWITCH_STATUS_FALSE; - // if we have a paser object memory pool and a stream object pointer that is null + /* if we have a paser object memory pool and a stream object pointer that is null */ if (parser != NULL && parser->pool && stream != NULL && *stream == NULL) { *stream = (switch_ivr_digit_stream_t *) switch_core_alloc(parser->pool, sizeof(switch_ivr_digit_stream_t)); if (*stream != NULL) { @@ -1250,9 +1250,10 @@ if (status == SWITCH_STATUS_SUCCESS) { switch_size_t len = strlen(digits); - // if we don't have a terminator, then we have to try and - // figure out when a digit set is completed, therefore we - // keep track of the min and max digit lengths + /* if we don't have a terminator, then we have to try and + * figure out when a digit set is completed, therefore we + * keep track of the min and max digit lengths + */ if (parser->terminator == '\0') { if (len > parser->maxlen) { parser->maxlen = len; @@ -1263,7 +1264,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "min len %u\n", (uint32_t) parser->minlen); } } else { - // since we have a terminator, reset min and max + /* since we have a terminator, reset min and max */ parser->minlen = 0; parser->maxlen = 0; } @@ -1298,13 +1299,14 @@ if (parser != NULL && stream != NULL) { switch_size_t len = (stream->digits != NULL ? strlen(stream->digits) : 0); - // handle new digit arrivals + /* handle new digit arrivals */ if (digit != '\0') { - // if it's not a terminator digit, add it to the collected digits + /* if it's not a terminator digit, add it to the collected digits */ if (digit != parser->terminator) { - // if collected digits length >= the max length of the keys - // in the hash table, then left shift the digit string + /* if collected digits length >= the max length of the keys + * in the hash table, then left shift the digit string + */ if (len > 0 && parser->maxlen != 0 && len >= parser->maxlen) { char *src = stream->digits + 1; char *dst = stream->digits; @@ -1323,15 +1325,16 @@ } } } - // don't allow collected digit string testing if there are varying sized keys until timeout + /* don't allow collected digit string testing if there are varying sized keys until timeout */ if (parser->maxlen - parser->minlen > 0 && (switch_timestamp_now() / 1000) - stream->last_digit_time < parser->digit_timeout_ms) { len = 0; } - // if we have digits to test + /* if we have digits to test */ if (len) { result = switch_core_hash_find(parser->hash, stream->digits); - // if we matched the digit string, or this digit is the terminator - // reset the collected digits for next digit string + /* if we matched the digit string, or this digit is the terminator + * reset the collected digits for next digit string + */ if (result != NULL || parser->terminator == digit) { free(stream->digits); stream->digits = NULL; @@ -1362,7 +1365,7 @@ if (parser != NULL) { parser->terminator = digit; - // since we have a terminator, reset min and max + /* since we have a terminator, reset min and max */ parser->minlen = 0; parser->maxlen = 0; status = SWITCH_STATUS_SUCCESS; @@ -1750,7 +1753,7 @@ switch_status_t status = SWITCH_STATUS_SUCCESS; if ((si = switch_loadable_module_get_say_interface(module_name))) { - // should go back and proto all the say mods to const.... + /* should go back and proto all the say mods to const.... */ status = si->say_function(session, (char *) tosay, switch_ivr_get_say_type_by_name(say_type), switch_ivr_get_say_method_by_name(say_method), args); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid SAY Interface [%s]!\n", module_name); @@ -1818,7 +1821,6 @@ return status; } - /* For Emacs: * Local Variables: * mode:c Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Tue Sep 2 06:39:39 2008 @@ -1436,102 +1436,102 @@ char *digits_regex) { - char terminator; //used to hold terminator recieved from - switch_channel_t *channel = switch_core_session_get_channel(session); //the channel contained in session - switch_status_t status; //used to recieve state out of called functions + char terminator; /* used to hold terminator recieved from */ + switch_channel_t *channel = switch_core_session_get_channel(session); /* the channel contained in session */ + switch_status_t status; /* used to recieve state out of called functions */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "switch_play_and_get_digits(session, %d, %d, %d, %d, %s, %s, %s, digit_buffer, %d, %s)\n", min_digits, max_digits, max_tries, timeout, valid_terminators, prompt_audio_file, bad_input_audio_file, digit_buffer_length, digits_regex); - //Answer the channel if it hasn't already been answered + /* Answer the channel if it hasn't already been answered */ switch_channel_pre_answer(channel); - //Start pestering the user for input + /* Start pestering the user for input */ for (; switch_channel_ready(channel) && max_tries > 0; max_tries--) { switch_input_args_t args = { 0 }; - //make the buffer so fresh and so clean clean + /* make the buffer so fresh and so clean clean */ memset(digit_buffer, 0, digit_buffer_length); args.buf = digit_buffer; args.buflen = digit_buffer_length; - //Play the file + /* Play the file */ status = switch_ivr_play_file(session, NULL, prompt_audio_file, &args); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "play gave up %s\n", (char *) digit_buffer); - //Make sure we made it out alive + /* Make sure we made it out alive */ if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { goto done; } - //we only get one digit out of playback, see if thats all we needed and what we got + /* we only get one digit out of playback, see if thats all we needed and what we got */ if (max_digits == 1 && status == SWITCH_STATUS_BREAK) { - //Check the digit if we have a regex + /* Check the digit if we have a regex */ if (digits_regex != NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking regex [%s] on [%s]\n", digits_regex, (char *) digit_buffer); - //Make sure the digit is allowed + /* Make sure the digit is allowed */ if (switch_regex_match(digit_buffer, digits_regex) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Match found!\n"); - //jobs done + /* jobs done */ break; } else { - //See if a bad input prompt was specified, if so, play it + /* See if a bad input prompt was specified, if so, play it */ if (strlen(bad_input_audio_file) > 0) { status = switch_ivr_play_file(session, NULL, bad_input_audio_file, NULL); - //Make sure we made it out alive + /* Make sure we made it out alive */ if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { goto done; } } } } else { - //jobs done + /* jobs done */ break; } } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Calling more digits try %d\n", max_tries); - //Try to grab some more digits for the timeout period + /* Try to grab some more digits for the timeout period */ status = switch_ivr_collect_digits_count(session, digit_buffer, digit_buffer_length, max_digits, valid_terminators, &terminator, timeout, 0, 0); - //Make sure we made it out alive + /* Make sure we made it out alive */ if (status != SWITCH_STATUS_SUCCESS) { - //Bail + /* Bail */ goto done; } - //see if we got enough + /* see if we got enough */ if (min_digits <= strlen(digit_buffer)) { - //See if we need to test a regex + /* See if we need to test a regex */ if (digits_regex != NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Checking regex [%s] on [%s]\n", digits_regex, (char *) digit_buffer); - //Test the regex + /* Test the regex */ if (switch_regex_match(digit_buffer, digits_regex) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Match found!\n"); - //Jobs done + /* Jobs done */ return SWITCH_STATUS_SUCCESS; } else { - //See if a bad input prompt was specified, if so, play it + /* See if a bad input prompt was specified, if so, play it */ if (strlen(bad_input_audio_file) > 0) { status = switch_ivr_play_file(session, NULL, bad_input_audio_file, NULL); - //Make sure we made it out alive + /* Make sure we made it out alive */ if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { goto done; } } } } else { - //Jobs done + /* Jobs done */ return SWITCH_STATUS_SUCCESS; } } } done: - //if we got here, we got no digits or lost the channel + /* if we got here, we got no digits or lost the channel */ digit_buffer = "\0"; return SWITCH_STATUS_FALSE; } @@ -1659,9 +1659,8 @@ } if (args && (args->input_callback || args->buf || args->buflen)) { - /* - dtmf handler function you can hook up to be executed when a digit is dialed during playback - if you return anything but SWITCH_STATUS_SUCCESS the playback will stop. + /* dtmf handler function you can hook up to be executed when a digit is dialed during playback + * if you return anything but SWITCH_STATUS_SUCCESS the playback will stop. */ if (switch_channel_has_dtmf(channel)) { if (!args->input_callback && !args->buf) { @@ -1784,14 +1783,12 @@ } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "done speaking text\n"); flags = 0; switch_core_speech_flush_tts(sh); return status; } - struct cached_speech_handle { char tts_name[80]; char voice_name[80]; @@ -1799,6 +1796,7 @@ switch_codec_t codec; switch_timer_t timer; }; + typedef struct cached_speech_handle cached_speech_handle_t; SWITCH_DECLARE(void) switch_ivr_clear_speech_cache(switch_core_session_t *session) @@ -1817,7 +1815,6 @@ } } - SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text(switch_core_session_t *session, const char *tts_name, const char *voice_name, char *text, switch_input_args_t *args) { @@ -1894,7 +1891,6 @@ switch_channel_pre_answer(channel); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "OPEN TTS %s\n", tts_name); - codec_name = "L16"; if (need_create) { @@ -1993,7 +1989,6 @@ channel = switch_core_session_get_channel(session); switch_assert(channel != NULL); - if ((other_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { if ((other_session = switch_core_session_locate(other_uuid))) { other_channel = switch_core_session_get_channel(other_session); @@ -2038,7 +2033,6 @@ } - /* For Emacs: * Local Variables: * mode:c

1 0

[commit] r9401 - in freeswitch/trunk/src: . mod/applications/mod_dptools
by Freeswitch SVN 02 Sep '08

02 Sep '08

Author: brian Date: Tue Sep 2 06:17:44 2008 New Revision: 9401 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_menu.c Log: cleanup 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 Tue Sep 2 06:17:44 2008 @@ -1110,7 +1110,7 @@ if (channel) { switch_xml_t cxml = NULL, cfg = NULL, xml_menus = NULL, xml_menu = NULL; - // Open the config from the xml registry + /* Open the config from the xml registry */ switch_event_create(&params, SWITCH_EVENT_MESSAGE); switch_assert(params); switch_channel_event_set_data(channel, params); @@ -1119,12 +1119,12 @@ if ((xml_menus = switch_xml_child(cfg, "menus"))) { xml_menu = switch_xml_find_child(xml_menus, "menu", "name", (char *) data); - // if the menu was found + /* if the menu was found */ if (xml_menu != NULL) { switch_ivr_menu_xml_ctx_t *xml_ctx = NULL; switch_ivr_menu_t *menu_stack = NULL; - // build a menu tree and execute it + /* build a menu tree and execute it */ if (switch_ivr_menu_stack_xml_init(&xml_ctx, NULL) == SWITCH_STATUS_SUCCESS #ifdef _TEST_CALLBACK_ && switch_ivr_menu_stack_xml_add_custom(xml_ctx, "custom", &menu_handler) == SWITCH_STATUS_SUCCESS Modified: freeswitch/trunk/src/switch_ivr_menu.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_menu.c (original) +++ freeswitch/trunk/src/switch_ivr_menu.c Tue Sep 2 06:17:44 2008 @@ -481,8 +481,8 @@ } } - if (switch_test_flag(menu, SWITCH_IVR_MENU_FLAG_STACK)) { // top level - if (switch_test_flag(stack, SWITCH_IVR_MENU_FLAG_FALLTOMAIN)) { // catch the fallback and recover + if (switch_test_flag(menu, SWITCH_IVR_MENU_FLAG_STACK)) { /* top level */ + if (switch_test_flag(stack, SWITCH_IVR_MENU_FLAG_FALLTOMAIN)) { /* catch the fallback and recover */ switch_clear_flag(stack, SWITCH_IVR_MENU_FLAG_FALLTOMAIN); status = SWITCH_STATUS_SUCCESS; running = 1; @@ -552,7 +552,7 @@ { switch_status_t status = SWITCH_STATUS_FALSE; - // if this action/function does not exist yet + /* if this action/function does not exist yet */ if (xml_ctx != NULL && name != NULL && xml_ctx->pool != NULL && switch_ivr_menu_stack_xml_find(xml_ctx, name) == NULL) { switch_ivr_menu_xml_map_t *map = switch_core_alloc(xml_ctx->pool, sizeof(switch_ivr_menu_xml_map_t)); @@ -562,7 +562,7 @@ map->function = function; if (map->name != NULL) { - // insert map item at top of list + /* insert map item at top of list */ map->next = xml_ctx->map; xml_ctx->map = map; status = SWITCH_STATUS_SUCCESS; @@ -581,7 +581,6 @@ return status; } - static struct iam_s { const char *name; switch_ivr_action_t action; @@ -595,7 +594,6 @@ { NULL, 0} }; - SWITCH_DECLARE(switch_status_t) switch_ivr_menu_str2action(const char *action_name, switch_ivr_action_t *action) { int i; @@ -616,7 +614,6 @@ return SWITCH_STATUS_FALSE; } - static switch_bool_t is_valid_action(const char *action) { int i; @@ -642,12 +639,12 @@ switch_status_t status = SWITCH_STATUS_FALSE; int autocreated = 0; - // build a memory pool ? + /* build a memory pool ? */ if (pool == NULL) { status = switch_core_new_memory_pool(&pool); autocreated = 1; } - // allocate the xml context + /* allocate the xml context */ if (xml_menu_ctx != NULL && pool != NULL) { *xml_menu_ctx = switch_core_alloc(pool, sizeof(switch_ivr_menu_xml_ctx_t)); if (*xml_menu_ctx != NULL) { @@ -660,7 +657,7 @@ status = SWITCH_STATUS_FALSE; } } - // build the standard/default xml menu handler mappings + /* build the standard/default xml menu handler mappings */ if (status == SWITCH_STATUS_SUCCESS && xml_menu_ctx != NULL && *xml_menu_ctx != NULL) { int i; @@ -684,13 +681,13 @@ switch_status_t status = SWITCH_STATUS_FALSE; if (xml_menu_ctx != NULL && menu_stack != NULL && xml_menu != NULL) { - const char *menu_name = switch_xml_attr_soft(xml_menu, "name"); // if the attr doesn't exist, return "" - const char *greet_long = switch_xml_attr(xml_menu, "greet-long"); // if the attr doesn't exist, return NULL - const char *greet_short = switch_xml_attr(xml_menu, "greet-short"); // if the attr doesn't exist, return NULL - const char *invalid_sound = switch_xml_attr(xml_menu, "invalid-sound"); // if the attr doesn't exist, return NULL - 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 *menu_name = switch_xml_attr_soft(xml_menu, "name"); /* if the attr doesn't exist, return "" */ + const char *greet_long = switch_xml_attr(xml_menu, "greet-long"); /* if the attr doesn't exist, return NULL */ + const char *greet_short = switch_xml_attr(xml_menu, "greet-short"); /* if the attr doesn't exist, return NULL */ + const char *invalid_sound = switch_xml_attr(xml_menu, "invalid-sound"); /* if the attr doesn't exist, return NULL */ + 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 *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"); @@ -716,7 +713,7 @@ atoi(timeout), atoi(max_failures), xml_menu_ctx->pool); - // set the menu_stack for the caller + /* set the menu_stack for the caller */ if (status == SWITCH_STATUS_SUCCESS && *menu_stack == NULL) { *menu_stack = menu; } @@ -724,7 +721,7 @@ if (status == SWITCH_STATUS_SUCCESS && menu != NULL) { switch_xml_t xml_kvp; - // build menu entries + /* build menu entries */ for (xml_kvp = switch_xml_child(xml_menu, "entry"); xml_kvp != NULL && status == SWITCH_STATUS_SUCCESS; xml_kvp = xml_kvp->next) { const char *action = switch_xml_attr(xml_kvp, "action"); const char *digits = switch_xml_attr(xml_kvp, "digits"); @@ -734,7 +731,7 @@ switch_ivr_menu_xml_map_t *xml_map = xml_menu_ctx->map; int found = 0; - // find and appropriate xml handler + /* find and appropriate xml handler */ while (xml_map != NULL && !found) { if (!(found = (strcasecmp(xml_map->name, action) == 0))) { xml_map = xml_map->next; @@ -742,13 +739,13 @@ } if (found && xml_map != NULL) { - // do we need to build a new sub-menu ? + /* do we need to build a new sub-menu ? */ if (xml_map->action == SWITCH_IVR_ACTION_EXECMENU && switch_ivr_menu_find(*menu_stack, param) == NULL) { if ((xml_menu = switch_xml_find_child(xml_menus, "menu", "name", param)) != NULL) { status = switch_ivr_menu_stack_xml_build(xml_menu_ctx, menu_stack, xml_menus, xml_menu); } } - // finally bind the menu entry + /* finally bind the menu entry */ if (status == SWITCH_STATUS_SUCCESS) { if (xml_map->function != NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,

1 0

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

02 Sep '08

Author: brian Date: Tue Sep 2 05:56:09 2008 New Revision: 9400 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: fix FSBUILD-72 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 Tue Sep 2 05:56:09 2008 @@ -1422,11 +1422,11 @@ { int informed = 0; char msg_count[80] = ""; - switch_input_args_t args = { 0 }; + switch_input_args_t folder_args = { 0 }; - args.input_callback = cancel_on_dtmf; - args.buf = &global_buf; - args.buflen = sizeof(global_buf); + folder_args.input_callback = cancel_on_dtmf; + folder_args.buf = &global_buf; + folder_args.buflen = sizeof(global_buf); switch_channel_set_variable(channel, "voicemail_current_folder", myfolder); message_count(profile, myid, domain_name, myfolder, &total_new_messages, &total_saved_messages, @@ -1434,7 +1434,7 @@ if (total_new_urgent_messages > 0) { switch_snprintf(msg_count, sizeof(msg_count), "%d:urgent-new", total_new_urgent_messages); - TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, &args)); + TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, &folder_args)); informed++; if (!switch_strlen_zero_buf(global_buf)) { vm_check_state = VM_CHECK_MENU; @@ -1443,7 +1443,7 @@ } if (total_new_messages > 0 && total_new_messages != total_new_urgent_messages) { switch_snprintf(msg_count, sizeof(msg_count), "%d:new", total_new_messages); - TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, &args)); + TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, &folder_args)); informed++; if (!switch_strlen_zero_buf(global_buf)) { vm_check_state = VM_CHECK_MENU; @@ -1460,7 +1460,7 @@ if (!informed) { switch_snprintf(msg_count, sizeof(msg_count), "0:new"); - TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, &args)); + TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, &folder_args)); informed++; }

1 0

[commit] r9399 - in freeswitch/trunk/src/mod: applications/mod_conference applications/mod_dptools asr_tts/mod_openmrcp endpoints/mod_iax endpoints/mod_portaudio endpoints/mod_sofia
by Freeswitch SVN 02 Sep '08

02 Sep '08

Author: brian Date: Mon Sep 1 23:46:27 2008 New Revision: 9399 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: I before e, except after c. Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Mon Sep 1 23:46:27 2008 @@ -233,7 +233,7 @@ char *auto_record; uint32_t max_members; char *maxmember_sound; - uint32_t anounce_count; + uint32_t announce_count; switch_ivr_digit_stream_parser_t *dtmf_parser; char *pin; char *pin_sound; @@ -556,7 +556,7 @@ { switch_status_t status = SWITCH_STATUS_FALSE; switch_event_t *event; - char msg[512]; /* conference count anouncement */ + char msg[512]; /* conference count announcement */ call_list_t *call_list = NULL; switch_channel_t *channel; @@ -613,8 +613,8 @@ conference_member_say(member, saymsg, 0); } else { if (switch_strlen_zero(conference->special_announce)) { - /* anounce the total number of members in the conference */ - if (conference->count >= conference->anounce_count && conference->anounce_count > 1) { + /* announce the total number of members in the conference */ + if (conference->count >= conference->announce_count && conference->announce_count > 1) { switch_snprintf(msg, sizeof(msg), "There are %d callers", conference->count); conference_member_say(member, msg, CONF_DEFAULT_LEADIN); } else if (conference->count == 1 && !conference->perpetual_sound) { @@ -749,7 +749,7 @@ } } - if (conference->anounce_count == 1) { + if (conference->announce_count == 1) { conference->floor_holder = conference->members; } @@ -3983,7 +3983,7 @@ switch_threadattr_detach_set(thd_attr, 1); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); switch_thread_create(&thread, thd_attr, conference_outcall_run, call, conference->pool); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Lanuching BG Thread for outcall\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Launching BG Thread for outcall\n"); return SWITCH_STATUS_SUCCESS; } @@ -4845,7 +4845,7 @@ char *perpetual_sound = NULL; char *moh_sound = NULL; uint32_t max_members = 0; - uint32_t anounce_count = 0; + uint32_t announce_count = 0; char *maxmember_sound = NULL; uint32_t rate = 8000, interval = 20; switch_status_t status; @@ -4960,12 +4960,12 @@ } } else if (!strcasecmp(var, "max-members-sound") && !switch_strlen_zero(val)) { maxmember_sound = val; - } else if (!strcasecmp(var, "anounce-count") && !switch_strlen_zero(val)) { + } else if (!strcasecmp(var, "announce-count") && !switch_strlen_zero(val)) { errno = 0; // safety first - anounce_count = strtol(val, NULL, 0); + announce_count = strtol(val, NULL, 0); if (errno == ERANGE || errno == EINVAL) { - anounce_count = 0; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "anounce-count is invalid, not anouncing member counts\n"); + announce_count = 0; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "announce-count is invalid, not anouncing member counts\n"); } } else if (!strcasecmp(var, "suppress-events") && !switch_strlen_zero(val)) { suppress_events = val; @@ -5108,7 +5108,7 @@ } // its going to be 0 by default, set to a value otherwise so this should be safe conference->max_members = max_members; - conference->anounce_count = anounce_count; + conference->announce_count = announce_count; conference->name = switch_core_strdup(conference->pool, name); if (domain) { @@ -5144,7 +5144,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to install caller controls group '%s'\n", caller_controls); } } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "no caller controls intalled.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "no caller controls installed.\n"); } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to allocate caller control digit parser.\n"); 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 Mon Sep 1 23:46:27 2008 @@ -1559,7 +1559,7 @@ if (!switch_strlen_zero(data) && (mydata = switch_core_session_strdup(session, data))) { argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No arguements specified.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No arguments specified.\n"); return; } Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Mon Sep 1 23:46:27 2008 @@ -413,7 +413,7 @@ media_frame.codec_frame.buffer = (char *) media_frame.codec_frame.buffer + media_frame.codec_frame.size; } if (len > 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "None frame alligned data len [%d]\n", len); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "None frame aligned data len [%d]\n", len); } return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Mon Sep 1 23:46:27 2008 @@ -986,7 +986,7 @@ if (channel) { if (tech_media(tech_pvt, iaxevent) == SWITCH_STATUS_SUCCESS) { if (switch_channel_test_flag(channel, CF_ANSWERED)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Mutiple Answer %s?\n", switch_channel_get_name(channel)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Multiple Answer %s?\n", switch_channel_get_name(channel)); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Answer %s\n", switch_channel_get_name(channel)); Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Mon Sep 1 23:46:27 2008 @@ -1123,7 +1123,7 @@ return 0; error: - switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR, "An error occured while using the portaudio stream\n"); + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR, "An error occurred while using the portaudio stream\n"); switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR, "Error number: %d\n", err); switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_ERROR, "Error message: %s\n", Pa_GetErrorText(err)); return err; 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 Mon Sep 1 23:46:27 2008 @@ -1018,7 +1018,7 @@ to_host = switch_channel_get_variable(channel, "sip_to_host"); } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Challenging call %s\n", to_uri); - sofia_reg_auth_challange(NULL, tech_pvt->profile, tech_pvt->nh, REG_INVITE, to_host, 0); + sofia_reg_auth_challenge(NULL, tech_pvt->profile, tech_pvt->nh, REG_INVITE, to_host, 0); switch_channel_hangup(channel, SWITCH_CAUSE_USER_CHALLENGE); } else if (code == 484 && msg->numeric_arg) { const char *to = switch_channel_get_variable(channel, "sip_to_uri"); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Mon Sep 1 23:46:27 2008 @@ -554,7 +554,7 @@ void sofia_presence_mwi_event_handler(switch_event_t *event); void sofia_presence_cancel(void); switch_status_t config_sofia(int reload, char *profile_name); -void sofia_reg_auth_challange(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_regtype_t regtype, const char *realm, int stale); +void sofia_reg_auth_challenge(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_regtype_t regtype, const char *realm, int stale); auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, sip_t const *sip, const char *regstr, char *np, size_t nplen, char *ip, switch_event_t **v_event, long exptime, sofia_regtype_t regtype, const char *to_user); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Mon Sep 1 23:46:27 2008 @@ -442,7 +442,7 @@ } -void sofia_reg_auth_challange(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_regtype_t regtype, const char *realm, int stale) +void sofia_reg_auth_challenge(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_regtype_t regtype, const char *realm, int stale) { switch_uuid_t uuid; char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; @@ -702,7 +702,7 @@ } if (auth_res != AUTH_OK && !stale) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "send %s for [%s@%s]\n", forbidden ? "forbidden" : "challange", to_user, to_host); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "send %s for [%s@%s]\n", forbidden ? "forbidden" : "challenge", to_user, to_host); if (auth_res == AUTH_FORBIDDEN) { nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END()); } else { @@ -713,7 +713,7 @@ } if (!authorization || stale) { - sofia_reg_auth_challange(nua, profile, nh, regtype, to_host, stale); + sofia_reg_auth_challenge(nua, profile, nh, regtype, to_host, stale); if (regtype == REG_REGISTER && profile->debug) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Requesting Registration from: [%s@%s]\n", to_user, to_host); }

1 0

[commit] r9398 - freeswitch/trunk/src
by Freeswitch SVN 02 Sep '08

02 Sep '08

Author: brian Date: Mon Sep 1 23:25:01 2008 New Revision: 9398 Modified: freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_core_rwlock.c freeswitch/trunk/src/switch_core_state_machine.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_rtp.c freeswitch/trunk/src/switch_scheduler.c Log: spelling Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Mon Sep 1 23:25:01 2008 @@ -963,7 +963,7 @@ new_dtmf = *dtmf; if (new_dtmf.duration > switch_core_max_dtmf_duration(0)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXECSSIVE DTMF DIGIT [%c] LEN [%d]\n", + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXCESSIVE DTMF DIGIT [%c] LEN [%d]\n", switch_channel_get_name(session->channel), new_dtmf.digit, new_dtmf.duration); new_dtmf.duration = switch_core_max_dtmf_duration(0); } else if (!new_dtmf.duration) { @@ -993,7 +993,7 @@ new_dtmf = *dtmf; if (new_dtmf.duration > switch_core_max_dtmf_duration(0)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXECSSIVE DTMF DIGIT [%c] LEN [%d]\n", + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXCESSIVE DTMF DIGIT [%c] LEN [%d]\n", switch_channel_get_name(session->channel), new_dtmf.digit, new_dtmf.duration); new_dtmf.duration = switch_core_max_dtmf_duration(0); } else if (!new_dtmf.duration) { @@ -1063,7 +1063,7 @@ if (dtmf.duration > switch_core_max_dtmf_duration(0)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXECSSIVE DTMF DIGIT [%c] LEN [%d]\n", + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXCESSIVE DTMF DIGIT [%c] LEN [%d]\n", switch_channel_get_name(session->channel), dtmf.digit, dtmf.duration); dtmf.duration = switch_core_max_dtmf_duration(0); } else if (!dtmf.duration) { Modified: freeswitch/trunk/src/switch_core_rwlock.c ============================================================================== --- freeswitch/trunk/src/switch_core_rwlock.c (original) +++ freeswitch/trunk/src/switch_core_rwlock.c Mon Sep 1 23:25:01 2008 @@ -63,7 +63,7 @@ } else { status = (switch_status_t) switch_thread_rwlock_tryrdlock(session->rwlock); #ifdef SWITCH_DEBUG_RWLOCKS - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "%s Read lock AQUIRED\n", + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "%s Read lock ACQUIRED\n", switch_channel_get_name(session->channel)); #endif } @@ -76,7 +76,7 @@ SWITCH_DECLARE(void) switch_core_session_perform_write_lock(switch_core_session_t *session, const char *file, const char *func, int line) { - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "%s Write lock AQUIRED\n", + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "%s Write lock ACQUIRED\n", switch_channel_get_name(session->channel)); #else SWITCH_DECLARE(void) switch_core_session_write_lock(switch_core_session_t *session) 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 Mon Sep 1 23:25:01 2008 @@ -226,7 +226,7 @@ #else static void print_trace(void) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Trace not avaliable =(\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Trace not available =(\n"); } #endif Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Sep 1 23:25:01 2008 @@ -803,7 +803,7 @@ return SWITCH_STATUS_MEMERR; } - /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "hit serialze!.\n"); */ + /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "hit serialzed!.\n"); */ for (hp = event->headers; hp; hp = hp->next) { /* * grab enough memory to store 3x the string (url encode takes one char and turns it into %XX) Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Sep 1 23:25:01 2008 @@ -1386,7 +1386,7 @@ if (stat && rtp_session->recv_msg.header.pt != rtp_session->te && rtp_session->recv_msg.header.pt != rtp_session->cng_pt) { if (++rtp_session->srtp_errs >= MAX_SRTP_ERRS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "error: srtp unprotection failed with code %d%s\n", stat, + "error: srtp unprotect failed with code %d%s\n", stat, stat == err_status_replay_fail ? " (replay check failed)" : stat == err_status_auth_fail ? " (auth check failed)" : ""); ret = -1; @@ -1403,7 +1403,7 @@ - /* RFC2833 ... like all RFC RE: VoIP, guarenteed to drive you to insanity! + /* RFC2833 ... like all RFC RE: VoIP, guaranteed to drive you to insanity! We know the real rules here, but if we enforce them, it's an interop nightmare so, we put up with as much as we can so we don't have to deal with being punished for doing it right. Nice guys finish last! Modified: freeswitch/trunk/src/switch_scheduler.c ============================================================================== --- freeswitch/trunk/src/switch_scheduler.c (original) +++ freeswitch/trunk/src/switch_scheduler.c Mon Sep 1 23:25:01 2008 @@ -234,7 +234,7 @@ for (tp = globals.task_list; tp; tp = tp->next) { if (tp->task.task_id == task_id) { if (switch_test_flag(tp, SSHF_NO_DEL)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Attempt made to delete undeleteable task #%u (group %s)\n", + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Attempt made to delete undeletable task #%u (group %s)\n", tp->task.task_id, tp->task.group); break; } @@ -265,7 +265,7 @@ for (tp = globals.task_list; tp; tp = tp->next) { if (!switch_strlen_zero(group) && !strcmp(tp->task.group, group)) { if (switch_test_flag(tp, SSHF_NO_DEL)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Attempt made to delete undeleteable task #%u (group %s)\n", + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Attempt made to delete undeletable task #%u (group %s)\n", tp->task.task_id, group); continue; }

1 0

[commit] r9397 - freeswitch/trunk/src
by Freeswitch SVN 01 Sep '08

01 Sep '08

Author: brian Date: Mon Sep 1 11:40:36 2008 New Revision: 9397 Modified: freeswitch/trunk/src/switch_core_session.c Log: spelling Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Sep 1 11:40:36 2008 @@ -1047,7 +1047,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Application %s Requires media on channel %s!\n", app, switch_channel_get_name(session->channel)); } else if (!switch_test_flag(application_interface, SAF_SUPPORT_NOMEDIA) && !switch_channel_media_ready(session->channel)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Application %s Requires media! pre_anyswering channel %s\n", + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Application %s Requires media! pre_answering channel %s\n", app, switch_channel_get_name(session->channel)); if (switch_channel_pre_answer(session->channel) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Well, that didn't work very well did it? ...\n");

1 0

[commit] r9391 - freeswitch/trunk/src
by Freeswitch SVN 01 Sep '08

01 Sep '08

Author: brian Date: Mon Sep 1 00:46:56 2008 New Revision: 9391 Modified: freeswitch/trunk/src/switch_console.c Log: hrm its FreeSWITCH Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Mon Sep 1 00:46:56 2008 @@ -222,7 +222,7 @@ return 0; } if (!strcmp(cmd, "version")) { - switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, "FreeSwitch Version %s\n", SWITCH_VERSION_FULL); + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, "FreeSWITCH Version %s\n", SWITCH_VERSION_FULL); return 1; } if ((arg = strchr(cmd, '\r')) != 0 || (arg = strchr(cmd, '\n')) != 0) {

1 0

[commit] r9390 - freeswitch/trunk/src
by Freeswitch SVN 01 Sep '08

01 Sep '08

Author: brian Date: Mon Sep 1 00:43:57 2008 New Revision: 9390 Modified: freeswitch/trunk/src/switch_core_codec.c Log: Possessive codecs Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Mon Sep 1 00:43:57 2008 @@ -55,7 +55,7 @@ char tmp[30]; if (codec && !codec->implementation) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set ININITILIZED codec!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set INITIALIZED codec!\n"); return SWITCH_STATUS_FALSE; } @@ -363,7 +363,7 @@ } if (!switch_test_flag(codec, SWITCH_CODEC_FLAG_ENCODE)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec's encoder is not initialized!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec encoder is not initialized!\n"); return SWITCH_STATUS_GENERR; } @@ -388,7 +388,7 @@ } if (!switch_test_flag(codec, SWITCH_CODEC_FLAG_DECODE)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec's decoder is not initialized!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec decoder is not initialized!\n"); return SWITCH_STATUS_GENERR; }

1 0

[commit] r9389 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 31 Aug '08

31 Aug '08

Author: brian Date: Sun Aug 31 15:38:04 2008 New Revision: 9389 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: use callpark soft keys from linksys SPA phones. Thanks sekil Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sun Aug 31 15:38:04 2008 @@ -293,6 +293,39 @@ </condition> </extension> +  + <extension name="park"> + <condition field="source" expression="mod_sofia"/> + <condition field="destination_number" expression="callpark"/> + <condition field="${sip_refer_to}"> + <expression><![CDATA[<sip:callpark@${domain};orbit=(\d+)>]]></expression> + <action application="fifo" data="$1@${domain} in undef $${hold_music}"/> + </condition> + </extension> + +  + <extension name="unpark"> + <condition field="source" expression="mod_sofia"/> + <condition field="destination_number" expression="pickup"/> + <condition field="${sip_to_params}" expression="orbit\=(\d+)"> + <action application="answer"/> + <action application="fifo" data="$1@${domain} out nowait"/> + </condition> + </extension> + <extension name="show_info"> <condition field="destination_number" expression="^9992$"> <action application="answer"/>

1 0