March 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12378 - freeswitch/trunk/src/include
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mrene Date: Tue Mar 3 11:21:00 2009 New Revision: 12378 Log: Add doxygen comment to switch_channel_set_private Modified: freeswitch/trunk/src/include/switch_channel.h Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Tue Mar 3 11:21:00 2009 @@ -398,6 +398,7 @@ \param key unique keyname to associate your private data to \param private_info void pointer to private data \return SWITCH_STATUS_SUCCESS if data was set + \remarks set NULL to delete your private data */ SWITCH_DECLARE(switch_status_t) switch_channel_set_private(switch_channel_t *channel, const char *key, const void *private_info);

1 0

[commit] r12377 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mikej Date: Tue Mar 3 11:20:55 2009 New Revision: 12377 Log: Thu Feb 26 16:28:28 CST 2009 Pekka Pessi <first.last(a)nokia.com> * nua/check_session.c: added test cases for REFER 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 Tue Mar 3 11:20:55 2009 @@ -1 +1 @@ -Tue Mar 3 11:20:05 CST 2009 +Tue Mar 3 11:20:37 CST 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 Tue Mar 3 11:20:55 2009 @@ -96,9 +96,13 @@ s2_register_teardown(); + mark_point(); + nua_shutdown(nua); fail_unless(s2_check_event(nua_r_shutdown, 200)); + mark_point(); + s2_nua_teardown(); } @@ -3095,6 +3099,145 @@ call_teardown(); } +/* ====================================================================== */ +/* Test cases for REFER */ + +START_TEST(refer_5_2_1) +{ + nua_handle_t *nh; + sip_refer_to_t r[1]; + struct event *refer; + struct message *notify; + + s2_case("5.2.1", "Receive REFER", + "Make a call, receive REFER."); + + nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END()); + invite_by_nua(nh, TAG_END()); + + *sip_refer_to_init(r)->r_url = *s2->local->a_url; + r->r_url->url_user = "bob2"; + + s2_request_to(dialog, SIP_METHOD_REFER, NULL, + SIPTAG_REFER_TO(r), + TAG_END()); + refer = s2_wait_for_event(nua_i_refer, 202); + + bye_by_nua(nh, TAG_END()); + + nua_handle_destroy(nh); + + notify = s2_wait_for_request(SIP_METHOD_NOTIFY); + s2_respond_to(notify, dialog, SIP_200_OK, TAG_END()); +} +END_TEST + + +START_TEST(refer_5_2_2) +{ + nua_handle_t *nh, *nh2; + sip_refer_to_t r[1]; + sip_referred_by_t by[1]; + struct event *refer, *notified; + sip_t const *sip; + sip_event_t const *refer_event = NULL; + sip_subscription_state_t const *ss; + struct message *invite; + struct message *notify0, *notify1, *notify2; + struct dialog *dialog1, *dialog2; + + s2_case("5.2.2", "Receive REFER", + "Make a call, receive REFER, " + "make another call with automatic NOTIFYs"); + + dialog2 = su_home_new(sizeof *dialog2); fail_unless(dialog2 != NULL); + + nh = nua_handle(nua, NULL, SIPTAG_TO(s2->local), TAG_END()); + invite_by_nua(nh, TAG_END()); + + *sip_refer_to_init(r)->r_url = *s2->local->a_url; + r->r_url->url_user = "bob2"; + + tport_set_params(s2->master, TPTAG_LOG(1), TAG_END()); + s2_setup_logs(7); + + s2_request_to(dialog, SIP_METHOD_REFER, NULL, + SIPTAG_REFER_TO(r), + TAG_END()); + refer = s2_wait_for_event(nua_i_refer, 202); + sip = sip_object(refer->data->e_msg); + fail_unless(sip && sip->sip_refer_to); + + bye_by_nua(nh, TAG_END()); + + dialog1 = dialog, dialog = dialog2; + + *sip_referred_by_init(by)->b_url = + *sip->sip_from->a_url; + + fail_unless(tl_gets(refer->data->e_tags, + NUTAG_REFER_EVENT_REF(refer_event), + TAG_END()) == 1); + + nua_notify(nh, + SIPTAG_EVENT(refer_event), + SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), + SIPTAG_PAYLOAD_STR("SIP/2.0 100 Trying\r\n"), + NUTAG_SUBSTATE(nua_substate_active), + TAG_END()); + notify0 = s2_wait_for_request(SIP_METHOD_NOTIFY); + fail_unless((ss = notify0->sip->sip_subscription_state) != NULL); + fail_unless(su_casematch("active", ss->ss_substate)); + s2_respond_to(notify0, dialog1, SIP_200_OK, TAG_END()); + notified = s2_wait_for_event(nua_r_notify, 200); + + nh2 = nua_handle(nua, NULL, NUTAG_URL(r->r_url), TAG_END()); + + invite = invite_sent_by_nua(nh2, + NUTAG_REFER_EVENT(refer_event), + NUTAG_NOTIFY_REFER(nh), + SIPTAG_REFERRED_BY(by), + TAG_END()); + process_offer(invite); + + respond_with_sdp( + invite, dialog, SIP_180_RINGING, + SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"), + TAG_END()); + fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless(s2_check_callstate(nua_callstate_proceeding)); + + notify1 = s2_wait_for_request(SIP_METHOD_NOTIFY); + s2_respond_to(notify1, dialog1, SIP_200_OK, TAG_END()); + + respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); + s2_free_message(invite); + fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless(s2_check_callstate(nua_callstate_ready)); + fail_unless(s2_check_request(SIP_METHOD_ACK)); + + notify2 = s2_wait_for_request(SIP_METHOD_NOTIFY); + s2_respond_to(notify2, dialog1, SIP_200_OK, TAG_END()); + fail_unless((ss = notify2->sip->sip_subscription_state) != NULL); + fail_unless(su_casematch("terminated", ss->ss_substate)); + + nua_handle_destroy(nh); + bye_by_nua(nh2, TAG_END()); + nua_handle_destroy(nh2); +} +END_TEST + +TCase *refer_tcase(int threading) +{ + TCase *tc = tcase_create("5.2 - Call Transfer"); + + add_call_fixtures(tc, threading); + + tcase_add_test(tc, refer_5_2_1); + tcase_add_test(tc, refer_5_2_2); + + return tc; +} /* ====================================================================== */ @@ -3137,6 +3280,7 @@ suite_add_tcase(suite, termination_tcase(threading)); suite_add_tcase(suite, destroy_tcase(threading)); suite_add_tcase(suite, options_tcase(threading)); + suite_add_tcase(suite, refer_tcase(threading)); if (0) /* Template */ suite_add_tcase(suite, empty_tcase(threading));

1 0

[commit] r12376 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mikej Date: Tue Mar 3 11:20:24 2009 New Revision: 12376 Log: Thu Feb 26 15:39:37 CST 2009 Pekka Pessi <first.last(a)nokia.com> * nua/check_simple.c: removed extra debug logging, fixed 6.3.4 name Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c 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 Tue Mar 3 11:20:24 2009 @@ -1 +1 @@ -Tue Mar 3 11:19:17 CST 2009 +Tue Mar 3 11:20:05 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c Tue Mar 3 11:20:24 2009 @@ -711,7 +711,7 @@ struct event *response; sip_t *sip; - s2_case("6.3.3", "NOTIFY server - terminate with error response to NOTIFY", + s2_case("6.3.4", "NOTIFY server - terminate with error response to NOTIFY", "NUA receives SUBSCRIBE, sends 202 and NOTIFY. " "The subscription terminates when watcher " "returns 481 to second NOTIFY. The queued 3rd NOTIFY gets " @@ -719,9 +719,6 @@ nh = subscribe_to_nua("presence", SIPTAG_EXPIRES_STR("300"), TAG_END()); - tport_set_params(s2->master, TPTAG_LOG(1), TAG_END()); - s2_setup_logs(7); - nua_notify(nh, NUTAG_SUBSTATE(nua_substate_active), SIPTAG_PAYLOAD_STR(presence_closed), 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 Tue Mar 3 11:20:24 2009 @@ -1767,11 +1767,23 @@ else if (nh->nh_soa == NULL) { offer_sent = session_get_description(sip, NULL, NULL); } - /* When 100rel response status was 183 do support for preconditions */ - else if (ss->ss_precondition && cri->cr_status == 183 && - cri->cr_offer_sent && cri->cr_answer_recv) { - if (soa_generate_offer(nh->nh_soa, 0, NULL) < 0 || - session_include_description(nh->nh_soa, 1, msg, sip) < 0) { + else { + /* When 100rel response status was 183 do support for preconditions */ + int send_offer = ss->ss_precondition && + cri->cr_status == 183 && cri->cr_offer_sent && cri->cr_answer_recv; + + if (!send_offer) { + tagi_t const *t = tl_find_last(tags, nutag_include_extra_sdp); + send_offer = t && t->t_value; + } + + if (!send_offer) { + } + else if (soa_generate_offer(nh->nh_soa, 0, NULL) >= 0 && + session_include_description(nh->nh_soa, 1, msg, sip) >= 0) { + offer_sent = 1; + } + else { status = soa_error_as_sip_response(nh->nh_soa, &phrase); SU_DEBUG_3(("nua(%p): PRACK offer: %d %s\n", (void *)nh, status, phrase)); @@ -1779,9 +1791,6 @@ nua_i_media_error, status, phrase, NULL); return nua_client_return(cr, status, phrase, msg); } - else { - offer_sent = 1; - } } retval = nua_base_client_request(cr, msg, sip, NULL);

1 0

[commit] r12375 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mikej Date: Tue Mar 3 11:19:58 2009 New Revision: 12375 Log: Mon Mar 2 11:21:17 CST 2009 Pekka Pessi <first.last(a)nokia.com> * sl_utils_print.c: propagate error from fwrite() Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_print.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 3 11:19:58 2009 @@ -1 +1 @@ -Tue Mar 3 11:18:41 CST 2009 +Tue Mar 3 11:19:17 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_print.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_print.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/sl_utils_print.c Tue Mar 3 11:19:58 2009 @@ -218,11 +218,18 @@ crlf = su_strnspn(s + n, end - s - n, "\r\n"); if (prefix) fputs(prefix, stream), total += strlen(prefix); +v v v v v v v actual = fwrite(s, 1, n + crlf, stream) ; if (actual == 0) return -1; s += actual; total += actual; +************* + if (fwrite(s, 1, n + crlf, stream) < n + crlf) + return (issize_t)-1; + s += n + crlf; + total += n + crlf; +^ ^ ^ ^ ^ ^ ^ } if (crlf == 0) fputs("\n", stream), total++;

1 0

[commit] r12374 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/tport
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mikej Date: Tue Mar 3 11:19:09 2009 New Revision: 12374 Log: Tue Mar 3 07:56:30 CST 2009 Pekka Pessi <first.last(a)nokia.com> * tport.c: add TPTAG_LOG() and TPTAG_DUMP() to tport_get_params() Fixed return value from tport_set_params(), too. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/test_tport.c 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 Tue Mar 3 11:19:09 2009 @@ -1 +1 @@ -Thu Feb 26 12:40:06 CST 2009 +Tue Mar 3 11:18:41 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/test_tport.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/test_tport.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/test_tport.c Tue Mar 3 11:19:09 2009 @@ -472,6 +472,7 @@ tp_name_t const *tpn; tport_t *tp; unsigned idle; + int logging = -1; BEGIN(); @@ -552,6 +553,15 @@ TPTAG_IDLE_REF(idle), TAG_END()), 1); + /* Check that logging tag works */ + TEST(tport_get_params(tt->tt_srv_tports, + TPTAG_LOG_REF(logging), + TAG_END()), 1); + TEST(tport_set_params(tt->tt_srv_tports, + TPTAG_LOG(logging), + TAG_END()), 1); + + for (tp = tport_primaries(tt->tt_srv_tports); tp; tp = tport_next(tp)) TEST_S(tport_name(tp)->tpn_ident, "server"); @@ -1298,6 +1308,7 @@ TEST_1(pending_client_close > 0); tp = tt->tt_rtport; pending_server_close = tport_pend(tp, NULL, server_closed_callback, NULL); + TEST_1(pending_server_close > 0); /* Send a largish message */ 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 Tue Mar 3 11:19:09 2009 @@ -1196,6 +1196,7 @@ int n; tport_params_t const *tpp; int connect; + tport_master_t *mr = self->tp_master; if (self == NULL) return su_seterrno(EINVAL); @@ -1227,6 +1228,10 @@ TPTAG_PUBLIC(self->tp_pri ? self->tp_pri->pri_public : 0)), TPTAG_TOS(tpp->tpp_tos), + TAG_IF((void *)self == (void *)mr, + TPTAG_LOG(mr->mr_log != 0)), + TAG_IF((void *)self == (void *)mr, + TPTAG_DUMP(mr->mr_dump)), TAG_END()); ta_end(ta); @@ -1321,7 +1326,7 @@ tpp->tpp_pong2ping = pong2ping; if (memcmp(tpp0, tpp, sizeof tpp) == 0) - return n; + return n + m; if (tport_is_secondary(self) && self->tp_params == self->tp_pri->pri_primary->tp_params) {

1 0

[commit] r12373 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mrene Date: Tue Mar 3 11:14:58 2009 New Revision: 12373 Log: Revert 12369 since inserting NULL is the same as deleting in sqlite3 Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Tue Mar 3 11:14:58 2009 @@ -410,14 +410,6 @@ SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key); /*! - \brief Unsets private from a given channel - \param channel channel to unsets data from - \param key your private data's unique keyname - \return void SWITCH_STATUS_SUCCESS if data was unset -*/ -SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key); - -/*! \brief Assign a name to a given channel \param channel channel to assign name to \param name name to assign Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Mar 3 11:14:58 2009 @@ -565,18 +565,6 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key) -{ - switch_status_t status; - switch_assert(channel != NULL); - - switch_mutex_lock(channel->profile_mutex); - status = switch_core_hash_delete(channel->private_hash, key); - switch_mutex_unlock(channel->profile_mutex); - - return status; -} - SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key) { void *val; Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Mar 3 11:14:58 2009 @@ -188,7 +188,7 @@ switch_core_file_close(&dh->fh); if (session && (channel = switch_core_session_get_channel(session))) { - switch_channel_unset_private(channel, dh->file); + switch_channel_set_private(channel, dh->file, NULL); } } break; @@ -269,7 +269,7 @@ switch_core_file_close(&dh->fh); if (session && (channel = switch_core_session_get_channel(session))) { - switch_channel_unset_private(channel, dh->file); + switch_channel_set_private(channel, dh->file, NULL); } } break;

1 0

[commit] r12372 - freeswitch/trunk/src/include
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mrene Date: Tue Mar 3 11:05:17 2009 New Revision: 12372 Log: Fix doxygen comment without messing with the rest Modified: freeswitch/trunk/src/include/switch_channel.h Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Tue Mar 3 11:05:17 2009 @@ -413,7 +413,7 @@ \brief Unsets private from a given channel \param channel channel to unsets data from \param key your private data's unique keyname - \return void pointer to channel's private data + \return void SWITCH_STATUS_SUCCESS if data was unset */ SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key);

1 0

[commit] r12371 - in freeswitch/trunk/src: . include mod/applications/mod_limit mod/endpoints/mod_sofia
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mrene Date: Tue Mar 3 11:03:48 2009 New Revision: 12371 Log: Revert 12370 Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_core_db.c Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Tue Mar 3 11:03:48 2009 @@ -413,7 +413,7 @@ \brief Unsets private from a given channel \param channel channel to unsets data from \param key your private data's unique keyname - \return SWITCH_STATUS_SUCCESS if data was unset + \return void pointer to channel's private data */ SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key); Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Tue Mar 3 11:03:48 2009 @@ -289,7 +289,7 @@ sql = switch_mprintf("delete from limit_data where hostname='%q';", globals.hostname); limit_execute_sql(sql, globals.mutex); - switch_core_db_free(sql); + switch_safe_free(sql); switch_xml_free(xml); 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 Mar 3 11:03:48 2009 @@ -3133,7 +3133,7 @@ switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_registrations", NULL); switch_odbc_handle_exec(profile->master_odbc, reg_sql, NULL); } - switch_core_db_free(test_sql); + free(test_sql); test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q'", mod_sofia_globals.hostname); @@ -3143,7 +3143,7 @@ switch_odbc_handle_exec(profile->master_odbc, sub_sql, NULL); } - switch_core_db_free(test_sql); + free(test_sql); test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q'", mod_sofia_globals.hostname); if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) { @@ -3158,21 +3158,21 @@ switch_odbc_handle_exec(profile->master_odbc, pres_sql, NULL); } - switch_core_db_free(test_sql); + free(test_sql); test_sql = switch_mprintf("delete from sip_authentication where hostname='%q'", mod_sofia_globals.hostname); if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) { switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_authentication", NULL); switch_odbc_handle_exec(profile->master_odbc, auth_sql, NULL); } - switch_core_db_free(test_sql); + free(test_sql); test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str='' or hostname='%q'", mod_sofia_globals.hostname); if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) { switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_shared_appearance_subscriptions", NULL); switch_odbc_handle_exec(profile->master_odbc, shared_appearance_sql, NULL); } - switch_core_db_free(test_sql); + free(test_sql); for (x = 0; indexes[x]; x++) { switch_odbc_handle_exec(profile->master_odbc, indexes[x], NULL); @@ -3192,28 +3192,28 @@ mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_registrations", reg_sql); - switch_core_db_free(test_sql); + free(test_sql); test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_subscriptions", sub_sql); - switch_core_db_free(test_sql); + free(test_sql); test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_dialogs", dialog_sql); - switch_core_db_free(test_sql); + free(test_sql); test_sql = switch_mprintf("delete from sip_presence where hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_presence", pres_sql); - switch_core_db_free(test_sql); + free(test_sql); test_sql = switch_mprintf("delete from sip_authentication where hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_authentication", auth_sql); - switch_core_db_free(test_sql); + free(test_sql); test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str = '' or hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_shared_appearance_subscriptions", shared_appearance_sql); - switch_core_db_free(test_sql); + free(test_sql); switch_core_db_exec(profile->master_db, "create index if not exists ssa_hostname on sip_shared_appearance_subscriptions (hostname)", NULL, NULL, NULL); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Mar 3 11:03:48 2009 @@ -758,7 +758,7 @@ end: - switch_core_db_free(mime_path); + switch_safe_free(mime_path); } @@ -1034,7 +1034,7 @@ dir_path = switch_mprintf("%s%ssounds", SWITCH_GLOBAL_dirs.base_dir, SWITCH_PATH_SEPARATOR); switch_dir_make_recursive(dir_path, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); - switch_core_db_free(dir_path); + switch_safe_free(dir_path); switch_dir_make_recursive(SWITCH_GLOBAL_dirs.base_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); switch_dir_make_recursive(SWITCH_GLOBAL_dirs.mod_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); switch_dir_make_recursive(SWITCH_GLOBAL_dirs.conf_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); Modified: freeswitch/trunk/src/switch_core_db.c ============================================================================== --- freeswitch/trunk/src/switch_core_db.c (original) +++ freeswitch/trunk/src/switch_core_db.c Tue Mar 3 11:03:48 2009 @@ -85,7 +85,7 @@ ret = sqlite3_exec(db, sql, callback, data, &err); if (ret == SQLITE_BUSY || ret == SQLITE_LOCKED) { if (sane > 1) { - switch_core_db_free(err); + switch_safe_free(err); switch_cond_next(); continue; }

1 0

[commit] r12370 - in freeswitch/trunk/src: . include mod/applications/mod_limit mod/endpoints/mod_sofia
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mrene Date: Tue Mar 3 11:01:50 2009 New Revision: 12370 Log: fix doxygen comment Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_core_db.c Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Tue Mar 3 11:01:50 2009 @@ -413,7 +413,7 @@ \brief Unsets private from a given channel \param channel channel to unsets data from \param key your private data's unique keyname - \return void pointer to channel's private data + \return SWITCH_STATUS_SUCCESS if data was unset */ SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key); Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Tue Mar 3 11:01:50 2009 @@ -289,7 +289,7 @@ sql = switch_mprintf("delete from limit_data where hostname='%q';", globals.hostname); limit_execute_sql(sql, globals.mutex); - switch_safe_free(sql); + switch_core_db_free(sql); switch_xml_free(xml); 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 Mar 3 11:01:50 2009 @@ -3133,7 +3133,7 @@ switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_registrations", NULL); switch_odbc_handle_exec(profile->master_odbc, reg_sql, NULL); } - free(test_sql); + switch_core_db_free(test_sql); test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q'", mod_sofia_globals.hostname); @@ -3143,7 +3143,7 @@ switch_odbc_handle_exec(profile->master_odbc, sub_sql, NULL); } - free(test_sql); + switch_core_db_free(test_sql); test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q'", mod_sofia_globals.hostname); if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) { @@ -3158,21 +3158,21 @@ switch_odbc_handle_exec(profile->master_odbc, pres_sql, NULL); } - free(test_sql); + switch_core_db_free(test_sql); test_sql = switch_mprintf("delete from sip_authentication where hostname='%q'", mod_sofia_globals.hostname); if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) { switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_authentication", NULL); switch_odbc_handle_exec(profile->master_odbc, auth_sql, NULL); } - free(test_sql); + switch_core_db_free(test_sql); test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str='' or hostname='%q'", mod_sofia_globals.hostname); if (switch_odbc_handle_exec(profile->master_odbc, test_sql, NULL) != SWITCH_ODBC_SUCCESS) { switch_odbc_handle_exec(profile->master_odbc, "DROP TABLE sip_shared_appearance_subscriptions", NULL); switch_odbc_handle_exec(profile->master_odbc, shared_appearance_sql, NULL); } - free(test_sql); + switch_core_db_free(test_sql); for (x = 0; indexes[x]; x++) { switch_odbc_handle_exec(profile->master_odbc, indexes[x], NULL); @@ -3192,28 +3192,28 @@ mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_registrations", reg_sql); - free(test_sql); + switch_core_db_free(test_sql); test_sql = switch_mprintf("delete from sip_subscriptions where hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_subscriptions", sub_sql); - free(test_sql); + switch_core_db_free(test_sql); test_sql = switch_mprintf("delete from sip_dialogs where hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_dialogs", dialog_sql); - free(test_sql); + switch_core_db_free(test_sql); test_sql = switch_mprintf("delete from sip_presence where hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_presence", pres_sql); - free(test_sql); + switch_core_db_free(test_sql); test_sql = switch_mprintf("delete from sip_authentication where hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_authentication", auth_sql); - free(test_sql); + switch_core_db_free(test_sql); test_sql = switch_mprintf("delete from sip_shared_appearance_subscriptions where contact_str = '' or hostname='%q'", mod_sofia_globals.hostname); switch_core_db_test_reactive(profile->master_db, test_sql, "DROP TABLE sip_shared_appearance_subscriptions", shared_appearance_sql); - free(test_sql); + switch_core_db_free(test_sql); switch_core_db_exec(profile->master_db, "create index if not exists ssa_hostname on sip_shared_appearance_subscriptions (hostname)", NULL, NULL, NULL); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Mar 3 11:01:50 2009 @@ -758,7 +758,7 @@ end: - switch_safe_free(mime_path); + switch_core_db_free(mime_path); } @@ -1034,7 +1034,7 @@ dir_path = switch_mprintf("%s%ssounds", SWITCH_GLOBAL_dirs.base_dir, SWITCH_PATH_SEPARATOR); switch_dir_make_recursive(dir_path, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); - switch_safe_free(dir_path); + switch_core_db_free(dir_path); switch_dir_make_recursive(SWITCH_GLOBAL_dirs.base_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); switch_dir_make_recursive(SWITCH_GLOBAL_dirs.mod_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); switch_dir_make_recursive(SWITCH_GLOBAL_dirs.conf_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool); Modified: freeswitch/trunk/src/switch_core_db.c ============================================================================== --- freeswitch/trunk/src/switch_core_db.c (original) +++ freeswitch/trunk/src/switch_core_db.c Tue Mar 3 11:01:50 2009 @@ -85,7 +85,7 @@ ret = sqlite3_exec(db, sql, callback, data, &err); if (ret == SQLITE_BUSY || ret == SQLITE_LOCKED) { if (sane > 1) { - switch_safe_free(err); + switch_core_db_free(err); switch_cond_next(); continue; }

1 0

[commit] r12369 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 03 Mar '09

03 Mar '09

Author: mrene Date: Tue Mar 3 10:58:24 2009 New Revision: 12369 Log: MODAPP-244 bkw stop trying to commit faster than me :P Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Tue Mar 3 10:58:24 2009 @@ -410,6 +410,14 @@ SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key); /*! + \brief Unsets private from a given channel + \param channel channel to unsets data from + \param key your private data's unique keyname + \return void pointer to channel's private data +*/ +SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key); + +/*! \brief Assign a name to a given channel \param channel channel to assign name to \param name name to assign Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Mar 3 10:58:24 2009 @@ -565,6 +565,18 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_DECLARE(switch_status_t) switch_channel_unset_private(switch_channel_t *channel, const char *key) +{ + switch_status_t status; + switch_assert(channel != NULL); + + switch_mutex_lock(channel->profile_mutex); + status = switch_core_hash_delete(channel->private_hash, key); + switch_mutex_unlock(channel->profile_mutex); + + return status; +} + SWITCH_DECLARE(void *) switch_channel_get_private(switch_channel_t *channel, const char *key) { void *val; Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Mar 3 10:58:24 2009 @@ -188,7 +188,7 @@ switch_core_file_close(&dh->fh); if (session && (channel = switch_core_session_get_channel(session))) { - switch_channel_set_private(channel, dh->file, NULL); + switch_channel_unset_private(channel, dh->file); } } break; @@ -269,7 +269,7 @@ switch_core_file_close(&dh->fh); if (session && (channel = switch_core_session_get_channel(session))) { - switch_channel_set_private(channel, dh->file, NULL); + switch_channel_unset_private(channel, dh->file); } } break;

1 0