March 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12430 - freeswitch/trunk/src
by FreeSWITCH SVN 05 Mar '09

05 Mar '09

Author: mrene Date: Wed Mar 4 20:46:00 2009 New Revision: 12430 Log: Don't crash in the odd event you have no modules loaded Modified: freeswitch/trunk/src/switch_loadable_module.c Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Wed Mar 4 20:46:00 2009 @@ -1266,6 +1266,10 @@ switch_hash_index_t *hi; void *val; switch_loadable_module_t *module; + + if (!loadable_modules.module_hash) { + return; + } for (hi = switch_hash_first(NULL, loadable_modules.module_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, NULL, NULL, &val);

1 0

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

05 Mar '09

Author: anthm Date: Wed Mar 4 19:15:17 2009 New Revision: 12429 Log: FSCORE-319 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core_media_bug.c freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Mar 4 19:15:17 2009 @@ -196,6 +196,8 @@ */ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove(_In_ switch_core_session_t *session, _Inout_ switch_media_bug_t **bug); +SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove_callback(switch_core_session_t *session, switch_media_bug_callback_t callback); + /*! \brief Close and destroy a media bug \param bug bug to remove Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Wed Mar 4 19:15:17 2009 @@ -370,15 +370,7 @@ if (session->bugs) { switch_thread_rwlock_wrlock(session->bug_rwlock); for (bp = session->bugs; bp; bp = bp->next) { - if (bp->thread_id && bp->thread_id != switch_thread_self()) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BUG is thread locked skipping.\n"); - continue; - } - - if (!bp->ready) { - continue; - } - if (bp == *bug) { + if ((!bp->thread_id || bp->thread_id == switch_thread_self()) && bp->ready && bp == *bug) { if (last) { last->next = bp->next; } else { @@ -386,6 +378,7 @@ } break; } + last = bp; } switch_thread_rwlock_unlock(session->bug_rwlock); @@ -402,6 +395,44 @@ return status; } + +SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove_callback(switch_core_session_t *session, switch_media_bug_callback_t callback) +{ + switch_media_bug_t *cur = NULL, *bp = NULL, *last = NULL; + int total = 0; + + if (session->bugs) { + switch_thread_rwlock_wrlock(session->bug_rwlock); + + bp = session->bugs; + while (bp) { + cur = bp; + bp = bp->next; + + if ((!cur->thread_id || cur->thread_id == switch_thread_self()) && cur->ready && cur->callback == callback) { + if (last) { + last->next = cur->next; + } else { + session->bugs = cur->next; + } + if (switch_core_media_bug_close(&cur) == SWITCH_STATUS_SUCCESS) { + total++; + } + } else { + last = cur; + } + } + switch_thread_rwlock_unlock(session->bug_rwlock); + } + + if (!session->bugs && session->bug_codec.implementation) { + switch_core_codec_destroy(&session->bug_codec); + memset(&session->bug_codec, 0, sizeof(session->bug_codec)); + } + + return total ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; +} + /* For Emacs: * Local Variables: * mode:c Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Wed Mar 4 19:15:17 2009 @@ -424,23 +424,31 @@ return SWITCH_STATUS_SUCCESS; } +struct record_helper { + char *file; + switch_file_handle_t *fh; +}; + static switch_bool_t record_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) { - switch_file_handle_t *fh = (switch_file_handle_t *) user_data; + switch_core_session_t *session = switch_core_media_bug_get_session(bug); + switch_channel_t *channel = switch_core_session_get_channel(session); + struct record_helper *rh = (struct record_helper *) user_data; switch (type) { case SWITCH_ABC_TYPE_INIT: break; case SWITCH_ABC_TYPE_CLOSE: - if (fh) { - switch_core_file_close(fh); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stop recording file %s\n", rh->file); + switch_channel_set_private(channel, rh->file, NULL); + + if (rh->fh) { + switch_core_file_close(rh->fh); } break; case SWITCH_ABC_TYPE_READ_PING: - if (fh) { + if (rh->fh) { switch_size_t len; - switch_core_session_t *session = switch_core_media_bug_get_session(bug); - switch_channel_t *channel = switch_core_session_get_channel(session); uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE]; switch_frame_t frame = { 0 }; @@ -455,7 +463,7 @@ if (doit) { len = (switch_size_t) frame.datalen / 2; - switch_core_file_write(fh, data, &len); + switch_core_file_write(rh->fh, data, &len); } } } @@ -473,8 +481,9 @@ switch_media_bug_t *bug; switch_channel_t *channel = switch_core_session_get_channel(session); - if ((bug = switch_channel_get_private(channel, file))) { - switch_channel_set_private(channel, file, NULL); + if (!strcasecmp(file, "all")) { + return switch_core_media_bug_remove_callback(session, record_callback); + } else if ((bug = switch_channel_get_private(channel, file))) { switch_core_media_bug_remove(session, &bug); return SWITCH_STATUS_SUCCESS; } @@ -838,6 +847,8 @@ switch_media_bug_flag_t flags = SMBF_READ_STREAM | SMBF_WRITE_STREAM | SMBF_READ_PING; uint8_t channels; switch_codec_implementation_t read_impl = {0}; + struct record_helper *rh = NULL; + switch_core_session_get_read_impl(session, &read_impl); if ((status = switch_channel_pre_answer(channel)) != SWITCH_STATUS_SUCCESS) { @@ -925,7 +936,11 @@ to = switch_epoch_time_now(NULL) + limit; } - if ((status = switch_core_media_bug_add(session, record_callback, fh, to, flags, &bug)) != SWITCH_STATUS_SUCCESS) { + rh = switch_core_session_alloc(session, sizeof(*rh)); + rh->fh = fh; + rh->file = switch_core_session_strdup(session, file); + + if ((status = switch_core_media_bug_add(session, record_callback, rh, to, flags, &bug)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error adding media bug for file %s\n", file); switch_core_file_close(fh); return status;

1 0

[commit] r12428 - freeswitch/trunk/src
by FreeSWITCH SVN 04 Mar '09

04 Mar '09

Author: anthm Date: Wed Mar 4 17:15:13 2009 New Revision: 12428 Log: FSCORE-320 Modified: freeswitch/trunk/src/switch_core_media_bug.c Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Wed Mar 4 17:15:13 2009 @@ -122,7 +122,7 @@ return SWITCH_STATUS_FALSE; } - if (!(bug->raw_read_buffer && bug->raw_write_buffer)) { + if (!(bug->raw_read_buffer && (bug->raw_write_buffer || !switch_test_flag(bug, SMBF_WRITE_STREAM)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%sBuffer Error\n", switch_channel_get_name(bug->session->channel)); } @@ -136,13 +136,15 @@ } switch_mutex_unlock(bug->read_mutex); - switch_mutex_lock(bug->write_mutex); - datalen = (uint32_t) switch_buffer_read(bug->raw_write_buffer, bug->data, bytes); - if (datalen < bytes) { - memset(((unsigned char *)bug->data) + datalen, 0, bytes - datalen); - datalen = bytes; + if (switch_test_flag(bug, SMBF_WRITE_STREAM)) { + switch_mutex_lock(bug->write_mutex); + datalen = (uint32_t) switch_buffer_read(bug->raw_write_buffer, bug->data, bytes); + if (datalen < bytes) { + memset(((unsigned char *)bug->data) + datalen, 0, bytes - datalen); + datalen = bytes; + } + switch_mutex_unlock(bug->write_mutex); } - switch_mutex_unlock(bug->write_mutex); tp = bug->tmp; dp = (int16_t *) bug->data;

1 0

[commit] r12427 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 04 Mar '09

04 Mar '09

Author: anthm Date: Wed Mar 4 17:03:25 2009 New Revision: 12427 Log: add configurable outgoing cid types Modified: 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.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.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 Wed Mar 4 17:03:25 2009 @@ -2579,6 +2579,7 @@ switch_ivr_transfer_variable(session, nsession, "sip_video_fmtp"); switch_ivr_transfer_variable(session, nsession, "sip-force-contact"); switch_ivr_transfer_variable(session, nsession, "sip_sticky_contact"); + switch_ivr_transfer_variable(session, nsession, "sip_cid_type"); if (switch_core_session_compare(session, nsession)) { /* It's another sofia channel! so lets cache what they use as a pt for telephone event so 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 Wed Mar 4 17:03:25 2009 @@ -105,6 +105,7 @@ #include <sofia-sip/nea.h> #include <sofia-sip/msg_addr.h> #include <sofia-sip/tport_tag.h> +#include <sofia-sip/sip_extra.h> #include "nua_stack.h" typedef enum { @@ -371,6 +372,12 @@ MEDIA_OPT_BYPASS_AFTER_ATT_XFER = (1 << 1) } sofia_media_options_t; +typedef enum { + CID_TYPE_RPID, + CID_TYPE_PID, + CID_TYPE_NONE +} sofia_cid_type_t; + struct sofia_profile { int debug; char *name; @@ -403,6 +410,7 @@ char *record_template; char *presence_hosts; char *challenge_realm; + sofia_cid_type_t cid_type; sofia_dtmf_t dtmf_type; int auto_restart; int sip_port; @@ -493,6 +501,9 @@ char *contact_url; char *from_str; char *rpid; + char *asserted_id; + char *preferred_id; + char *privacy; char *gateway_from_str; char *rm_encoding; char *iananame; @@ -825,3 +836,4 @@ * \return the component's loglevel, or -1 if the component isn't valid */ int sofia_get_loglevel(const char *name); +sofia_cid_type_t sofia_cid_name2type(const char *name); 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 Mar 4 17:03:25 2009 @@ -1453,6 +1453,8 @@ if (switch_true(val)) { profile->rport_level = 2; } + } else if (!strcasecmp(var, "caller-id-type")) { + profile->cid_type = sofia_cid_name2type(val); } else if (!strcasecmp(var, "record-template")) { profile->record_template = switch_core_strdup(profile->pool, val);; } else if ((!strcasecmp(var, "inbound-no-media") || !strcasecmp(var, "inbound-bypass-media"))) { @@ -1920,6 +1922,8 @@ profile->dbname = switch_core_strdup(profile->pool, val); } else if (!strcasecmp(var, "presence-hosts")) { profile->presence_hosts = switch_core_strdup(profile->pool, val); + } else if (!strcasecmp(var, "caller-id-type")) { + profile->cid_type = sofia_cid_name2type(val); } else if (!strcasecmp(var, "record-template")) { profile->record_template = switch_core_strdup(profile->pool, val); } else if ((!strcasecmp(var, "inbound-no-media") || !strcasecmp(var, "inbound-bypass-media")) && switch_true(val)) { @@ -4195,6 +4199,7 @@ if (!switch_strlen_zero(rpid->rpid_display)) { displayname = rpid->rpid_display; } + switch_channel_set_variable(channel, "sip_cid_type", "rpid"); } if ((passerted = sip_p_asserted_identity(sip))) { @@ -4204,6 +4209,7 @@ if (!switch_strlen_zero(passerted->paid_display)) { displayname = passerted->paid_display; } + switch_channel_set_variable(channel, "sip_cid_type", "pid"); } if ((ppreferred = sip_p_preferred_identity(sip))) { @@ -4213,6 +4219,7 @@ if (!switch_strlen_zero(ppreferred->ppid_display)) { displayname = ppreferred->ppid_display; } + switch_channel_set_variable(channel, "sip_cid_type", "pid"); } if (from_user) { 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 Wed Mar 4 17:03:25 2009 @@ -36,6 +36,7 @@ #include "mod_sofia.h" #include <switch_stun.h> + void sofia_glue_set_image_sdp(private_object_t *tech_pvt, switch_t38_options_t *t38_options) { char buf[2048]; @@ -1112,6 +1113,7 @@ char *route = NULL; char *route_uri = NULL; char *sendto = NULL; + sofia_cid_type_t cid_type = tech_pvt->profile->cid_type; rep = switch_channel_get_variable(channel, SOFIA_REPLACES_HEADER); @@ -1300,23 +1302,54 @@ switch_channel_set_variable(channel, "sip_nat_detected", "true"); } - /* TODO: We should use the new tags for making an rpid and add profile options to turn this on/off */ - if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NAME)) { - priv = "name"; + if ((val = switch_channel_get_variable(channel, "sip_cid_type"))) { + cid_type = sofia_cid_name2type(val); + } + switch (cid_type) { + case CID_TYPE_PID: + if (switch_test_flag(caller_profile, SWITCH_CPF_SCREEN)) { + tech_pvt->asserted_id = switch_core_session_sprintf(tech_pvt->session, "\"%s\"<sip:%s@%s>", + tech_pvt->caller_profile->caller_id_name, + tech_pvt->caller_profile->caller_id_number, + rpid_domain); + } else { + tech_pvt->preferred_id = switch_core_session_sprintf(tech_pvt->session, "\"%s\"<sip:%s@%s>", + tech_pvt->caller_profile->caller_id_name, + tech_pvt->caller_profile->caller_id_number, + rpid_domain); + } + if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER)) { - priv = "full"; + tech_pvt->privacy = "id"; + } else { + tech_pvt->privacy = "none"; } - } else if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER)) { - priv = "full"; - } - if (switch_test_flag(caller_profile, SWITCH_CPF_SCREEN)) { - screen = "yes"; + break; + case CID_TYPE_RPID: + { + if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NAME)) { + priv = "name"; + if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER)) { + priv = "full"; + } + } else if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER)) { + priv = "full"; + } + + if (switch_test_flag(caller_profile, SWITCH_CPF_SCREEN)) { + screen = "yes"; + } + + tech_pvt->rpid = switch_core_session_sprintf(tech_pvt->session, "\"%s\"<sip:%s@%s>;party=calling;screen=%s;privacy=%s", + tech_pvt->caller_profile->caller_id_name, + tech_pvt->caller_profile->caller_id_number, rpid_domain, screen, priv); + } + break; + default: + break; } - tech_pvt->rpid = switch_core_session_sprintf(tech_pvt->session, "Remote-Party-ID: \"%s\"<sip:%s@%s>;party=calling;screen=%s;privacy=%s", - tech_pvt->caller_profile->caller_id_name, - tech_pvt->caller_profile->caller_id_number, rpid_domain, screen, priv); switch_safe_free(d_url); @@ -1438,7 +1471,10 @@ NUTAG_AUTOANSWER(0), NUTAG_SESSION_TIMER(session_timeout), TAG_IF(!switch_strlen_zero(sendto), NTATAG_DEFAULT_PROXY(sendto)), - TAG_IF(!switch_strlen_zero(tech_pvt->rpid), SIPTAG_HEADER_STR(tech_pvt->rpid)), + TAG_IF(!switch_strlen_zero(tech_pvt->rpid), SIPTAG_REMOTE_PARTY_ID_STR(tech_pvt->rpid)), + TAG_IF(!switch_strlen_zero(tech_pvt->preferred_id), SIPTAG_P_PREFERRED_IDENTITY_STR(tech_pvt->preferred_id)), + TAG_IF(!switch_strlen_zero(tech_pvt->asserted_id), SIPTAG_P_ASSERTED_IDENTITY_STR(tech_pvt->asserted_id)), + TAG_IF(!switch_strlen_zero(tech_pvt->privacy), SIPTAG_PRIVACY_STR(tech_pvt->preferred_id)), TAG_IF(!switch_strlen_zero(alert_info), SIPTAG_HEADER_STR(alert_info)), TAG_IF(!switch_strlen_zero(extra_headers), SIPTAG_HEADER_STR(extra_headers)), TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)), @@ -3557,6 +3593,20 @@ return uri; } +sofia_cid_type_t sofia_cid_name2type(const char *name) +{ + if (!strcasecmp(name, "rpid")) { + return CID_TYPE_RPID; + } + + if (!strcasecmp(name, "pid")) { + return CID_TYPE_PID; + } + + return CID_TYPE_NONE; + +} + /* For Emacs: * Local Variables:

1 0

[commit] r12426 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 04 Mar '09

04 Mar '09

Author: anthm Date: Wed Mar 4 16:39:47 2009 New Revision: 12426 Log: FSCORE-310 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Wed Mar 4 16:39:47 2009 @@ -57,10 +57,14 @@ sofia_profile_t *profile = NULL; char *ffrom = NULL; nua_handle_t *msg_nh; - char *contact; + char *contact = NULL; char *dup = NULL; switch_status_t status = SWITCH_STATUS_FALSE; const char *ct = "text/html"; + char *clean_to = NULL; + char *route = NULL; + char *route_uri = NULL; + char *ptr = NULL; if (!to) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing To: header.\n"); @@ -135,19 +139,55 @@ switch_safe_free(fp); } - status = SWITCH_STATUS_SUCCESS; contact = sofia_glue_get_url_from_contact(buf, 1); + + if (contact && (ptr = strstr(contact, ";fs_path=")) && (route = strdup(ptr + 9))) { + char *p; + for (p = route; p && *p ; p++) { + if (*p == '>' || *p == ';') { + *p = '\0'; + break; + } + } + switch_url_decode(route); + route_uri = strdup(route); + if ((p = strchr(route_uri, ','))) { + while ((p > route_uri) && *(p-1) == ' ') { + p--; + } + if (*p) { + *p = '\0'; + } + } + *ptr++ = '>'; + *ptr++ = '\0'; + } + + clean_to = strdup(buf); + if ((ptr = strstr(clean_to, ";fs_path="))) { + *ptr++ = '>'; + *ptr++ = '\0'; + } + + /* sofia_glue is running sofia_overcome_sip_uri_weakness we do not, not sure if it matters */ + + status = SWITCH_STATUS_SUCCESS; /* if this cries, add contact here too, change the 1 to 0 and omit the safe_free */ - msg_nh = nua_handle(profile->nua, NULL, SIPTAG_FROM_STR(from), NUTAG_URL(contact), SIPTAG_TO_STR(buf), - SIPTAG_CONTACT_STR(profile->url), TAG_END()); + msg_nh = nua_handle(profile->nua, NULL, TAG_IF(route, NUTAG_PROXY(route_uri)), TAG_IF(route, SIPTAG_ROUTE_STR(route)), + SIPTAG_FROM_STR(from), NUTAG_URL(contact), + SIPTAG_TO_STR(clean_to), SIPTAG_CONTACT_STR(profile->url), + TAG_END()); - switch_safe_free(contact); nua_message(msg_nh, SIPTAG_CONTENT_TYPE_STR(ct), SIPTAG_PAYLOAD_STR(body), TAG_END()); end: + switch_safe_free(contact); + switch_safe_free(route); + switch_safe_free(route_uri); switch_safe_free(ffrom); switch_safe_free(dup); + switch_safe_free(clean_to); if (profile) { switch_thread_rwlock_unlock(profile->rwlock);

1 0

[commit] r12425 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 04 Mar '09

04 Mar '09

1 0

[commit] r12424 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 04 Mar '09

04 Mar '09

Author: anthm Date: Wed Mar 4 15:22:41 2009 New Revision: 12424 Log: make yes no on and off all work in privacy app 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 Wed Mar 4 15:22:41 2009 @@ -968,17 +968,18 @@ } else { switch_set_flag(caller_profile, SWITCH_CPF_SCREEN); - if (!strcasecmp(data, "no")) { - switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NAME); - switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER); - } else if (!strcasecmp(data, "yes")) { - switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); - } else if (!strcasecmp(data, "full")) { + + if (!strcasecmp(data, "full")) { switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); } else if (!strcasecmp(data, "name")) { switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME); } else if (!strcasecmp(data, "number")) { switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER); + } else if (switch_true(data)) { + switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); + } else if (switch_false(data)) { + switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NAME); + switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID privacy mode specified. Use a valid mode [no|yes|name|full|number].\n"); }

1 0

[commit] r12423 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua-glib/su-glib m4
by FreeSWITCH SVN 04 Mar '09

04 Mar '09

Author: mikej Date: Wed Mar 4 14:42:53 2009 New Revision: 12423 Log: Wed Mar 4 13:12:17 CST 2009 Pekka Pessi <first.last(a)nokia.com> * configure: SOFIA_GLIB_CFLAGS added Ignore-this: f70baad5a9f61b6fcbe44ec1aa4c2c22 GLib behaves badly with -Wall -Werror. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Makefile.am freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4 Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Mar 4 14:42:53 2009 @@ -1 +1 @@ -Wed Mar 4 14:40:17 CST 2009 +Wed Mar 4 14:42:12 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Makefile.am Wed Mar 4 14:42:53 2009 @@ -12,7 +12,8 @@ S_BASE = $(top_srcdir)/libsofia-sip-ua B_BASE = $(top_builddir)/libsofia-sip-ua -INCLUDES = -I$(S_BASE)/su -I$(B_BASE)/su $(GLIB_CFLAGS) +INCLUDES = -I$(S_BASE)/su -I$(B_BASE)/su $(GLIB_CFLAGS) \ + $(SOFIA_GLIB_CFLAGS) # ---------------------------------------------------------------------- # Build targets Modified: freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4 ============================================================================== --- freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4 (original) +++ freeswitch/trunk/libs/sofia-sip/m4/sac-general.m4 Wed Mar 4 14:42:53 2009 @@ -122,6 +122,7 @@ AC_SUBST([CWFLAG], [$ac_cv_cwflag]) AC_ARG_VAR([SOFIA_CFLAGS], [CFLAGS not used during configure]) +AC_ARG_VAR([SOFIA_GLIB_CFLAGS], [Extra CFLAGS for libsofia-sip-ua-glib]) SAC_COVERAGE ])

1 0

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

04 Mar '09

Author: mikej Date: Wed Mar 4 14:41:38 2009 New Revision: 12422 Log: Wed Mar 4 12:37:47 CST 2009 Pekka Pessi <first.last(a)nokia.com> * nua: moved contents of test_s2.[hc] to check_nua.[hc] Ignore-this: f53929b29092e2d62e661fc40397492e Removed: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_s2.h Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Mar 4 14:41:38 2009 @@ -1 +1 @@ -Wed Mar 4 14:39:41 CST 2009 +Wed Mar 4 14:40:17 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am Wed Mar 4 14:41:38 2009 @@ -49,8 +49,7 @@ check_nua_SOURCES = check_nua.c check_nua.h \ check_session.c check_register.c \ - check_etsi.c check_simple.c \ - test_s2.h test_s2.c + check_etsi.c check_simple.c check_nua_LDADD = $(nua_libs) ${top_builddir}/s2check/libs2.a \ @CHECK_LIBS@ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c Wed Mar 4 14:41:38 2009 @@ -34,9 +34,9 @@ #include "config.h" -#include "check_nua.h" +#undef NDEBUG -#include "test_s2.h" +#include "check_nua.h" #include <sofia-sip/sip_status.h> #include <sofia-sip/sip_header.h> Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c Wed Mar 4 14:41:38 2009 @@ -22,7 +22,7 @@ * */ -/**@CFILE check2_sofia.c +/**@CFILE check_nua.c * * @brief Check-driven tester for Sofia SIP User Agent library * @@ -33,16 +33,26 @@ #include "config.h" -#include "test_s2.h" +#undef NDEBUG + #include "check_nua.h" +#include "s2dns.h" + +#include <sofia-sip/sip_header.h> +#include <sofia-sip/sip_status.h> +#include <sofia-sip/msg_addr.h> +#include <sofia-sip/su_log.h> +#include <sofia-sip/su_tagarg.h> +#include <sofia-sip/su_alloc.h> +#include <sofia-sip/su_string.h> +#include <sofia-sip/sresolv.h> #include <stdlib.h> #include <string.h> #include <stdio.h> - -#if HAVE_FNMATCH_H -#include <fnmatch.h> -#endif +#include <assert.h> +#include <limits.h> +#include <time.h> static void usage(int exitcode) { @@ -111,3 +121,384 @@ exit(failed ? EXIT_FAILURE : EXIT_SUCCESS); } + +/* ---------------------------------------------------------------------- */ + +/* -- Globals -------------------------------------------------------------- */ + +struct s2nua *s2; + +int s2_nua_thread = 0; + +unsigned s2_default_registration_duration = 3600; + +char const s2_auth_digest_str[] = + "Digest realm=\"s2test\", " + "nonce=\"dcd98b7102dd2f0e8b11d0f600bfb0c093\", " + "qop=\"auth\", " + "algorithm=\"MD5\""; + +char const s2_auth_credentials[] = "Digest:\"s2test\":abc:abc"; + +char const s2_auth2_digest_str[] = + "Digest realm=\"s2test2\", " + "nonce=\"fb0c093dcd98b7102dd2f0e8b11d0f600b\", " + "qop=\"auth\", " + "algorithm=\"MD5\""; + +char const s2_auth2_credentials[] = "Digest:\"s2test2\":abc:abc"; + +char const s2_auth3_digest_str[] = + "Digest realm=\"s2test3\", " + "nonce=\"e8b11d0f600bfb0c093dcd98b7102dd2f0\", " + "qop=\"auth-int\", " + "algorithm=\"MD5-sess\""; + +char const s2_auth3_credentials[] = "Digest:\"s2test3\":abc:abc"; + +/* -- NUA events -------------------------------------------------------- */ + +struct event *s2_remove_event(struct event *e) +{ + if ((*e->prev = e->next)) + e->next->prev = e->prev; + + e->prev = NULL, e->next = NULL; + + return e; +} + +void s2_free_event(struct event *e) +{ + if (e) { + if (e->prev) { + if ((*e->prev = e->next)) + e->next->prev = e->prev; + } + nua_destroy_event(e->event); + nua_handle_unref(e->nh); + free(e); + } +} + +void s2_flush_events(void) +{ + while (s2->events) { + s2_free_event(s2->events); + } +} + +struct event *s2_next_event(void) +{ + for (;;) { + if (s2->events) + return s2_remove_event(s2->events); + + su_root_step(s2base->root, 100); + } +} + +struct event *s2_wait_for_event(nua_event_t event, int status) +{ + struct event *e; + + for (;;) { + for (e = s2->events; e; e = e->next) { + if (event != nua_i_none && event != e->data->e_event) + continue; + if (status && e->data->e_status != status) + continue; + return s2_remove_event(e); + } + + su_root_step(s2base->root, 100); + } +} + +int s2_check_event(nua_event_t event, int status) +{ + struct event *e = s2_wait_for_event(event, status); + s2_free_event(e); + return e != NULL; +} + +int s2_check_callstate(enum nua_callstate state) +{ + int retval = 0; + tagi_t const *tagi; + struct event *e; + + e = s2_wait_for_event(nua_i_state, 0); + if (e) { + tagi = tl_find(e->data->e_tags, nutag_callstate); + if (tagi) { + retval = (tag_value_t)state == tagi->t_value; + } + } + s2_free_event(e); + return retval; +} + +int s2_check_substate(struct event *e, enum nua_substate state) +{ + int retval = 0; + tagi_t const *tagi; + + tagi = tl_find(e->data->e_tags, nutag_substate); + if (tagi) { + retval = (tag_value_t)state == tagi->t_value; + } + + return retval; +} + +static void +s2_nua_callback(nua_event_t event, + int status, char const *phrase, + nua_t *nua, nua_magic_t *_t, + nua_handle_t *nh, nua_hmagic_t *hmagic, + sip_t const *sip, + tagi_t tags[]) +{ + struct event *e, **prev; + + if (event == nua_i_active || event == nua_i_terminated) + return; + + e = calloc(1, sizeof *e); + nua_save_event(nua, e->event); + e->nh = nua_handle_ref(nh); + e->data = nua_event_data(e->event); + + for (prev = &s2->events; *prev; prev = &(*prev)->next) + ; + + *prev = e, e->prev = prev; +} + + +/* ====================================================================== */ + +SOFIAPUBVAR su_log_t nua_log[]; +SOFIAPUBVAR su_log_t soa_log[]; +SOFIAPUBVAR su_log_t nea_log[]; +SOFIAPUBVAR su_log_t nta_log[]; +SOFIAPUBVAR su_log_t tport_log[]; +SOFIAPUBVAR su_log_t su_log_default[]; + +void +s2_setup_logs(int level) +{ + su_log_soft_set_level(nua_log, level); + su_log_soft_set_level(soa_log, level); + su_log_soft_set_level(su_log_default, level); + su_log_soft_set_level(nea_log, level); + su_log_soft_set_level(nta_log, level); + su_log_soft_set_level(tport_log, level); +} + +nua_t *s2_nua_setup(char const *label, + tag_type_t tag, tag_value_t value, ...) +{ + ta_list ta; + + s2_setup(label); + + s2 = su_home_new(sizeof *s2); + + s2_dns_setup(s2base->root); + + s2_setup_logs(0); + s2_sip_setup("example.org", NULL, TAG_END()); + assert(s2sip->contact); + + s2_dns_domain("example.org", 1, + "s2", 1, s2sip->udp.contact->m_url, + "s2", 1, s2sip->tcp.contact->m_url, + NULL); + + /* enable/disable multithreading */ + su_root_threading(s2base->root, s2_nua_thread); + + ta_start(ta, tag, value); + s2->nua = + nua_create(s2base->root, + s2_nua_callback, + s2, + SIPTAG_FROM_STR("Alice <sip:alice@example.org>"), + /* NUTAG_PROXY((url_string_t *)s2sip->contact->m_url), */ + /* Use internal DNS server */ + NUTAG_PROXY("sip:example.org"), + /* Force sresolv to use localhost and s2dns as DNS server */ +#if HAVE_WIN32 + SRESTAG_RESOLV_CONF("NUL"), +#else + SRESTAG_RESOLV_CONF("/dev/null"), +#endif + ta_tags(ta)); + ta_end(ta); + + return s2->nua; +} + +void +s2_nua_fast_forward(unsigned long seconds, + su_root_t *steproot) +{ + s2_fast_forward(seconds, NULL); + + if (s2_nua_thread) + /* Wake up nua thread */ + nua_handle_by_call_id(s2->nua, NULL); + + if (steproot) + su_root_step(steproot, 0); +} + +void s2_nua_teardown(void) +{ + if (s2) { + struct s2nua *zap = s2; + nua_destroy(s2->nua), s2->nua = NULL; + s2 = NULL; + su_home_unref(zap->home); + } + + s2_dns_teardown(); + s2_sip_teardown(); + s2_teardown(); + +} + +/* ====================================================================== */ + +/** Register NUA user. + * + * <pre> + * A B + * |-----REGISTER---->| + * |<-----200 OK------| + * | | + * </pre> + */ +void s2_register_setup(void) +{ + nua_handle_t *nh; + struct message *m; + + assert(s2 && s2->nua); + assert(!s2->registration->nh); + + nh = nua_handle(s2->nua, NULL, TAG_END()); + + nua_register(nh, TAG_END()); + + m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); + assert(m); + + s2_save_register(m); + + s2_sip_respond_to(m, NULL, + SIP_200_OK, + SIPTAG_CONTACT(s2->registration->contact), + TAG_END()); + s2_sip_free_message(m); + + assert(s2->registration->contact != NULL); + s2_check_event(nua_r_register, 200); + + s2->registration->nh = nh; +} + +/** Un-register NUA user. + * + * <pre> + * A B + * |-----REGISTER---->| + * |<-----200 OK------| + * | | + * </pre> + */ +void s2_register_teardown(void) +{ + if (s2 && s2->registration->nh) { + nua_handle_t *nh = s2->registration->nh; + struct message *m; + + nua_unregister(nh, TAG_END()); + + m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); assert(m); + s2_save_register(m); + s2_sip_respond_to(m, NULL, + SIP_200_OK, + SIPTAG_CONTACT(s2->registration->contact), + TAG_END()); + assert(s2->registration->contact == NULL); + + s2_sip_free_message(m); + + s2_check_event(nua_r_unregister, 200); + + nua_handle_destroy(nh); + s2->registration->nh = NULL; + } +} + +int +s2_save_register(struct message *rm) +{ + sip_contact_t *contact, *m, **m_prev; + sip_expires_t const *ex; + sip_date_t const *date; + sip_time_t now = rm->when.tv_sec, expires; + + msg_header_free_all(s2->home, (msg_header_t *)s2->registration->aor); + msg_header_free_all(s2->home, (msg_header_t *)s2->registration->contact); + tport_unref(s2->registration->tport); + + s2->registration->aor = NULL; + s2->registration->contact = NULL; + s2->registration->tport = NULL; + + if (rm == NULL) + return 0; + + assert(rm && rm->sip && rm->sip->sip_request); + assert(rm->sip->sip_request->rq_method == sip_method_register); + + ex = rm->sip->sip_expires; + date = rm->sip->sip_date; + + contact = sip_contact_dup(s2->home, rm->sip->sip_contact); + + for (m_prev = &contact; *m_prev;) { + m = *m_prev; + + expires = sip_contact_expires(m, ex, date, + s2_default_registration_duration, + now); + if (expires) { + char *p = su_sprintf(s2->home, "expires=%lu", (unsigned long)expires); + msg_header_add_param(s2->home, m->m_common, p); + m_prev = &m->m_next; + } + else { + *m_prev = m->m_next; + m->m_next = NULL; + msg_header_free(s2->home, (msg_header_t *)m); + } + } + + if (contact == NULL) + return 0; + + s2->registration->aor = sip_to_dup(s2->home, rm->sip->sip_to); + s2->registration->contact = contact; + s2->registration->tport = tport_ref(rm->tport); + + s2sip->sut.aor = s2->registration->aor; + s2sip->sut.contact = s2->registration->contact; + s2sip->sut.tport = s2->registration->tport; + + return 0; +} Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.h Wed Mar 4 14:41:38 2009 @@ -1,5 +1,104 @@ +/* + * This file is part of the Sofia-SIP package + * + * Copyright (C) 2008 Nokia Corporation. + * + * Contact: Pekka Pessi <pekka.pessi(a)nokia.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + #ifndef CHECK_NUA_H +#include <sofia-sip/su_wait.h> +#include <sofia-sip/sip.h> +#include <sofia-sip/tport.h> +#include <sofia-sip/nua.h> +#include <sofia-sip/su_string.h> + +#include "s2base.h" +#include "s2util.h" +#include "s2sip.h" + +struct s2nua +{ + su_home_t home[1]; + + nua_t *nua; + + int shutdown; + + struct event { + struct event *next, **prev; + nua_saved_event_t event[1]; + nua_handle_t *nh; + nua_event_data_t const *data; + su_time_t when; + } *events; + + struct { + nua_handle_t *nh; + sip_to_t *aor; + sip_contact_t *contact; + tport_t *tport; + } registration[1]; +}; + +extern unsigned s2_default_registration_duration; +extern char const s2_auth_digest_str[]; +extern char const s2_auth_credentials[]; + +extern char const s2_auth2_digest_str[]; +extern char const s2_auth2_credentials[]; + +extern char const s2_auth3_digest_str[]; +extern char const s2_auth3_credentials[]; + +extern int s2_nua_thread; + +extern struct s2nua *s2; + +void s2_setup_logs(int level); + +struct event *s2_remove_event(struct event *); +void s2_free_event(struct event *); +void s2_flush_events(void); + +struct event *s2_next_event(void); +struct event *s2_wait_for_event(nua_event_t event, int status); +int s2_check_event(nua_event_t event, int status); +int s2_check_callstate(enum nua_callstate state); +int s2_check_substate(struct event *e, enum nua_substate state); + +#define SIP_METHOD_UNKNOWN sip_method_unknown, NULL + +void s2_flush_all(void); + +nua_t *s2_nua_setup(char const *label, tag_type_t tag, tag_value_t value, ...); + +void s2_nua_teardown(void); + +void s2_nua_fast_forward(unsigned long seconds, + su_root_t *steproot); + +int s2_save_register(struct message *m); + +void s2_register_setup(void); +void s2_register_teardown(void); + #include <s2check.h> void check_session_cases(Suite *suite, int threading); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c Wed Mar 4 14:41:38 2009 @@ -33,9 +33,9 @@ #include "config.h" -#include "check_nua.h" +#undef NDEBUG -#include "test_s2.h" +#include "check_nua.h" #include <sofia-sip/sip_status.h> #include <sofia-sip/sip_header.h> 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 Wed Mar 4 14:41:38 2009 @@ -33,9 +33,9 @@ #include "config.h" -#include "check_nua.h" +#undef NDEBUG -#include "test_s2.h" +#include "check_nua.h" #include <sofia-sip/sip_status.h> #include <sofia-sip/sip_header.h> @@ -1131,7 +1131,11 @@ s2_sip_respond_to(cancel, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(cancel); - s2_register_teardown(); + /* emulate network gone bad below + zap registration handle here + so that s2_register_teardown() does not hang + */ + s2->registration->nh = NULL; nua_set_params(s2->nua, NUTAG_SHUTDOWN_EVENTS(1), TAG_END()); fail_unless(s2_check_event(nua_r_set_params, 200)); 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 Wed Mar 4 14:41:38 2009 @@ -33,9 +33,9 @@ #include "config.h" -#include "check_nua.h" +#undef NDEBUG -#include "test_s2.h" +#include "check_nua.h" #include <sofia-sip/sip_status.h> #include <sofia-sip/sip_header.h>

1 0

[commit] r12421 - in freeswitch/trunk/libs/sofia-sip: . s2check
by FreeSWITCH SVN 04 Mar '09

04 Mar '09

Author: mikej Date: Wed Mar 4 14:40:06 2009 New Revision: 12421 Log: Wed Mar 4 12:31:26 CST 2009 Pekka Pessi <first.last(a)nokia.com> * s2base: removed s2_setup_logs() Ignore-this: ea4848902b3be9c966b4f7e114f2a5b6 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/s2check/s2base.c freeswitch/trunk/libs/sofia-sip/s2check/s2base.h Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Mar 4 14:40:06 2009 @@ -1 +1 @@ -Wed Mar 4 14:38:54 CST 2009 +Wed Mar 4 14:39:41 CST 2009 Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2base.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/s2base.c (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2base.c Wed Mar 4 14:40:06 2009 @@ -135,26 +135,6 @@ printf("%s - starting %s/%s-%s\n", s2_tester, _s2_suite, _s2_case, title); } -SOFIAPUBVAR su_log_t nua_log[]; -SOFIAPUBVAR su_log_t soa_log[]; -SOFIAPUBVAR su_log_t nea_log[]; -SOFIAPUBVAR su_log_t nta_log[]; -SOFIAPUBVAR su_log_t tport_log[]; -SOFIAPUBVAR su_log_t su_log_default[]; - -void -s2_setup_logs(int level) -{ - assert(s2base); - - su_log_soft_set_level(nua_log, level); - su_log_soft_set_level(soa_log, level); - su_log_soft_set_level(su_log_default, level); - su_log_soft_set_level(nea_log, level); - su_log_soft_set_level(nta_log, level); - su_log_soft_set_level(tport_log, level); -} - void s2_step(void) { su_root_step(s2base->root, 10); Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2base.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/s2base.h (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2base.h Wed Mar 4 14:40:06 2009 @@ -40,8 +40,6 @@ void s2_suite(char const *label); void s2_setup(char const *label); -void s2_setup_logs(int level); - void s2_step(void); void s2_case(char const *tag,

1 0