May 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13321 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/soa
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 10:46:27 2009 New Revision: 13321 Log: Tue May 12 14:59:28 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * soa_static.c: include media formats in rejected m= line Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 10:46:27 2009 @@ -1 +1 @@ -Fri May 15 10:45:11 CDT 2009 +Fri May 15 10:46:01 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c Fri May 15 10:46:27 2009 @@ -281,7 +281,12 @@ rejected->m_proto_name = m->m_proto_name; if (include_all_codecs) { - rejected->m_rtpmaps = m->m_rtpmaps; + if (m->m_rtpmaps) { + rejected->m_rtpmaps = m->m_rtpmaps; + } + else if (m->m_format) { + rejected->m_format = m->m_format; + } } rejected->m_rejected = 1;

1 0

[commit] r13320 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 10:45:39 2009 New Revision: 13320 Log: Tue May 12 11:05:19 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nua: NUTAG_AUTOACK(0) is now obeyed always when media is disabled Ignore-this: c5960a8330904eae5a1428158e4498c7 If media is enabled, stack autoacks 2XX responses to re-INVITEs unless NUTAG_AUTOACK(0) is set on handle. Also documenting NUTAG_AUTOACK() behaviour with re-INVITEs. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_tag.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 10:45:39 2009 @@ -1 +1 @@ -Fri May 15 10:43:59 CDT 2009 +Fri May 15 10:45:11 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Fri May 15 10:45:39 2009 @@ -1108,8 +1108,9 @@ if (next_state == nua_callstate_completing) { if (NH_PGET(nh, auto_ack) || - /* Auto-ACK response to re-INVITE unless auto_ack is set to 0 */ - (ss->ss_state == nua_callstate_ready && + /* Auto-ACK response to re-INVITE when media is enabled + and auto_ack is not set to 0 on handle */ + (ss->ss_state == nua_callstate_ready && nh->nh_soa && !NH_PISSET(nh, auto_ack))) { nua_client_request_t *cru; @@ -1867,8 +1868,10 @@ /* There is an un-ACK-ed INVITE there */ assert(du->du_cr->cr_method == sip_method_invite); if (NH_PGET(nh, auto_ack) || - /* Auto-ACK response to re-INVITE unless auto_ack is set to 0 */ - (ss->ss_state == nua_callstate_ready && !NH_PISSET(nh, auto_ack))) { + /* Auto-ACK response to re-INVITE when media is enabled + and auto_ack is not set to 0 on handle */ + (ss->ss_state == nua_callstate_ready && nh->nh_soa && + !NH_PISSET(nh, auto_ack))) { /* There should be no UPDATE with offer/answer if PRACK with offer/answer was ongoing! */ if (nua_invite_client_ack(du->du_cr, NULL) > 0) @@ -3407,8 +3410,10 @@ assert(du->du_cr->cr_method == sip_method_invite); if (NH_PGET(nh, auto_ack) || - /* Auto-ACK response to re-INVITE unless auto_ack is set to 0 */ - (ss->ss_state == nua_callstate_ready && !NH_PISSET(nh, auto_ack))) { + /* Auto-ACK response to re-INVITE when media is enabled + and auto_ack is not set to 0 on handle */ + (ss->ss_state == nua_callstate_ready && nh->nh_soa && + !NH_PISSET(nh, auto_ack))) { if (nua_invite_client_ack(du->du_cr, NULL) > 0) next_state = nua_callstate_ready; else Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_tag.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_tag.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_tag.c Fri May 15 10:45:39 2009 @@ -1319,6 +1319,12 @@ * * Default value is NUTAG_AUTOACK(1). * + * @par Auto ACK with Re-INVITE requests + * By default, NUA tries to auto-ACK the final response to re-INVITE used to + * refresh the session when the media is enabled. Set NUTAG_AUTOACK(0) on + * the call handle (e.g., include the tag with nua_invite() or + * nua_respond()) in order to disable the auto ACK with re-INVITE. + * * Corresponding tag taking reference parameter is NUTAG_AUTOACK_REF(). */ tag_typedef_t nutag_autoack = BOOLTAG_TYPEDEF(autoACK);

1 0

[commit] r13319 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 10:44:40 2009 New Revision: 13319 Log: Tue May 12 12:08:51 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * check_session.c: ensure that re-INVITEs have correct Session-Expires parameters Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 10:44:40 2009 @@ -1 +1 @@ -Fri May 15 10:43:02 CDT 2009 +Fri May 15 10:43:59 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Fri May 15 10:44:40 2009 @@ -1195,6 +1195,9 @@ fail_unless(s2_check_callstate(nua_callstate_calling)); invite = s2_sip_wait_for_request(SIP_METHOD_INVITE); process_offer(invite); + /* Check that INVITE contains Session-Expires header with refresher=uac */ + fail_unless(invite->sip->sip_session_expires != NULL); + fail_unless(su_casematch(invite->sip->sip_session_expires->x_refresher, "uac")); respond_with_sdp( invite, dialog, SIP_200_OK, SIPTAG_SESSION_EXPIRES_STR(session_expires), @@ -1261,9 +1264,9 @@ TAG_END()); s2_nua_fast_forward(300, s2base->root); - invite_timer_round(nh, "300", NULL); + invite_timer_round(nh, "300;refresher=uac", NULL); s2_nua_fast_forward(300, s2base->root); - invite_timer_round(nh, "300", NULL); + invite_timer_round(nh, "300;refresher=uac", NULL); bye_by_nua(nh, TAG_END());

1 0

[commit] r13318 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 10:43:28 2009 New Revision: 13318 Log: Tue May 12 12:08:13 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nua_session.c: include Session-Expires to session refresh requests Thanks for Linus Surguy for reporting the problem. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 10:43:28 2009 @@ -1 +1 @@ -Fri May 15 10:42:15 CDT 2009 +Fri May 15 10:43:02 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Fri May 15 10:43:28 2009 @@ -4393,10 +4393,15 @@ */ if (t->local.refresher == nua_local_refresher) refresher = nua_local_refresher; + else if (!initial) + refresher = t->refresher; expires = t->local.expires; if (expires != 0 && expires < min) expires = min; + + if (expires == 0 && !initial && t->interval) + expires = t->interval; } sip_min_se_init(min_se)->min_delta = min;

1 0

[commit] r13317 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/tport
by FreeSWITCH SVN 15 May '09

15 May '09

Author: mikej Date: Fri May 15 10:42:25 2009 New Revision: 13317 Log: Wed Apr 29 13:03:20 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * tport: close half-closed idle connections on windows, too Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri May 15 10:42:25 2009 @@ -1 +1 @@ -Thu Apr 16 12:20:45 CDT 2009 +Fri May 15 10:42:15 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Fri May 15 10:42:25 2009 @@ -2815,8 +2815,9 @@ if (!tport_is_secondary(self)) return; - /* End of stream */ - tport_shutdown0(self, 0); + /* Shutdown completely if there are no queued messages */ + /* Problem reported by Arsen Chaloyan */ + tport_shutdown0(self, tport_has_queued(self) ? 0 : 2); tport_set_secondary_timer(self); }

1 0

[commit] r13316 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 15 May '09

15 May '09

Author: brian Date: Thu May 14 22:17:19 2009 New Revision: 13316 Log: MODAPP-278, thanks Moc see you at cluecon... Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c 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 May 14 22:17:19 2009 @@ -2373,7 +2373,7 @@ if (!strcasecmp(pvar, "dial-string")) { dest = val; - } else if (!strncasecmp(var, "dial-var-", 9)) { + } else if (!strncasecmp(pvar, "dial-var-", 9)) { if (!var_event) { switch_event_create(&var_event, SWITCH_EVENT_GENERAL); } else {

1 0

[commit] r13315 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 14 May '09

14 May '09

Author: brian Date: Thu May 14 17:56:04 2009 New Revision: 13315 Log: Do not verify TLS certificates since we do not have the framework in place to do so. 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 Thu May 14 17:56:04 2009 @@ -768,12 +768,13 @@ TAG_IF(strchr(profile->sipip, ':'), SOATAG_AF(SOA_AF_IP6_ONLY)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_SIPS_URL(profile->tls_bindurl)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_CERTIFICATE_DIR(profile->tls_cert_dir)), + TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), TPTAG_TLS_VERIFY_POLICY(0)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), TPTAG_TLS_VERSION(profile->tls_version)), TAG_IF(!strchr(profile->sipip, ':'), NTATAG_UDP_MTU(65535)), TAG_IF(sofia_test_pflag(profile, PFLAG_DISABLE_SRV), NTATAG_USE_SRV(0)), TAG_IF(sofia_test_pflag(profile, PFLAG_DISABLE_NAPTR), NTATAG_USE_NAPTR(0)), NTATAG_DEFAULT_PROXY(profile->outbound_proxy), - NTATAG_SERVER_RPORT(profile->rport_level), + NTATAG_SERVER_RPORT(profile->rport_level), TPTAG_LOG(sofia_test_flag(profile, TFLAG_TPORT_LOG)), TAG_IF(profile->timer_t1, NTATAG_SIP_T1(profile->timer_t1)), TAG_IF(profile->timer_t1x64, NTATAG_SIP_T1X64(profile->timer_t1x64)),

1 0

[commit] r13314 - in freeswitch/trunk: conf/lang/en/vm src/mod/applications/mod_voicemail
by FreeSWITCH SVN 14 May '09

14 May '09

Author: brian Date: Thu May 14 17:47:44 2009 New Revision: 13314 Log: MODAPP-173 you'll need the latest sounds and a make vm-sync to use this Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/vm/sounds.xml (original) +++ freeswitch/trunk/conf/lang/en/vm/sounds.xml Thu May 14 17:47:44 2009 @@ -332,4 +332,13 @@ </input> </macro> + <macro name="voicemail_disk_quota_exceeded"> + <input pattern="^(.*)$"> + <match> + <action function="play-file" data="voicemail/vm-mailbox_full.wav"/> + </match> + </input> + </macro> + + </include> 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 May 14 17:47:44 2009 @@ -1046,6 +1046,7 @@ #define VM_HELLO_MACRO "voicemail_hello" #define VM_GOODBYE_MACRO "voicemail_goodbye" #define VM_MESSAGE_COUNT_MACRO "voicemail_message_count" +#define VM_DISK_QUOTA_EXCEEDED_MACRO "voicemail_disk_quota_exceeded" #define URGENT_FLAG_STRING "A_URGENT" #define NORMAL_FLAG_STRING "B_NORMAL" @@ -2844,6 +2845,7 @@ switch_xml_t x_domain = NULL, x_domain_root = NULL, x_user = NULL, x_params = NULL, x_param = NULL; switch_event_t *vars = NULL; const char *vm_cc = NULL, *vtmp, *vm_ext = NULL; + int disk_quota = 0; switch_event_t *params = NULL; if (!(caller_id_name = switch_channel_get_variable(channel, "effective_caller_id_name"))) { @@ -2888,6 +2890,8 @@ insert_db = switch_true(val); } else if (!strcasecmp(var, "vm-attach-file")) { email_attach = switch_true(val); + } else if (!strcasecmp(var, "vm-disk-quota")) { + disk_quota = atoi(val); } else if (!strcasecmp(var, "vm-alternate-greet-id")) { read_id = switch_core_session_strdup(session, val); } @@ -3032,6 +3036,27 @@ } } + if (disk_quota) { + callback_t cbt = { 0 }; + char sql[256]; + char disk_usage[256]; + + cbt.buf = disk_usage; + cbt.len = sizeof(disk_usage); + + switch_snprintf(sql, sizeof(sql), + "select sum(message_len) from voicemail_msgs where username='%s' and domain='%s'", + id, domain_name); + vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); + + if (atoi(disk_usage) >= disk_quota) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Voicemail disk quota is exceeded for %s\n", id); + TRY_CODE(switch_ivr_phrase_macro(session, VM_DISK_QUOTA_EXCEEDED_MACRO, NULL, NULL, NULL)); + goto end; + } + } + + memset(&fh, 0, sizeof(fh)); args.input_callback = control_playback; memset(&cc, 0, sizeof(cc));

1 0

[commit] r13313 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 14 May '09

14 May '09

Author: mikej Date: Thu May 14 17:33:17 2009 New Revision: 13313 Log: MODAPP-219 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.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 Thu May 14 17:33:17 2009 @@ -4858,6 +4858,11 @@ conf_name = mydata; + /* eat all leading spaces on conference name, which can cause problems */ + while (*conf_name == ' ') { + conf_name++; + } + /* is there a conference pin ? */ if ((dpin = strchr(conf_name, '+'))) { *dpin++ = '\0';

1 0

[commit] r13312 - freeswitch/trunk/src/mod/applications/mod_fax
by FreeSWITCH SVN 14 May '09

14 May '09

Author: mikej Date: Thu May 14 17:01:55 2009 New Revision: 13312 Log: can't print base 8 number that has a 9 in it.. use stringified version instead Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Thu May 14 17:01:55 2009 @@ -805,8 +805,7 @@ /* Not such severe to prevent loading */ } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "mod_fax loaded, using spandsp library version %d [%d]\n", SPANDSP_RELEASE_DATE, - SPANDSP_RELEASE_TIME); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "mod_fax loaded, using spandsp library version [%s]\n", SPANDSP_RELEASE_DATETIME_STRING); return SWITCH_STATUS_SUCCESS; }

1 0