- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r10460 - in freeswitch/trunk: conf/autoload_configs src/mod/xml_int/mod_xml_cdr
by FreeSWITCH SVN 19 Nov '08

19 Nov '08

Author: anthm Date: Wed Nov 19 12:37:10 2008 New Revision: 10460 Log: close MDXMLINT-39 Modified: freeswitch/trunk/conf/autoload_configs/xml_cdr.conf.xml freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Modified: freeswitch/trunk/conf/autoload_configs/xml_cdr.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/xml_cdr.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/xml_cdr.conf.xml Wed Nov 19 12:37:10 2008 @@ -20,6 +20,9 @@  <param name="log-b-leg" value="false"/> +  +  + <param name="prefix-a-leg" value="true"/>  <param name="encode" value="true"/> Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Wed Nov 19 12:37:10 2008 @@ -45,6 +45,7 @@ uint32_t ignore_cacert_check; int encode; int log_b; + int prefix_a; int disable100continue; } globals; @@ -77,14 +78,18 @@ struct curl_slist *slist = NULL; switch_channel_t *channel = switch_core_session_get_channel(session); switch_status_t status = SWITCH_STATUS_FALSE; + int is_b; + const char * a_prefix = ""; if (globals.shutdown) { return SWITCH_STATUS_SUCCESS; } - if (!globals.log_b && channel && switch_channel_get_originator_caller_profile(channel)) { + is_b = channel && switch_channel_get_originator_caller_profile(channel); + if (!globals.log_b && is_b) { return SWITCH_STATUS_SUCCESS; } + if (!is_b && globals.prefix_a) a_prefix = "a_"; if (switch_ivr_generate_xml_cdr(session, &cdr) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Generating Data!\n"); @@ -103,7 +108,7 @@ } if (!switch_strlen_zero(logdir)) { - if ((path = switch_mprintf("%s%s%s.cdr.xml", logdir, SWITCH_PATH_SEPARATOR, switch_core_session_get_uuid(session)))) { + if ((path = switch_mprintf("%s%s%s%s.cdr.xml", logdir, SWITCH_PATH_SEPARATOR, a_prefix, switch_core_session_get_uuid(session)))) { if ((fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { int wrote; wrote = write(fd, xml_text, (unsigned) strlen(xml_text)); @@ -203,7 +208,7 @@ /* if we are here the web post failed for some reason */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to post to web server, writing to file\n"); - if ((path = switch_mprintf("%s%s%s.cdr.xml", globals.err_log_dir, SWITCH_PATH_SEPARATOR, switch_core_session_get_uuid(session)))) { + if ((path = switch_mprintf("%s%s%s%s.cdr.xml", globals.err_log_dir, SWITCH_PATH_SEPARATOR, a_prefix, switch_core_session_get_uuid(session)))) { if ((fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { int wrote; wrote = write(fd, xml_text, (unsigned) strlen(xml_text)); @@ -285,6 +290,8 @@ globals.delay = (uint32_t) atoi(val); } else if (!strcasecmp(var, "log-b-leg")) { globals.log_b = switch_true(val); + } else if (!strcasecmp(var, "prefix-a-leg")) { + globals.prefix_a = switch_true(val); } else if (!strcasecmp(var, "disable-100-continue") && switch_true(val)) { globals.disable100continue = 1; } else if (!strcasecmp(var, "encode") && !switch_strlen_zero(val)) {

1 0

[commit] r10459 - freeswitch/trunk/src/mod/applications/mod_fsv
by FreeSWITCH SVN 19 Nov '08

19 Nov '08

Author: anthm Date: Wed Nov 19 12:08:46 2008 New Revision: 10459 Log: close MODAPP-169 Modified: freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c Modified: freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c Wed Nov 19 12:08:46 2008 @@ -110,7 +110,7 @@ switch_channel_answer(channel); - if ((fd = open((char *) data, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) < 0) { + if ((fd = open((char *) data, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, S_IRUSR | S_IWUSR)) < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error opening file %s\n", (char *) data); return; }

1 0

[commit] r10458 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Nov '08

19 Nov '08

Author: anthm Date: Wed Nov 19 12:06:58 2008 New Revision: 10458 Log: close FSCORE-227 Modified: freeswitch/trunk/src/switch_apr.c Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Wed Nov 19 12:06:58 2008 @@ -799,7 +799,7 @@ return SWITCH_STATUS_MEMERR; } - if (switch_pollset_create(&pollset, 1, pool, flags) != SWITCH_STATUS_SUCCESS) { + if (switch_pollset_create(&pollset, 1, pool, 0) != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_GENERR; }

1 0

[commit] r10457 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Nov '08

19 Nov '08

Author: anthm Date: Wed Nov 19 11:49:05 2008 New Revision: 10457 Log: fix race Modified: freeswitch/trunk/src/switch_ivr_bridge.c Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Wed Nov 19 11:49:05 2008 @@ -724,7 +724,7 @@ switch_channel_set_variable(caller_channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, switch_core_session_get_uuid(peer_session)); switch_channel_set_variable(peer_channel, SWITCH_SIGNAL_BRIDGE_VARIABLE, switch_core_session_get_uuid(session)); - switch_channel_set_flag(caller_channel, CF_ORIGINATOR); + switch_channel_set_state_flag(caller_channel, CF_ORIGINATOR); switch_channel_clear_state_handler(caller_channel, NULL); switch_channel_clear_state_handler(peer_channel, NULL);

1 0

[commit] r10456 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 19 Nov '08

19 Nov '08

Author: anthm Date: Wed Nov 19 11:48:32 2008 New Revision: 10456 Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed Nov 19 11:48:32 2008 @@ -2215,22 +2215,9 @@ } if (!session && (status == 180 || status == 183 || status == 200)) { - /* This should never happen. It means the sip stack thinks there is a call but FreeSWITCH does not */ - const char *callid = "n/a"; - - if (sip && sip->sip_call_id && sip->sip_call_id->i_id) callid = sip->sip_call_id->i_id; - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received response to invite with no matching session, destroying callid [%s]!\n", callid); - - if (nh) { - if (status == 200) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending BYE to orphan call.\n"); - nua_bye(nh, TAG_END()); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending CANCEL to orphan call.\n"); - nua_cancel(nh, TAG_END()); - } - } + /* nevermind */ + nua_handle_bind(nh, NULL); + nua_handle_destroy(nh); } }

1 0

[commit] r10455 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Nov '08

19 Nov '08

Author: anthm Date: Wed Nov 19 10:24:30 2008 New Revision: 10455 Log: add no_data as success (thx rupa) Modified: freeswitch/trunk/src/switch_odbc.c Modified: freeswitch/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/trunk/src/switch_odbc.c (original) +++ freeswitch/trunk/src/switch_odbc.c Wed Nov 19 10:24:30 2008 @@ -301,7 +301,7 @@ result = SQLExecute(stmt); - if (result != SQL_SUCCESS && result != SQL_SUCCESS_WITH_INFO) { + if (result != SQL_SUCCESS && result != SQL_SUCCESS_WITH_INFO && result != SQL_NO_DATA) { goto error; }

1 0

[commit] r10454 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Nov '08

19 Nov '08

Author: anthm Date: Tue Nov 18 21:40:59 2008 New Revision: 10454 Log: add hits to tone_detect Modified: freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Nov 18 21:40:59 2008 @@ -1195,7 +1195,7 @@ int total_hits; int hits; int sleep; - time_t expires; + int expires; } switch_tone_detect_t; typedef struct { @@ -1217,36 +1217,49 @@ case SWITCH_ABC_TYPE_CLOSE: break; case SWITCH_ABC_TYPE_READ_REPLACE: - frame = switch_core_media_bug_get_read_replace_frame(bug); case SWITCH_ABC_TYPE_WRITE_REPLACE: { - - if (!frame) { + int skip = 0; + + if (type == SWITCH_ABC_TYPE_READ_REPLACE) { + frame = switch_core_media_bug_get_read_replace_frame(bug); + } else { frame = switch_core_media_bug_get_write_replace_frame(bug); } + + for (i = 0; i < cont->index; i++) { - if (cont->list[i].expires && cont->list[i].expires < switch_timestamp(NULL)) { - cont->list[i].hits = 0; - cont->list[i].sleep = 0; - cont->list[i].expires = 0; - } if (cont->list[i].sleep) { cont->list[i].sleep--; - return SWITCH_TRUE; + if (cont->list[i].sleep) { + skip = 1; + } } - if (cont->list[i].up && teletone_multi_tone_detect(&cont->list[i].mt, frame->data, frame->samples)) { - switch_event_t *event; - cont->list[i].up = cont->list[i].hits++; - cont->list[i].sleep = 25; - cont->list[i].expires = switch_timestamp(NULL) + 5; - teletone_multi_tone_init(&cont->list[i].mt, &cont->list[i].map); + if (cont->list[i].expires) { + cont->list[i].expires--; + if (!cont->list[i].expires) { + cont->list[i].hits = 0; + cont->list[i].sleep = 0; + cont->list[i].expires = 0; + } + } + + if (!cont->list[i].up) skip = 1; + + if (skip) return SWITCH_TRUE; + + if (teletone_multi_tone_detect(&cont->list[i].mt, frame->data, frame->samples)) { + switch_event_t *event; + cont->list[i].hits++; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TONE %s HIT %d/%d\n", - cont->list[i].key, cont->list[i].up, cont->list[i].hits); + cont->list[i].key, cont->list[i].hits, cont->list[i].total_hits); + cont->list[i].sleep = 50; + cont->list[i].expires = 250; - if (cont->list[i].hits >= cont->list[i].total_hits) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TONE %s DETECTED\n", cont->list[i].key); cont->list[i].up = 0; @@ -1332,7 +1345,6 @@ cont->list[i].hits = 0; cont->list[i].sleep = 0; cont->list[i].expires = 0; - teletone_multi_tone_init(&cont->list[i].mt, &cont->list[i].map); return SWITCH_STATUS_SUCCESS; } } @@ -1403,7 +1415,7 @@ bflags |= SMBF_WRITE_REPLACE; } } - + if ((status = switch_core_media_bug_add(session, tone_detect_callback, cont, timeout, bflags, &cont->bug)) != SWITCH_STATUS_SUCCESS) { return status; }

1 0

[commit] r10453 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Nov '08

19 Nov '08

Author: anthm Date: Tue Nov 18 20:24:37 2008 New Revision: 10453 Log: tweak media bugs timeout Modified: freeswitch/trunk/src/switch_core_io.c Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Tue Nov 18 20:24:37 2008 @@ -318,15 +318,12 @@ switch_mutex_lock(bp->read_mutex); switch_buffer_write(bp->raw_read_buffer, read_frame->data, read_frame->datalen); if (bp->callback) { - if (bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_READ) == SWITCH_FALSE - || (bp->stop_time && bp->stop_time <= switch_timestamp(NULL))) { - ok = SWITCH_FALSE; - } + ok = bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_READ); } switch_mutex_unlock(bp->read_mutex); } - - if (switch_test_flag(bp, SMBF_READ_REPLACE)) { + + if (ok && switch_test_flag(bp, SMBF_READ_REPLACE)) { do_bugs = 0; if (bp->callback) { bp->read_replace_frame_in = read_frame; @@ -336,6 +333,10 @@ } } } + + if (bp->stop_time && bp->stop_time <= switch_timestamp(NULL)) { + ok = SWITCH_FALSE; + } if (ok == SWITCH_FALSE) { bp->ready = 0;

1 0

[commit] r10452 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 19 Nov '08

19 Nov '08

Author: anthm Date: Tue Nov 18 20:05:36 2008 New Revision: 10452 Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 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 Tue Nov 18 20:05:36 2008 @@ -706,8 +706,6 @@ if (tech_pvt->check_frames < MAX_CODEC_CHECK_FRAMES) { if (tech_pvt->last_ts && tech_pvt->read_frame.datalen != tech_pvt->read_codec.implementation->encoded_bytes_per_packet) { - - if (++tech_pvt->mismatch_count >= MAX_MISMATCH_FRAMES) { switch_size_t codec_ms = (int)(tech_pvt->read_frame.timestamp - tech_pvt->last_ts) / (tech_pvt->read_codec.implementation->samples_per_second / 1000); @@ -774,6 +772,8 @@ } tech_pvt->check_frames++; } + } else { + tech_pvt->mismatch_count = 0; } tech_pvt->last_ts = tech_pvt->read_frame.timestamp; } 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 Tue Nov 18 20:05:36 2008 @@ -54,7 +54,7 @@ #endif #define MAX_CODEC_CHECK_FRAMES 50 -#define MAX_MISMATCH_FRAMES 5 +#define MAX_MISMATCH_FRAMES 3 #define MODNAME "mod_sofia" static const switch_state_handler_table_t noop_state_handler = { 0 }; struct sofia_gateway;

1 0

[commit] r10451 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 19 Nov '08

19 Nov '08

Author: anthm Date: Tue Nov 18 20:01:42 2008 New Revision: 10451 Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 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 Tue Nov 18 20:01:42 2008 @@ -706,71 +706,74 @@ if (tech_pvt->check_frames < MAX_CODEC_CHECK_FRAMES) { if (tech_pvt->last_ts && tech_pvt->read_frame.datalen != tech_pvt->read_codec.implementation->encoded_bytes_per_packet) { - switch_size_t codec_ms = (int)(tech_pvt->read_frame.timestamp - - tech_pvt->last_ts) / (tech_pvt->read_codec.implementation->samples_per_second / 1000); + - if ((codec_ms % 10) != 0) { - tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES; - } else { - if (switch_rtp_ready(tech_pvt->rtp_session) && codec_ms != tech_pvt->codec_ms) { - const char *val; - int rtp_timeout_sec = 0; - int rtp_hold_timeout_sec = 0; + if (++tech_pvt->mismatch_count >= MAX_MISMATCH_FRAMES) { + switch_size_t codec_ms = (int)(tech_pvt->read_frame.timestamp - + tech_pvt->last_ts) / (tech_pvt->read_codec.implementation->samples_per_second / 1000); + + if ((codec_ms % 10) != 0) { + tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES; + } else { + if (switch_rtp_ready(tech_pvt->rtp_session) && codec_ms != tech_pvt->codec_ms) { + const char *val; + int rtp_timeout_sec = 0; + int rtp_hold_timeout_sec = 0; - tech_pvt->codec_ms = codec_ms; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, - "Changing codec ptime to %d. I bet you have a linksys/sipura =D\n", tech_pvt->codec_ms); - switch_core_codec_destroy(&tech_pvt->read_codec); - switch_core_codec_destroy(&tech_pvt->write_codec); - if (sofia_glue_tech_set_codec(tech_pvt, 2) != SWITCH_STATUS_SUCCESS) { - *frame = NULL; - return SWITCH_STATUS_GENERR; - } + tech_pvt->codec_ms = codec_ms; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, + "Changing codec ptime to %d. I bet you have a linksys/sipura =D\n", tech_pvt->codec_ms); + switch_core_codec_destroy(&tech_pvt->read_codec); + switch_core_codec_destroy(&tech_pvt->write_codec); + if (sofia_glue_tech_set_codec(tech_pvt, 2) != SWITCH_STATUS_SUCCESS) { + *frame = NULL; + return SWITCH_STATUS_GENERR; + } - if ((val = switch_channel_get_variable(tech_pvt->channel, "rtp_timeout_sec"))) { - int v = atoi(val); - if (v >= 0) { - rtp_timeout_sec = v; + if ((val = switch_channel_get_variable(tech_pvt->channel, "rtp_timeout_sec"))) { + int v = atoi(val); + if (v >= 0) { + rtp_timeout_sec = v; + } } - } - if ((val = switch_channel_get_variable(tech_pvt->channel, "rtp_hold_timeout_sec"))) { - int v = atoi(val); - if (v >= 0) { - rtp_hold_timeout_sec = v; + if ((val = switch_channel_get_variable(tech_pvt->channel, "rtp_hold_timeout_sec"))) { + int v = atoi(val); + if (v >= 0) { + rtp_hold_timeout_sec = v; + } } - } - if (rtp_timeout_sec) { - tech_pvt->max_missed_packets = (tech_pvt->read_codec.implementation->samples_per_second * rtp_timeout_sec) / - tech_pvt->read_codec.implementation->samples_per_packet; + if (rtp_timeout_sec) { + tech_pvt->max_missed_packets = (tech_pvt->read_codec.implementation->samples_per_second * rtp_timeout_sec) / + tech_pvt->read_codec.implementation->samples_per_packet; - switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets); - if (!rtp_hold_timeout_sec) { - rtp_hold_timeout_sec = rtp_timeout_sec * 10; + switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets); + if (!rtp_hold_timeout_sec) { + rtp_hold_timeout_sec = rtp_timeout_sec * 10; + } } - } - if (rtp_hold_timeout_sec) { - tech_pvt->max_missed_hold_packets = (tech_pvt->read_codec.implementation->samples_per_second * rtp_hold_timeout_sec) / - tech_pvt->read_codec.implementation->samples_per_packet; - } + if (rtp_hold_timeout_sec) { + tech_pvt->max_missed_hold_packets = (tech_pvt->read_codec.implementation->samples_per_second * rtp_hold_timeout_sec) / + tech_pvt->read_codec.implementation->samples_per_packet; + } - if (switch_rtp_change_interval(tech_pvt->rtp_session, - tech_pvt->codec_ms * 1000, - tech_pvt->read_codec.implementation->samples_per_packet - ) != SWITCH_STATUS_SUCCESS) { - switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + if (switch_rtp_change_interval(tech_pvt->rtp_session, + tech_pvt->codec_ms * 1000, + tech_pvt->read_codec.implementation->samples_per_packet + ) != SWITCH_STATUS_SUCCESS) { + switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - } + } - tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES; - } + tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES; + } + } + tech_pvt->check_frames++; } - tech_pvt->check_frames++; - } tech_pvt->last_ts = tech_pvt->read_frame.timestamp; }

1 0