- Freeswitch-svn - FreeSWITCH Mailing Lists

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

23 Sep '08

Author: mikej Date: Tue Sep 23 16:31:49 2008 New Revision: 9627 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: (MODAPP-133) 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 23 16:31:49 2008 @@ -1038,7 +1038,7 @@ TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "too-small", NULL, NULL)); goto record_file; } else { - status = SWITCH_STATUS_BREAK; + status = SWITCH_STATUS_NOTFOUND; goto end; } } else { @@ -2676,6 +2676,10 @@ status = create_file(session, profile, VM_RECORD_MESSAGE_MACRO, file_path, &message_len, SWITCH_TRUE); + if ((status == SWITCH_STATUS_NOTFOUND)) { + goto end; + } + if ((status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK) && switch_channel_ready(channel)) { char input[10] = "", key_buf[80] = "", term = 0;

1 0

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

23 Sep '08

Author: mikej Date: Tue Sep 23 16:16:56 2008 New Revision: 9626 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: revert svn r 9613 (MODAPP-133) 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 23 16:16:56 2008 @@ -1038,7 +1038,7 @@ TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "too-small", NULL, NULL)); goto record_file; } else { - status = SWITCH_STATUS_FALSE; + status = SWITCH_STATUS_BREAK; goto end; } } else { @@ -2689,8 +2689,6 @@ } else { TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "saved", NULL, NULL)); } - } else { - goto end; } switch_channel_get_variables(channel, &vars);

1 0

[commit] r9625 - freeswitch/trunk/src
by Freeswitch SVN 23 Sep '08

23 Sep '08

Author: anthm Date: Tue Sep 23 15:01:22 2008 New Revision: 9625 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: add var to assume ring_ready 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 23 15:01:22 2008 @@ -620,6 +620,8 @@ ok = 1; } else if (!strcasecmp((char *) hi->name, "return_ring_ready")) { ok = 1; + } else if (!strcasecmp((char *) hi->name, "ring_ready")) { + ok = 1; } else if (!strcasecmp((char *) hi->name, "originate_retries")) { ok = 1; } else if (!strcasecmp((char *) hi->name, "originate_timeout")) { @@ -709,6 +711,10 @@ return_ring_ready = 1; } + if ((var_val = switch_event_get_header(var_event, "ring_ready")) && switch_true(var_val)) { + ring_ready = 1; + } + if ((var_val = switch_event_get_header(var_event, "originate_timeout"))) { int tmp = atoi(var_val); if (tmp > 0) {

1 0

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

23 Sep '08

Author: mikej Date: Tue Sep 23 12:14:53 2008 New Revision: 9624 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: (MODENDP-135) add redirect variable to channel as well as partner channel 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 Tue Sep 23 12:14:53 2008 @@ -2148,10 +2148,12 @@ if (p_contact->m_url->url_user) { switch_snprintf(var_name, sizeof(var_name), "sip_redirect_contact_user_%d", i); switch_channel_set_variable_partner(channel, var_name, p_contact->m_url->url_user); + switch_channel_set_variable(channel, var_name, p_contact->m_url->url_user); } if (p_contact->m_url->url_host) { switch_snprintf(var_name, sizeof(var_name), "sip_redirect_contact_host_%d", i); switch_channel_set_variable_partner(channel, var_name, p_contact->m_url->url_host); + switch_channel_set_variable(channel, var_name, p_contact->m_url->url_host); } p_contact = p_contact->m_next; i++;

1 0

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

23 Sep '08

Author: mikej Date: Tue Sep 23 12:05:12 2008 New Revision: 9623 Modified: freeswitch/trunk/src/include/switch_regex.h freeswitch/trunk/src/switch_regex.c Log: (FSCORE-192) expose api for partial regex matching Modified: freeswitch/trunk/src/include/switch_regex.h ============================================================================== --- freeswitch/trunk/src/include/switch_regex.h (original) +++ freeswitch/trunk/src/include/switch_regex.h Tue Sep 23 12:05:12 2008 @@ -61,11 +61,22 @@ */ SWITCH_DECLARE(switch_status_t) switch_regex_match(const char *target, const char *expression); +/*! + \brief Function to evaluate an expression against a string + \param target The string to find a match in + \param expression The regular expression to run against the string + \param partial If non-zero returns SUCCESS if the target is a partial match, on successful return, this is set to non-zero if the match was partial and zero if it was a full match + \return Boolean if a match was found or not +*/ +SWITCH_DECLARE(switch_status_t) switch_regex_match_partial(const char *target, const char *expression, int * partial_match); + + #define switch_regex_safe_free(re) if (re) {\ switch_regex_free(re);\ re = NULL;\ } + /** @} */ SWITCH_END_EXTERN_C Modified: freeswitch/trunk/src/switch_regex.c ============================================================================== --- freeswitch/trunk/src/switch_regex.c (original) +++ freeswitch/trunk/src/switch_regex.c Tue Sep 23 12:05:12 2008 @@ -161,14 +161,15 @@ substituted[y++] = '\0'; } -SWITCH_DECLARE(switch_status_t) switch_regex_match(const char *target, const char *expression) +SWITCH_DECLARE(switch_status_t) switch_regex_match_partial(const char *target, const char *expression, int * partial) { 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 */ - + int pcre_flags = 0; + /* Compile the expression */ pcre_prepared = pcre_compile(expression, 0, &error, &error_offset, NULL); @@ -186,8 +187,13 @@ /* We definitely didn't match anything */ return SWITCH_STATUS_FALSE; } + + if (*partial) { + pcre_flags = PCRE_PARTIAL; + } + /* 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])); + match_count = pcre_exec(pcre_prepared, NULL, target, (int) strlen(target), 0, pcre_flags, offset_vectors, sizeof(offset_vectors) / sizeof(offset_vectors[0])); /* Clean up */ if (pcre_prepared) { @@ -199,12 +205,23 @@ /* Was it a match made in heaven? */ if (match_count > 0) { + *partial = 0; + return SWITCH_STATUS_SUCCESS; + } else if (match_count == PCRE_ERROR_PARTIAL) { + /* yes it is already set, but the code is clearer this way */ + *partial = 1; return SWITCH_STATUS_SUCCESS; } else { return SWITCH_STATUS_FALSE; } } +SWITCH_DECLARE(switch_status_t) switch_regex_match(const char *target, const char *expression) +{ + int partial = 0; + return switch_regex_match_partial(target, expression, &partial); +} + /* For Emacs: * Local Variables: * mode:c

1 0

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

23 Sep '08

Author: anthm Date: Tue Sep 23 09:54:06 2008 New Revision: 9622 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: patch for FSCORE-191 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 Tue Sep 23 09:54:06 2008 @@ -1132,7 +1132,7 @@ } } else if (!strcasecmp(var, "rfc2833-pt")) { profile->te = (switch_payload_t) atoi(val); - } else if (!strcasecmp(var, "cng-pt")) { + } else if (!strcasecmp(var, "cng-pt") && !(profile->pflags & PFLAG_SUPPRESS_CNG)) { profile->cng_pt = (switch_payload_t) atoi(val); } else if (!strcasecmp(var, "vad")) { if (!strcasecmp(val, "in")) { @@ -1166,6 +1166,7 @@ } else if (!strcasecmp(var, "supress-cng") || !strcasecmp(var, "suppress-cng")) { if (switch_true(val)) { profile->pflags |= PFLAG_SUPPRESS_CNG; + profile->cng_pt = 0; } else { profile->pflags &= ~PFLAG_SUPPRESS_CNG; } @@ -1489,7 +1490,7 @@ } } else if (!strcasecmp(var, "rfc2833-pt")) { profile->te = (switch_payload_t) atoi(val); - } else if (!strcasecmp(var, "cng-pt")) { + } else if (!strcasecmp(var, "cng-pt") && !(profile->pflags & PFLAG_SUPPRESS_CNG)) { profile->cng_pt = (switch_payload_t) atoi(val); } else if (!strcasecmp(var, "sip-port")) { profile->sip_port = atoi(val); @@ -1621,6 +1622,7 @@ } else if (!strcasecmp(var, "supress-cng") || !strcasecmp(var, "suppress-cng")) { if (switch_true(val)) { profile->pflags |= PFLAG_SUPPRESS_CNG; + profile->cng_pt = 0; } } else if (!strcasecmp(var, "NDLB-to-in-200-contact")) { if (switch_true(val)) { 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 Tue Sep 23 09:54:06 2008 @@ -127,7 +127,7 @@ switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->te); } - if (tech_pvt->cng_pt && use_cng) { + if (!(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG) && tech_pvt->cng_pt && use_cng) { switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), " %d", tech_pvt->cng_pt); } @@ -174,7 +174,7 @@ if (tech_pvt->dtmf_type == DTMF_2833 && tech_pvt->te > 95) { switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d telephone-event/8000\na=fmtp:%d 0-16\n", tech_pvt->te, tech_pvt->te); } - if (tech_pvt->cng_pt && use_cng) { + if (!(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG) && tech_pvt->cng_pt && use_cng) { switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d CN/8000\n", tech_pvt->cng_pt); if (!tech_pvt->rm_encoding) { tech_pvt->cng_pt = 0; @@ -413,10 +413,12 @@ tech_pvt->dtmf_type = profile->dtmf_type; - if (tech_pvt->bcng_pt) { - tech_pvt->cng_pt = tech_pvt->bcng_pt; - } else if (!tech_pvt->cng_pt) { - tech_pvt->cng_pt = profile->cng_pt; + if (!(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG)) { + if (tech_pvt->bcng_pt) { + tech_pvt->cng_pt = tech_pvt->bcng_pt; + } else if (!tech_pvt->cng_pt) { + tech_pvt->cng_pt = profile->cng_pt; + } } tech_pvt->session = session; @@ -1744,7 +1746,9 @@ flags |= SWITCH_RTP_FLAG_RAW_WRITE; } - if (tech_pvt->cng_pt) { + if (tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG) { + tech_pvt->cng_pt = 0; + } else if (tech_pvt->cng_pt) { flags |= SWITCH_RTP_FLAG_AUTO_CNG; } @@ -1927,7 +1931,7 @@ if (tech_pvt->te) { switch_rtp_set_telephony_event(tech_pvt->rtp_session, tech_pvt->te); } - if (tech_pvt->cng_pt) { + if (tech_pvt->cng_pt && !(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set comfort noise payload to %u\n", tech_pvt->cng_pt); switch_rtp_set_cng_pt(tech_pvt->rtp_session, tech_pvt->cng_pt); } @@ -2295,7 +2299,7 @@ } } - if (!cng_pt && !strcasecmp(rm_encoding, "CN")) { + if (!(tech_pvt->profile->pflags & PFLAG_SUPPRESS_CNG) && !cng_pt && !strcasecmp(rm_encoding, "CN")) { cng_pt = tech_pvt->cng_pt = (switch_payload_t) map->rm_pt; if (tech_pvt->rtp_session) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set comfort noise payload to %u\n", cng_pt);

1 0

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

23 Sep '08

Author: anthm Date: Mon Sep 22 20:10:19 2008 New Revision: 9621 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: fix macro in sprintf 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 22 20:10:19 2008 @@ -323,14 +323,14 @@ } switch_snprintf(sql, sizeof(sql), "select call_id,sip_user,sip_host,contact,status,rpid,expires,user_agent,server_user,server_host,profile_name" - ",%d from sip_registrations where call_id='%s' or (sip_user='%s' and sip_host='%s') and hostname='%q'", + ",%d from sip_registrations where call_id='%s' or (sip_user='%s' and sip_host='%s') and hostname='%s'", reboot, call_id, user, host, mod_sofia_globals.hostname); switch_mutex_lock(profile->ireg_mutex); sofia_glue_execute_sql_callback(profile, SWITCH_TRUE, NULL, sql, sofia_reg_del_callback, profile); switch_mutex_unlock(profile->ireg_mutex); - switch_snprintf(sql, sizeof(sql), "delete from sip_registrations where call_id='%s' or (sip_user='%s' and sip_host='%s') and hostname='%q'", + switch_snprintf(sql, sizeof(sql), "delete from sip_registrations where call_id='%s' or (sip_user='%s' and sip_host='%s') and hostname='%s'", call_id, user, host, mod_sofia_globals.hostname); sofia_glue_execute_sql(profile, &psql, SWITCH_FALSE); @@ -371,19 +371,19 @@ sofia_glue_execute_sql_callback(profile, SWITCH_TRUE, NULL, sql, sofia_reg_del_callback, profile); if (now) { - switch_snprintf(sql, sizeof(sql), "delete from sip_registrations where expires > 0 and expires <= %ld and hostname='%q'", + switch_snprintf(sql, sizeof(sql), "delete from sip_registrations where expires > 0 and expires <= %ld and hostname='%s'", (long) now, mod_sofia_globals.hostname); } else { - switch_snprintf(sql, sizeof(sql), "delete from sip_registrations where expires > 0 and hostname='%q'", mod_sofia_globals.hostname); + switch_snprintf(sql, sizeof(sql), "delete from sip_registrations where expires > 0 and hostname='%s'", mod_sofia_globals.hostname); } sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, sql, NULL); if (now) { - switch_snprintf(sql, sizeof(sql), "delete from sip_authentication where expires > 0 and expires <= %ld and hostname='%q'", + switch_snprintf(sql, sizeof(sql), "delete from sip_authentication where expires > 0 and expires <= %ld and hostname='%s'", (long) now, mod_sofia_globals.hostname); } else { - switch_snprintf(sql, sizeof(sql), "delete from sip_authentication where expires > 0 and hostname='%q'", mod_sofia_globals.hostname); + switch_snprintf(sql, sizeof(sql), "delete from sip_authentication where expires > 0 and hostname='%s'", mod_sofia_globals.hostname); } sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, sql, NULL); @@ -391,19 +391,19 @@ if (now) { - switch_snprintf(sql, sizeof(sql), "select call_id from sip_subscriptions where expires > 0 and expires <= %ld and hostname='%q'", + switch_snprintf(sql, sizeof(sql), "select call_id from sip_subscriptions where expires > 0 and expires <= %ld and hostname='%s'", (long) now, mod_sofia_globals.hostname); } else { - switch_snprintf(sql, sizeof(sql), "select call_id from sip_subscriptions where expires > 0 and hostname='%q'", mod_sofia_globals.hostname); + switch_snprintf(sql, sizeof(sql), "select call_id from sip_subscriptions where expires > 0 and hostname='%s'", mod_sofia_globals.hostname); } sofia_glue_execute_sql_callback(profile, SWITCH_TRUE, NULL, sql, sofia_sub_del_callback, profile); if (now) { - switch_snprintf(sql, sizeof(sql), "delete from sip_subscriptions where expires > 0 and expires <= %ld and hostname='%q'", + switch_snprintf(sql, sizeof(sql), "delete from sip_subscriptions where expires > 0 and expires <= %ld and hostname='%s'", (long) now, mod_sofia_globals.hostname); } else { - switch_snprintf(sql, sizeof(sql), "delete from sip_subscriptions where expires > 0 and hostname='%q'", mod_sofia_globals.hostname); + switch_snprintf(sql, sizeof(sql), "delete from sip_subscriptions where expires > 0 and hostname='%s'", mod_sofia_globals.hostname); } sofia_glue_actually_execute_sql(profile, SWITCH_FALSE, sql, NULL); @@ -433,7 +433,7 @@ cbt.len = len; if (host) { - switch_snprintf(sql, sizeof(sql), "select contact from sip_registrations where sip_user='%s' and (sip_host='%s' or presence_hosts like '%%%q%%')" + switch_snprintf(sql, sizeof(sql), "select contact from sip_registrations where sip_user='%s' and (sip_host='%s' or presence_hosts like '%%%s%%')" , user, host, host); } else { switch_snprintf(sql, sizeof(sql), "select contact from sip_registrations where sip_user='%s'", user);

1 0

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

22 Sep '08

Author: anthm Date: Mon Sep 22 17:53:50 2008 New Revision: 9620 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: fix negative number in printf 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 22 17:53:50 2008 @@ -1376,7 +1376,12 @@ switch_assert(gp->state < REG_STATE_LAST); stream->write_function(stream, "%25s\t%s\t %32s\t%s", gp->name, "gateway", gp->register_to, sofia_state_names[gp->state]); if (gp->state == REG_STATE_FAILED || gp->state == REG_STATE_TRYING) { - stream->write_function(stream, " (retry: %ds)", gp->retry - switch_timestamp(NULL)); + time_t now = switch_timestamp(NULL); + if (gp->retry > now) { + stream->write_function(stream, " (retry: %ds)", gp->retry - now); + } else { + stream->write_function(stream, " (retry: NEVER)"); + } } stream->write_function(stream, "\n"); }

1 0

[commit] r9619 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 22 Sep '08

22 Sep '08

Author: brian Date: Mon Sep 22 17:39:57 2008 New Revision: 9619 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Log: add the challenge-realm option with some docs. Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Mon Sep 22 17:39:57 2008 @@ -142,6 +142,8 @@    +  +  </settings> </profile>

1 0

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

22 Sep '08

Author: anthm Date: Mon Sep 22 16:50:13 2008 New Revision: 9618 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: Avoiding Segfault 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 Mon Sep 22 16:50:13 2008 @@ -2024,6 +2024,11 @@ } } + /* dirty hack to avoid race condition in the library */ + if (status == 200 || status == 183) { + switch_yield(1);// printf("Avoiding Segfault!!!\n"); + } + if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { if (!switch_test_flag(tech_pvt, TFLAG_SENT_UPDATE)) {

1 0