- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r2979 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Oct '06

05 Oct '06

Author: mikej Date: Thu Oct 5 10:29:54 2006 New Revision: 2979 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: initialize some vars that might not get initialized in some codepaths. 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 Thu Oct 5 10:29:54 2006 @@ -2231,7 +2231,7 @@ if (session) { private_object_t *tech_pvt = NULL; - char *exten; + char *exten = NULL; tech_pvt = switch_core_session_get_private(session); from = sip->sip_from; @@ -2253,7 +2253,7 @@ if ((rep = strchr(refer_to->r_url->url_headers, '='))) { switch_channel_t *channel_a = NULL, *channel_b = NULL; - char *br_a, *br_b; + char *br_a = NULL, *br_b = NULL; char *buf; rep++;

1 0

[commit] r2978 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 05 Oct '06

05 Oct '06

Author: anthm Date: Thu Oct 5 10:24:25 2006 New Revision: 2978 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_ivr.c Log: more sofia stuff Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Thu Oct 5 10:24:25 2006 @@ -242,6 +242,15 @@ */ SWITCH_DECLARE(switch_status_t) switch_ivr_uuid_bridge(char *originator_uuid, char *originatee_uuid); +/*! + \brief Transfer variables from one session to another + \param sessa the original session + \param sessb the new session + \param var the name of the variable to transfer (NULL for all) + \return SWITCH_STATUS_SUCCESS if all is well +*/ +SWITCH_DECLARE(switch_status_t) switch_ivr_transfer_variable(switch_core_session_t *sessa, switch_core_session_t *sessb, char *var); + /** @} */ SWITCH_END_EXTERN_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 Thu Oct 5 10:24:25 2006 @@ -60,8 +60,8 @@ #define MY_EVENT_REGISTER "sofia::register" #define MY_EVENT_EXPIRE "sofia::expire" #define MULTICAST_EVENT "multicast::event" +#define SOFIA_REPLACES_HEADER "_sofia_replaces_" - #include <sofia-sip/nua.h> #include <sofia-sip/sip_status.h> #include <sofia-sip/sdp.h> @@ -110,6 +110,7 @@ PFLAG_AUTH_CALLS = (1 << 0), PFLAG_BLIND_REG = (1 << 1), PFLAG_AUTH_ALL = (1 << 2), + PFLAG_FULL_ID = (1 << 3) } PFLAGS; typedef enum { @@ -792,6 +793,7 @@ tech_pvt->profile->sipip ))) { + char *rep = switch_channel_get_variable(channel, SOFIA_REPLACES_HEADER); tech_choose_port(tech_pvt); set_local_sdp(tech_pvt); @@ -810,6 +812,7 @@ SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE), SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL), + TAG_IF(rep, SIPTAG_REPLACES_STR(rep)), TAG_END()); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); @@ -1594,6 +1597,10 @@ switch_channel_set_variable(channel, "endpoint_disposition", "OUTBOUND"); *new_session = nsession; status = SWITCH_STATUS_SUCCESS; + if (session) { + switch_ivr_transfer_variable(session, nsession, SOFIA_REPLACES_HEADER); + } + done: return status; } @@ -1801,9 +1808,7 @@ sdp_parser_t *parser = sdp_parse(tech_pvt->home, r_sdp, (int)strlen(r_sdp), 0); sdp_session_t *sdp; uint8_t match = 0; - - - + if (tech_pvt->num_codecs) { if ((sdp = sdp_session(parser))) { match = negotiate_sdp(session, sdp); @@ -1814,14 +1819,41 @@ sdp_parser_free(parser); } - if (match) { + nua_handle_t *bnh; + switch_channel_set_variable(channel, "endpoint_disposition", "RECEIVED"); switch_channel_set_state(channel, CS_INIT); switch_set_flag_locked(tech_pvt, TFLAG_READY); switch_core_session_thread_launch(session); + if (sip->sip_replaces && (bnh = nua_handle_by_replaces(nua, sip->sip_replaces))) { + sofia_private_t *b_private; + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Processing Attended Transfer\n"); + while (switch_channel_get_state(channel) < CS_EXECUTE) { + switch_yield(10000); + } + + if ((b_private = nua_handle_fetch(bnh))) { + char *br_b = switch_channel_get_variable(channel, "BRIDGETO"); + char *br_a = switch_core_session_get_uuid(b_private->session); + + if (br_b) { + switch_ivr_uuid_bridge(br_a, br_b); + switch_channel_set_variable(channel, "endpoint_disposition", "ATTENDED_TRANSFER"); + switch_channel_hangup(channel, SWITCH_CAUSE_ATTENDED_TRANSFER); + } else { + switch_channel_set_variable(channel, "endpoint_disposition", "ATTENDED_TRANSFER_ERROR"); + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + } + } else { + switch_channel_set_variable(channel, "endpoint_disposition", "ATTENDED_TRANSFER_ERROR"); + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + } + } return; } + switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); nua_respond(nh, SIP_488_NOT_ACCEPTABLE, TAG_END()); @@ -2200,57 +2232,47 @@ if (session) { private_object_t *tech_pvt = NULL; char *exten; - const char *tmp = NULL; -#ifdef this_was_done - char *dest; - private_object_t *ntech_pvt; - switch_core_session_t *nsession; - switch_channel_t *channel, *nchannel; - switch_caller_profile_t *caller_profile = NULL, *outbound_profile = NULL; -#endif tech_pvt = switch_core_session_get_private(session); from = sip->sip_from; to = sip->sip_to; - tl_gets(tags, - SIPTAG_REFER_TO_STR_REF(tmp), - TAG_END()); - if ((refer_to = sip->sip_refer_to)) { - exten = (char *) refer_to->r_url->url_user; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Process REFER to [%s@%s]\n", - exten, (char *) refer_to->r_url->url_host); + if (profile->pflags & PFLAG_FULL_ID) { + exten = switch_core_db_mprintf("%s@%s", (char *) refer_to->r_url->url_user, (char *) refer_to->r_url->url_host); + } else { + exten = (char *) refer_to->r_url->url_user; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Process REFER to [%s@%s]\n", exten, (char *) refer_to->r_url->url_host); + if (refer_to->r_url->url_headers) { sip_replaces_t *replaces; nua_handle_t *bnh; char *rep; if ((rep = strchr(refer_to->r_url->url_headers, '='))) { + switch_channel_t *channel_a = NULL, *channel_b = NULL; + char *br_a, *br_b; char *buf; rep++; + channel_a = switch_core_session_get_channel(session); + if ((buf = switch_core_session_alloc(session, strlen(rep) + 1))) { rep = url_unescape(buf, (const char *) rep); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Replaces: [%s]\n", rep); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); - return; + goto done; } if ((replaces = sip_replaces_make(tech_pvt->home, rep)) && (bnh = nua_handle_by_replaces(nua, replaces))) { sofia_private_t *b_private; - switch_channel_t *channel_a = NULL, *channel_b = NULL; - - channel_a = switch_core_session_get_channel(session); - + if ((b_private = nua_handle_fetch(bnh))) { - char *br_a, *br_b; - channel_b = switch_core_session_get_channel(b_private->session); br_a = switch_channel_get_variable(channel_a, "BRIDGETO"); - //br_a = switch_core_session_get_uuid(session); br_b = switch_channel_get_variable(channel_b, "BRIDGETO"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Attended Transfer [%s][%s]\n", br_a, br_b); @@ -2271,18 +2293,65 @@ } nua_handle_unref(bnh); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find handle from Replaces!\n"); + } else { /* the other channel is on a different box, we have to go find them */ + if (exten && (br_a = switch_channel_get_variable(channel_a, "BRIDGETO"))) { + switch_core_session_t *bsession; + switch_channel_t *channel = switch_core_session_get_channel(session); + + if ((bsession = switch_core_session_locate(br_a))) { + switch_core_session_t *tsession; + switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; + uint32_t timeout = 60; + char *tuuid_str; + + channel = switch_core_session_get_channel(bsession); + + exten = switch_core_db_mprintf("sofia/%s/%s@%s:%d", + profile->name, + (char *) refer_to->r_url->url_user, + (char *) refer_to->r_url->url_host, + refer_to->r_url->url_port + ); + + switch_channel_set_variable(channel, SOFIA_REPLACES_HEADER, rep); + + if (switch_ivr_originate(bsession, + &tsession, + &cause, + exten, + timeout, + &noop_state_handler, + NULL, + NULL, + NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel! [%s]\n", exten); + goto done; + } + + switch_core_session_rwunlock(bsession); + tuuid_str = switch_core_session_get_uuid(tsession); + switch_ivr_uuid_bridge(br_a, tuuid_str); + switch_channel_set_variable(channel_a, "endpoint_disposition", "ATTENDED_TRANSFER"); + switch_channel_hangup(channel_a, SWITCH_CAUSE_ATTENDED_TRANSFER); + } else { + goto error; + } + + } else { error: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Transfer! [%s]\n", br_a); + switch_channel_set_variable(channel_a, "endpoint_disposition", "ATTENDED_TRANSFER_ERROR"); + switch_channel_hangup(channel_a, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + } } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot parse Replaces!\n"); } - return; + goto done; } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing Refer-To\n"); - return; + goto done; } if (exten) { @@ -2304,38 +2373,11 @@ } } - -#ifdef this_was_done - if (!(nsession = switch_core_session_request(&sofia_endpoint_interface, NULL))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error Creating Session\n"); - goto done; + done: + if (strchr(exten, '@')) { + switch_core_db_free(exten); } - - if (!(ntech_pvt = (struct private_object *) switch_core_session_alloc(nsession, sizeof(*ntech_pvt)))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error Creating Session\n"); - terminate_session(&nsession, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER, __LINE__); - goto done; - } - ntech_pvt->dest = switch_core_session_strdup(nsession, exten); - dest = ntech_pvt->dest + 4; - channel = switch_core_session_get_channel(session); - outbound_profile = switch_channel_get_caller_profile(channel); - nchannel = switch_core_session_get_channel(nsession); - attach_private(nsession, profile, ntech_pvt, dest); - caller_profile = switch_caller_profile_clone(nsession, outbound_profile); - caller_profile->destination_number = switch_core_session_strdup(nsession, dest); - switch_channel_set_caller_profile(nchannel, caller_profile); - switch_channel_set_flag(nchannel, CF_OUTBOUND); - switch_set_flag_locked(ntech_pvt, TFLAG_OUTBOUND); - switch_set_flag_locked(ntech_pvt, TFLAG_REFER); - switch_channel_set_state(nchannel, CS_INIT); - switch_channel_set_variable(channel, "endpoint_disposition", "OUTBOUND_REFER"); - switch_core_session_thread_launch(nsession); -#endif - - //done: - return; } } @@ -2365,7 +2407,7 @@ sip_from_t const *from = sip->sip_from; sip_to_t const *to = sip->sip_to; char *displayname; - char username[256]; + char *username, *to_username; char *url_user = (char *) from->a_url->url_user; if (!(tech_pvt = (private_object_t *) switch_core_session_alloc(session, sizeof(private_object_t)))) { @@ -2396,7 +2438,16 @@ displayname = url_user; } - snprintf(username, sizeof(username), "%s@%s", url_user, (char *) from->a_url->url_host); + if (!(username = switch_core_db_mprintf("%s@%s", url_user, (char *) from->a_url->url_host))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + return; + } + if (!(to_username = switch_core_db_mprintf("%s@%s", (char *) to->a_url->url_user, (char *) to->a_url->url_host))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + switch_core_db_free(username); + return; + } + attach_private(session, profile, tech_pvt, username); channel = switch_core_session_get_channel(session); @@ -2412,9 +2463,14 @@ NULL, NULL, (char *)modname, - profile->context, - (char *) to->a_url->url_user)) != 0) { + (profile->context && !strcasecmp(profile->context, "_domain_")) ? + (char *) from->a_url->url_host : profile->context, + (profile->pflags & PFLAG_FULL_ID) ? + to_username : (char *) to->a_url->url_user + )) != 0) { switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); + switch_core_db_free(username); + switch_core_db_free(to_username); } switch_set_flag_locked(tech_pvt, TFLAG_INBOUND); tech_pvt->sofia_private.session = session; @@ -2752,8 +2808,8 @@ uint32_t ireg_loops = 0; uint32_t oreg_loops = 0; switch_core_db_t *db; + switch_event_t *s_event; - profile->s_root = su_root_create(NULL); profile->nua = nua_create(profile->s_root, /* Event loop */ event_callback, /* Callback for processing events */ @@ -2765,7 +2821,6 @@ NUTAG_EARLY_MEDIA(1), NUTAG_AUTOANSWER(0), NUTAG_AUTOALERT(0), - //NUTAG_AUTOTRYING(0), NUTAG_ALLOW("REGISTER"), NUTAG_ALLOW("REFER"), SIPTAG_SUPPORTED_STR("100rel, precondition"), @@ -2783,7 +2838,6 @@ NUTAG_EARLY_MEDIA(1), NUTAG_AUTOANSWER(0), NUTAG_AUTOALERT(0), - //NUTAG_AUTOTRYING(0), NUTAG_ALLOW("REGISTER"), SIPTAG_SUPPORTED_STR("100rel, precondition"), TAG_END()); @@ -2810,6 +2864,12 @@ ireg_loops = IREG_SECONDS; oreg_loops = OREG_SECONDS; + if (switch_event_create(&s_event, SWITCH_EVENT_PUBLISH) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_sip._udp"); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "port", "%d", profile->sip_port); + switch_event_fire(&s_event); + } + while(globals.running == 1) { if (++ireg_loops >= IREG_SECONDS) { check_expire(profile, time(NULL)); @@ -2825,6 +2885,13 @@ //su_root_run(profile->s_root); } + + if (switch_event_create(&s_event, SWITCH_EVENT_UNPUBLISH) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_sip._udp"); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "port", "%d", profile->sip_port); + switch_event_fire(&s_event); + } + su_root_destroy(profile->s_root); pool = profile->pool; @@ -2943,6 +3010,10 @@ } else if (!strcasecmp(var, "auth-all-packets")) { if (switch_true(val)) { profile->pflags |= PFLAG_AUTH_ALL; + } + } else if (!strcasecmp(var, "full-id-in-dialplan")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_FULL_ID; } } else if (!strcasecmp(var, "ext-sip-ip")) { profile->extsipip = switch_core_strdup(profile->pool, val); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Oct 5 10:24:25 2006 @@ -2253,4 +2253,28 @@ return SWITCH_STATUS_FALSE; } +SWITCH_DECLARE(switch_status_t) switch_ivr_transfer_variable(switch_core_session_t *sessa, switch_core_session_t *sessb, char *var) +{ + switch_channel_t *chana = switch_core_session_get_channel(sessa); + switch_channel_t *chanb = switch_core_session_get_channel(sessb); + char *val = NULL; + if (var) { + if ((val = switch_channel_get_variable(chana, var))) { + switch_channel_set_variable(chanb, var, val); + } + } else { + switch_hash_index_t *hi; + void *vval; + const void *vvar; + + for (hi = switch_channel_variable_first(chana, switch_core_session_get_pool(sessa)); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, &vvar, NULL, &vval); + if (vvar && vval) { + switch_channel_set_variable(chanb, (char *) vvar, (char *) vval); + } + } + } + + return SWITCH_STATUS_SUCCESS; +}

1 0

[commit] r2976 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Oct '06

05 Oct '06

Author: anthm Date: Thu Oct 5 00:25:32 2006 New Revision: 2976 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update 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 Thu Oct 5 00:25:32 2006 @@ -784,13 +784,15 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); assert(tech_pvt != NULL); + caller_profile = switch_channel_get_caller_profile(channel); + if ((tech_pvt->from_str = switch_core_db_mprintf("\"%s\" <sip:%s@%s>", (char *) caller_profile->caller_id_name, (char *) caller_profile->caller_id_number, tech_pvt->profile->sipip ))) { - caller_profile = switch_channel_get_caller_profile(channel); + tech_choose_port(tech_pvt); set_local_sdp(tech_pvt); switch_set_flag_locked(tech_pvt, TFLAG_READY);

1 0

[commit] r2975 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Oct '06

05 Oct '06

Author: anthm Date: Thu Oct 5 00:23:13 2006 New Revision: 2975 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update 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 Thu Oct 5 00:23:13 2006 @@ -3009,7 +3009,6 @@ } if (profile) { if ((registrations = switch_xml_child(xprofile, "registrations"))) { - uint32_t reg_count = 0; for (registration = switch_xml_child(registrations, "registration"); registration; registration = registration->next) { char *name = (char *) switch_xml_attr_soft(registration, "name"); outbound_reg_t *oreg;

1 0

[commit] r2974 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Oct '06

05 Oct '06

Author: anthm Date: Thu Oct 5 00:15:04 2006 New Revision: 2974 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update 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 Thu Oct 5 00:15:04 2006 @@ -3014,10 +3014,6 @@ char *name = (char *) switch_xml_attr_soft(registration, "name"); outbound_reg_t *oreg; - if (++reg_count > 1) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, - "Sorry, only one registration per profile for now =(:::, ask the sofia team for NUTAG_IDENTITY!!!!\n"); - } if (switch_strlen_zero(name)) { name = "anonymous"; }

1 0

[commit] r2973 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Oct '06

05 Oct '06

Author: anthm Date: Thu Oct 5 00:06:07 2006 New Revision: 2973 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: fix callerid even better! 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 Thu Oct 5 00:06:07 2006 @@ -243,6 +243,7 @@ char *callid; char *far_end_contact; char *contact_url; + char *from_str; char *rm_encoding; char *remote_sdp_str; char *local_sdp_str; @@ -776,7 +777,6 @@ private_object_t *tech_pvt; switch_channel_t *channel = NULL; switch_caller_profile_t *caller_profile; - char *from_str; channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -784,40 +784,35 @@ tech_pvt = (private_object_t *) switch_core_session_get_private(session); assert(tech_pvt != NULL); - caller_profile = switch_channel_get_caller_profile(channel); + if ((tech_pvt->from_str = switch_core_db_mprintf("\"%s\" <sip:%s@%s>", + (char *) caller_profile->caller_id_name, + (char *) caller_profile->caller_id_number, + tech_pvt->profile->sipip + ))) { - + caller_profile = switch_channel_get_caller_profile(channel); + tech_choose_port(tech_pvt); + set_local_sdp(tech_pvt); + switch_set_flag_locked(tech_pvt, TFLAG_READY); - tech_choose_port(tech_pvt); - set_local_sdp(tech_pvt); - switch_set_flag_locked(tech_pvt, TFLAG_READY); - - tech_pvt->nh = nua_handle(tech_pvt->profile->nua, NULL, SIPTAG_TO_STR(tech_pvt->dest), TAG_END()); - tech_pvt->sofia_private.session = session; - nua_handle_bind(tech_pvt->nh, &tech_pvt->sofia_private); + tech_pvt->nh = nua_handle(tech_pvt->profile->nua, NULL, + SIPTAG_TO_STR(tech_pvt->dest), + SIPTAG_FROM_STR(tech_pvt->from_str), + SIPTAG_CONTACT_STR(tech_pvt->profile->url), + TAG_END()); - - if ((from_str = switch_core_db_mprintf("\"%s\" <sip:%s@%s>", - (char *) caller_profile->caller_id_name, - (char *) caller_profile->caller_id_number, - tech_pvt->profile->sipip - ))) { - + tech_pvt->sofia_private.session = session; + nua_handle_bind(tech_pvt->nh, &tech_pvt->sofia_private); nua_invite(tech_pvt->nh, - SIPTAG_FROM_STR(from_str), - SIPTAG_CONTACT_STR(tech_pvt->profile->url), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE), SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL), TAG_END()); - - switch_core_db_free(from_str); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); } - } /* @@ -975,6 +970,10 @@ } nua_handle_destroy(tech_pvt->nh); tech_pvt->nh = NULL; + } + + if (tech_pvt->from_str) { + switch_core_db_free(tech_pvt->from_str); } switch_set_flag_locked(tech_pvt, TFLAG_BYE);

1 0

[commit] r2972 - in freeswitch/trunk: libs/win32 libs/win32/sofia src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Oct '06

05 Oct '06

Author: mikej Date: Wed Oct 4 23:11:09 2006 New Revision: 2972 Modified: freeswitch/trunk/libs/win32/Download SOFIA.vcproj freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj Log: update windows sofia build to latest release. Modified: freeswitch/trunk/libs/win32/Download SOFIA.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/Download SOFIA.vcproj (original) +++ freeswitch/trunk/libs/win32/Download SOFIA.vcproj Wed Oct 4 23:11:09 2006 @@ -76,8 +76,8 @@ <Tool Name="VCCustomBuildTool" Description="Downloading SOFIA." - CommandLine="if not exist "$(ProjectDir)..\sofia-sip-1.12.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/sofia-sip-1.12.2.tar.gz "$(ProjectDir).."
" - Outputs="$(ProjectDir)..\sofia-sip-1.12.2" + CommandLine="if not exist "$(ProjectDir)..\sofia-sip-1.12.3" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/sofia-sip-1.12.3.tar.gz "$(ProjectDir).."
" + Outputs="$(ProjectDir)..\sofia-sip-1.12.3" /> </FileConfiguration> <FileConfiguration @@ -86,8 +86,8 @@ <Tool Name="VCCustomBuildTool" Description="Downloading SOFIA." - CommandLine="if not exist "$(ProjectDir)..\sofia-sip-1.12.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/sofia-sip-1.12.2.tar.gz "$(ProjectDir).."
" - Outputs="$(ProjectDir)..\sofia-sip-1.12.2" + CommandLine="if not exist "$(ProjectDir)..\sofia-sip-1.12.3" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://svn.freeswitch.org/downloads/libs/sofia-sip-1.12.3.tar.gz "$(ProjectDir).."
" + Outputs="$(ProjectDir)..\sofia-sip-1.12.3" /> </FileConfiguration> </File> Modified: freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj (original) +++ freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj Wed Oct 4 23:11:09 2006 @@ -26,7 +26,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\sofia-sip-1.12.2\win32\gawk.exe" cscript /nologo "$(ProjectDir)..\util.vbs" Get http://svn.freeswitch.org/downloads/win32/gawk.exe "$(ProjectDir)..\..\sofia-sip-1.12.2\win32\"
cd /D "$(ProjectDir)..\..\sofia-sip-1.12.2\win32\"
"autogen.cmd"
" + CommandLine="if not exist "$(ProjectDir)..\..\sofia-sip-1.12.3\win32\gawk.exe" cscript /nologo "$(ProjectDir)..\util.vbs" Get http://svn.freeswitch.org/downloads/win32/gawk.exe "$(ProjectDir)..\..\sofia-sip-1.12.3\win32\"
cd /D "$(ProjectDir)..\..\sofia-sip-1.12.3\win32\"
"autogen.cmd"
" /> <Tool Name="VCCustomBuildTool" @@ -43,7 +43,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""..\..\sofia-sip-1.12.2\win32";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\su";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\ipt";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\sresolv";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\bnf";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\url";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\nta";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\iptsec";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\http";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\nth";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\nea";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\sdp";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\soa";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\stun";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\tport";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\features";"..\..\pthreads-w32-2-7-0-release";." + AdditionalIncludeDirectories=""..\..\sofia-sip-1.12.3\win32";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\su";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\ipt";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\sresolv";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\bnf";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\url";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\nta";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\iptsec";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\http";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\nth";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\nea";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\sdp";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\soa";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\stun";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\tport";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\features";"..\..\pthreads-w32-2-7-0-release";." PreprocessorDefinitions="WIN32;_DEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -103,7 +103,7 @@ > <Tool Name="VCPreBuildEventTool" - CommandLine="if not exist "$(ProjectDir)..\..\sofia-sip-1.12.2\win32\gawk.exe" cscript /nologo "$(ProjectDir)..\util.vbs" Get http://svn.freeswitch.org/downloads/win32/gawk.exe "$(ProjectDir)..\..\sofia-sip-1.12.2\win32\"
cd /D "$(ProjectDir)..\..\sofia-sip-1.12.2\win32\"
"autogen.cmd"
" + CommandLine="if not exist "$(ProjectDir)..\..\sofia-sip-1.12.3\win32\gawk.exe" cscript /nologo "$(ProjectDir)..\util.vbs" Get http://svn.freeswitch.org/downloads/win32/gawk.exe "$(ProjectDir)..\..\sofia-sip-1.12.3\win32\"
cd /D "$(ProjectDir)..\..\sofia-sip-1.12.3\win32\"
"autogen.cmd"
" /> <Tool Name="VCCustomBuildTool" @@ -121,7 +121,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories=""..\..\sofia-sip-1.12.2\win32";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\su";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\ipt";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\sresolv";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\bnf";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\url";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\nta";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\iptsec";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\http";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\nth";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\nea";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\sdp";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\soa";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\stun";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\tport";"..\..\sofia-sip-1.12.2\libsofia-sip-ua\features";"..\..\pthreads-w32-2-7-0-release";." + AdditionalIncludeDirectories=""..\..\sofia-sip-1.12.3\win32";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\su";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\ipt";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\sresolv";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\bnf";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\url";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\nta";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\iptsec";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\http";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\nth";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\nea";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\sdp";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\soa";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\stun";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\tport";"..\..\sofia-sip-1.12.3\libsofia-sip-ua\features";"..\..\pthreads-w32-2-7-0-release";." PreprocessorDefinitions="WIN32;NDEBUG;_LIB;IN_LIBSOFIA_SIP_UA_STATIC;LIBSOFIA_SIP_UA_STATIC;LIBSRES_STATIC;PTW32_STATIC_LIB" StringPooling="true" RuntimeLibrary="2" @@ -181,7 +181,7 @@ Filter="su*.c" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\inet_ntop.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\inet_ntop.c" > <FileConfiguration Name="Debug|Win32" @@ -203,7 +203,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\inet_pton.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\inet_pton.c" > <FileConfiguration Name="Debug|Win32" @@ -225,7 +225,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su.c" > <FileConfiguration Name="Debug|Win32" @@ -247,7 +247,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_addrinfo.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_addrinfo.c" > <FileConfiguration Name="Debug|Win32" @@ -269,7 +269,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_alloc.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_alloc.c" > <FileConfiguration Name="Debug|Win32" @@ -291,7 +291,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_alloc_lock.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_alloc_lock.c" > <FileConfiguration Name="Debug|Win32" @@ -313,7 +313,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_bm.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_bm.c" > <FileConfiguration Name="Debug|Win32" @@ -335,7 +335,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_default_log.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_default_log.c" > <FileConfiguration Name="Debug|Win32" @@ -357,7 +357,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_errno.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_errno.c" > <FileConfiguration Name="Debug|Win32" @@ -379,7 +379,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_global_log.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_global_log.c" > <FileConfiguration Name="Debug|Win32" @@ -401,7 +401,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_localinfo.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_localinfo.c" > <FileConfiguration Name="Debug|Win32" @@ -423,7 +423,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_log.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_log.c" > <FileConfiguration Name="Debug|Win32" @@ -445,7 +445,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_md5.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_md5.c" > <FileConfiguration Name="Debug|Win32" @@ -467,11 +467,11 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_os_nw.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_os_nw.c" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_port.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_port.c" > <FileConfiguration Name="Debug|Win32" @@ -493,7 +493,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_root.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_root.c" > <FileConfiguration Name="Debug|Win32" @@ -515,7 +515,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_sprintf.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_sprintf.c" > <FileConfiguration Name="Debug|Win32" @@ -537,7 +537,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_strdup.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_strdup.c" > <FileConfiguration Name="Debug|Win32" @@ -559,7 +559,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_strlst.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_strlst.c" > <FileConfiguration Name="Debug|Win32" @@ -581,7 +581,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_tag.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_tag.c" > <FileConfiguration Name="Debug|Win32" @@ -603,7 +603,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_tag_io.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_tag_io.c" > <FileConfiguration Name="Debug|Win32" @@ -625,7 +625,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_taglist.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_taglist.c" > <FileConfiguration Name="Debug|Win32" @@ -647,7 +647,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_time.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_time.c" > <FileConfiguration Name="Debug|Win32" @@ -669,7 +669,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_time0.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_time0.c" > <FileConfiguration Name="Debug|Win32" @@ -691,7 +691,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_timer.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_timer.c" > <FileConfiguration Name="Debug|Win32" @@ -713,7 +713,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_uniqueid.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_uniqueid.c" > <FileConfiguration Name="Debug|Win32" @@ -735,7 +735,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_vector.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_vector.c" > <FileConfiguration Name="Debug|Win32" @@ -757,7 +757,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_wait.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_wait.c" > <FileConfiguration Name="Debug|Win32" @@ -783,7 +783,7 @@ Name="ipt" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\ipt\base64.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\ipt\base64.c" > <FileConfiguration Name="Debug|Win32" @@ -805,7 +805,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\ipt\rc4.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\ipt\rc4.c" > <FileConfiguration Name="Debug|Win32" @@ -827,7 +827,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\ipt\string0.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\ipt\string0.c" > <FileConfiguration Name="Debug|Win32" @@ -849,7 +849,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\ipt\token64.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\ipt\token64.c" > <FileConfiguration Name="Debug|Win32" @@ -876,7 +876,7 @@ Filter="url*.c" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\url\url.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\url\url.c" > <FileConfiguration Name="Debug|Win32" @@ -898,7 +898,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\url\url_tag.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\url\url_tag.c" > <FileConfiguration Name="Debug|Win32" @@ -920,7 +920,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\url\url_tag_ref.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\url\url_tag_ref.c" > <FileConfiguration Name="Debug|Win32" @@ -947,7 +947,7 @@ Filter="features*.c" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\features\features.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\features\features.c" > <FileConfiguration Name="Debug|Win32" @@ -974,7 +974,7 @@ Filter="bnf*.c" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\bnf\bnf.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\bnf\bnf.c" > <FileConfiguration Name="Debug|Win32" @@ -1001,7 +1001,7 @@ Filter="msg*.c" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\msg.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\msg.c" > <FileConfiguration Name="Debug|Win32" @@ -1023,7 +1023,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\msg_auth.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\msg_auth.c" > <FileConfiguration Name="Debug|Win32" @@ -1045,7 +1045,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\msg_basic.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\msg_basic.c" > <FileConfiguration Name="Debug|Win32" @@ -1067,7 +1067,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\msg_date.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\msg_date.c" > <FileConfiguration Name="Debug|Win32" @@ -1089,7 +1089,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\msg_generic.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\msg_generic.c" > <FileConfiguration Name="Debug|Win32" @@ -1111,7 +1111,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\msg_header_copy.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\msg_header_copy.c" > <FileConfiguration Name="Debug|Win32" @@ -1133,7 +1133,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\msg_header_make.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\msg_header_make.c" > <FileConfiguration Name="Debug|Win32" @@ -1155,7 +1155,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\msg_mclass.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\msg_mclass.c" > <FileConfiguration Name="Debug|Win32" @@ -1177,7 +1177,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\msg_mime.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\msg_mime.c" > <FileConfiguration Name="Debug|Win32" @@ -1199,7 +1199,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\msg_mime_table.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\msg_mime_table.c" > <FileConfiguration Name="Debug|Win32" @@ -1221,7 +1221,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\msg_parser.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\msg_parser.c" > <FileConfiguration Name="Debug|Win32" @@ -1243,7 +1243,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\msg_parser_util.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\msg_parser_util.c" > <FileConfiguration Name="Debug|Win32" @@ -1265,7 +1265,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\msg_tag.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\msg_tag.c" > <FileConfiguration Name="Debug|Win32" @@ -1291,7 +1291,7 @@ Name="clib replacement" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\memcspn.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\memcspn.c" > <FileConfiguration Name="Debug|Win32" @@ -1313,7 +1313,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\memmem.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\memmem.c" > <FileConfiguration Name="Debug|Win32" @@ -1335,7 +1335,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\memspn.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\memspn.c" > <FileConfiguration Name="Debug|Win32" @@ -1357,7 +1357,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\strcasestr.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\strcasestr.c" > <FileConfiguration Name="Debug|Win32" @@ -1379,7 +1379,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\strtoull.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\strtoull.c" > <FileConfiguration Name="Debug|Win32" @@ -1405,7 +1405,7 @@ Name="sip" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_basic.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_basic.c" > <FileConfiguration Name="Debug|Win32" @@ -1427,7 +1427,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_caller_prefs.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_caller_prefs.c" > <FileConfiguration Name="Debug|Win32" @@ -1449,7 +1449,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_event.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_event.c" > <FileConfiguration Name="Debug|Win32" @@ -1471,7 +1471,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_extra.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_extra.c" > <FileConfiguration Name="Debug|Win32" @@ -1493,7 +1493,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_feature.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_feature.c" > <FileConfiguration Name="Debug|Win32" @@ -1515,7 +1515,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_header.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_header.c" > <FileConfiguration Name="Debug|Win32" @@ -1537,7 +1537,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_mime.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_mime.c" > <FileConfiguration Name="Debug|Win32" @@ -1559,7 +1559,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_parser.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_parser.c" > <FileConfiguration Name="Debug|Win32" @@ -1581,7 +1581,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_parser_table.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_parser_table.c" > <FileConfiguration Name="Debug|Win32" @@ -1603,7 +1603,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_prack.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_prack.c" > <FileConfiguration Name="Debug|Win32" @@ -1625,7 +1625,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_pref_util.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_pref_util.c" > <FileConfiguration Name="Debug|Win32" @@ -1647,7 +1647,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_reason.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_reason.c" > <FileConfiguration Name="Debug|Win32" @@ -1669,7 +1669,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_refer.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_refer.c" > <FileConfiguration Name="Debug|Win32" @@ -1691,7 +1691,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_security.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_security.c" > <FileConfiguration Name="Debug|Win32" @@ -1713,7 +1713,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_session.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_session.c" > <FileConfiguration Name="Debug|Win32" @@ -1735,7 +1735,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_status.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_status.c" > <FileConfiguration Name="Debug|Win32" @@ -1757,7 +1757,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_tag.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_tag.c" > <FileConfiguration Name="Debug|Win32" @@ -1779,7 +1779,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_tag_class.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_tag_class.c" > <FileConfiguration Name="Debug|Win32" @@ -1801,7 +1801,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_tag_ref.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_tag_ref.c" > <FileConfiguration Name="Debug|Win32" @@ -1823,7 +1823,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_time.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_time.c" > <FileConfiguration Name="Debug|Win32" @@ -1845,7 +1845,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_util.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_util.c" > <FileConfiguration Name="Debug|Win32" @@ -1871,7 +1871,7 @@ Name="http" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\http\http_basic.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\http\http_basic.c" > <FileConfiguration Name="Debug|Win32" @@ -1893,7 +1893,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\http\http_extra.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\http\http_extra.c" > <FileConfiguration Name="Debug|Win32" @@ -1915,7 +1915,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\http\http_header.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\http\http_header.c" > <FileConfiguration Name="Debug|Win32" @@ -1937,7 +1937,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\http\http_parser.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\http\http_parser.c" > <FileConfiguration Name="Debug|Win32" @@ -1959,7 +1959,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\http\http_parser_table.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\http\http_parser_table.c" > <FileConfiguration Name="Debug|Win32" @@ -1981,7 +1981,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\http\http_status.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\http\http_status.c" > <FileConfiguration Name="Debug|Win32" @@ -2003,7 +2003,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\http\http_tag.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\http\http_tag.c" > <FileConfiguration Name="Debug|Win32" @@ -2025,7 +2025,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\http\http_tag_class.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\http\http_tag_class.c" > <FileConfiguration Name="Debug|Win32" @@ -2047,7 +2047,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\http\http_tag_ref.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\http\http_tag_ref.c" > <FileConfiguration Name="Debug|Win32" @@ -2073,7 +2073,7 @@ Name="nth" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nth\nth_client.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nth\nth_client.c" > <FileConfiguration Name="Debug|Win32" @@ -2095,7 +2095,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nth\nth_server.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nth\nth_server.c" > <FileConfiguration Name="Debug|Win32" @@ -2117,7 +2117,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nth\nth_tag.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nth\nth_tag.c" > <FileConfiguration Name="Debug|Win32" @@ -2139,7 +2139,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nth\nth_tag_ref.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nth\nth_tag_ref.c" > <FileConfiguration Name="Debug|Win32" @@ -2165,7 +2165,7 @@ Name="sresolv" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sresolv\sres.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sresolv\sres.c" > <FileConfiguration Name="Debug|Win32" @@ -2187,7 +2187,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sresolv\sres_blocking.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sresolv\sres_blocking.c" > <FileConfiguration Name="Debug|Win32" @@ -2209,7 +2209,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sresolv\sres_cache.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sresolv\sres_cache.c" > <FileConfiguration Name="Debug|Win32" @@ -2231,7 +2231,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sresolv\sresolv.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sresolv\sresolv.c" > <FileConfiguration Name="Debug|Win32" @@ -2257,7 +2257,7 @@ Name="nea" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nea\nea.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nea\nea.c" > <FileConfiguration Name="Debug|Win32" @@ -2279,7 +2279,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nea\nea_debug.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nea\nea_debug.c" > <FileConfiguration Name="Debug|Win32" @@ -2301,7 +2301,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nea\nea_event.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nea\nea_event.c" > <FileConfiguration Name="Debug|Win32" @@ -2323,7 +2323,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nea\nea_server.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nea\nea_server.c" > <FileConfiguration Name="Debug|Win32" @@ -2345,7 +2345,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nea\nea_tag.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nea\nea_tag.c" > <FileConfiguration Name="Debug|Win32" @@ -2367,7 +2367,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nea\nea_tag_ref.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nea\nea_tag_ref.c" > <FileConfiguration Name="Debug|Win32" @@ -2393,7 +2393,7 @@ Name="iptsec" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\iptsec\auth_client.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\iptsec\auth_client.c" > <FileConfiguration Name="Debug|Win32" @@ -2415,7 +2415,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\iptsec\auth_common.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\iptsec\auth_common.c" > <FileConfiguration Name="Debug|Win32" @@ -2437,7 +2437,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\iptsec\auth_digest.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\iptsec\auth_digest.c" > <FileConfiguration Name="Debug|Win32" @@ -2459,7 +2459,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\iptsec\auth_module.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\iptsec\auth_module.c" > <FileConfiguration Name="Debug|Win32" @@ -2481,7 +2481,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\iptsec\auth_module_http.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\iptsec\auth_module_http.c" > <FileConfiguration Name="Debug|Win32" @@ -2503,7 +2503,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\iptsec\auth_module_sip.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\iptsec\auth_module_sip.c" > <FileConfiguration Name="Debug|Win32" @@ -2525,7 +2525,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\iptsec\auth_plugin.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\iptsec\auth_plugin.c" > <FileConfiguration Name="Debug|Win32" @@ -2547,7 +2547,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\iptsec\auth_plugin_delayed.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\iptsec\auth_plugin_delayed.c" > <FileConfiguration Name="Debug|Win32" @@ -2569,7 +2569,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\iptsec\auth_tag.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\iptsec\auth_tag.c" > <FileConfiguration Name="Debug|Win32" @@ -2591,7 +2591,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\iptsec\auth_tag_ref.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\iptsec\auth_tag_ref.c" > <FileConfiguration Name="Debug|Win32" @@ -2613,7 +2613,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\iptsec\iptsec_debug.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\iptsec\iptsec_debug.c" > <FileConfiguration Name="Debug|Win32" @@ -2639,7 +2639,7 @@ Name="stun" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\stun\stun.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\stun\stun.c" > <FileConfiguration Name="Debug|Win32" @@ -2661,7 +2661,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\stun\stun_common.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\stun\stun_common.c" > <FileConfiguration Name="Debug|Win32" @@ -2683,7 +2683,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\stun\stun_dns.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\stun\stun_dns.c" > <FileConfiguration Name="Debug|Win32" @@ -2705,11 +2705,11 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\stun\stun_internal.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\stun\stun_internal.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\stun\stun_mini.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\stun\stun_mini.c" > <FileConfiguration Name="Debug|Win32" @@ -2731,7 +2731,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\stun\stun_tag.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\stun\stun_tag.c" > <FileConfiguration Name="Debug|Win32" @@ -2753,7 +2753,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\stun\stun_tag_ref.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\stun\stun_tag_ref.c" > <FileConfiguration Name="Debug|Win32" @@ -2779,7 +2779,7 @@ Name="nua" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\nua.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\nua.c" > <FileConfiguration Name="Debug|Win32" @@ -2801,7 +2801,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\nua_common.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\nua_common.c" > <FileConfiguration Name="Debug|Win32" @@ -2823,7 +2823,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\nua_dialog.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\nua_dialog.c" > <FileConfiguration Name="Debug|Win32" @@ -2845,11 +2845,11 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\nua_dialog.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\nua_dialog.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\nua_event_server.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\nua_event_server.c" > <FileConfiguration Name="Debug|Win32" @@ -2871,7 +2871,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\nua_message.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\nua_message.c" > <FileConfiguration Name="Debug|Win32" @@ -2893,11 +2893,11 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\nua_notifier.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\nua_notifier.c" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\nua_options.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\nua_options.c" > <FileConfiguration Name="Debug|Win32" @@ -2919,7 +2919,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\nua_params.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\nua_params.c" > <FileConfiguration Name="Debug|Win32" @@ -2941,11 +2941,11 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\nua_params.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\nua_params.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\nua_publish.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\nua_publish.c" > <FileConfiguration Name="Debug|Win32" @@ -2967,7 +2967,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\nua_register.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\nua_register.c" > <FileConfiguration Name="Debug|Win32" @@ -2989,8 +2989,12 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\nua_session.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\nua_registrar.c" > + </File> + <File + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\nua_session.c" + > <FileConfiguration Name="Debug|Win32" > @@ -3011,7 +3015,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\nua_stack.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\nua_stack.c" > <FileConfiguration Name="Debug|Win32" @@ -3033,11 +3037,11 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\nua_stack.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\nua_stack.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\nua_subnotref.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\nua_subnotref.c" > <FileConfiguration Name="Debug|Win32" @@ -3059,7 +3063,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\nua_tag.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\nua_tag.c" > <FileConfiguration Name="Debug|Win32" @@ -3081,7 +3085,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\nua_tag_ref.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\nua_tag_ref.c" > <FileConfiguration Name="Debug|Win32" @@ -3103,7 +3107,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\outbound.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\outbound.c" > </File> </Filter> @@ -3111,7 +3115,7 @@ Name="nta" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nta\nta.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nta\nta.c" > <FileConfiguration Name="Debug|Win32" @@ -3133,7 +3137,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nta\nta_check.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nta\nta_check.c" > <FileConfiguration Name="Debug|Win32" @@ -3155,7 +3159,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nta\nta_tag.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nta\nta_tag.c" > <FileConfiguration Name="Debug|Win32" @@ -3177,7 +3181,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nta\nta_tag_ref.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nta\nta_tag_ref.c" > <FileConfiguration Name="Debug|Win32" @@ -3199,7 +3203,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nta\sl_read_payload.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nta\sl_read_payload.c" > <FileConfiguration Name="Debug|Win32" @@ -3221,7 +3225,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nta\sl_utils_log.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nta\sl_utils_log.c" > <FileConfiguration Name="Debug|Win32" @@ -3243,7 +3247,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nta\sl_utils_print.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nta\sl_utils_print.c" > <FileConfiguration Name="Debug|Win32" @@ -3269,7 +3273,7 @@ Name="tport" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\tport\tport.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\tport\tport.c" > <FileConfiguration Name="Debug|Win32" @@ -3291,11 +3295,11 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\tport\tport_internal.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\tport\tport_internal.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\tport\tport_logging.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\tport\tport_logging.c" > <FileConfiguration Name="Debug|Win32" @@ -3317,7 +3321,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\tport\tport_stub_sigcomp.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\tport\tport_stub_sigcomp.c" > <FileConfiguration Name="Debug|Win32" @@ -3339,7 +3343,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\tport\tport_stub_stun.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\tport\tport_stub_stun.c" > <FileConfiguration Name="Debug|Win32" @@ -3361,7 +3365,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\tport\tport_tag.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\tport\tport_tag.c" > <FileConfiguration Name="Debug|Win32" @@ -3383,7 +3387,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\tport\tport_tag_ref.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\tport\tport_tag_ref.c" > <FileConfiguration Name="Debug|Win32" @@ -3405,7 +3409,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\tport\tport_type_connect.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\tport\tport_type_connect.c" > <FileConfiguration Name="Debug|Win32" @@ -3427,7 +3431,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\tport\tport_type_tcp.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\tport\tport_type_tcp.c" > <FileConfiguration Name="Debug|Win32" @@ -3449,7 +3453,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\tport\tport_type_udp.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\tport\tport_type_udp.c" > <FileConfiguration Name="Debug|Win32" @@ -3475,7 +3479,7 @@ Name="sdp" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sdp\sdp.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sdp\sdp.c" > <FileConfiguration Name="Debug|Win32" @@ -3497,7 +3501,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sdp\sdp_parse.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sdp\sdp_parse.c" > <FileConfiguration Name="Debug|Win32" @@ -3519,7 +3523,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sdp\sdp_print.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sdp\sdp_print.c" > <FileConfiguration Name="Debug|Win32" @@ -3541,7 +3545,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sdp\sdp_tag.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sdp\sdp_tag.c" > <FileConfiguration Name="Debug|Win32" @@ -3563,7 +3567,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sdp\sdp_tag_ref.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sdp\sdp_tag_ref.c" > <FileConfiguration Name="Debug|Win32" @@ -3589,7 +3593,7 @@ Name="soa" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\soa\soa.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\soa\soa.c" > <FileConfiguration Name="Debug|Win32" @@ -3611,11 +3615,11 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\soa\sofia-sip-1.12.2\soa_session.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\soa\sofia-sip-1.12.3\soa_session.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\soa\soa_static.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\soa\soa_static.c" > <FileConfiguration Name="Debug|Win32" @@ -3637,7 +3641,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\soa\soa_tag.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\soa\soa_tag.c" > <FileConfiguration Name="Debug|Win32" @@ -3659,7 +3663,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\soa\soa_tag_ref.c" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\soa\soa_tag_ref.c" > <FileConfiguration Name="Debug|Win32" @@ -3691,123 +3695,123 @@ Filter="su*.h" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\htable.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\htable.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\htable2.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\htable2.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\rbtree.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\rbtree.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_addrinfo.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_addrinfo.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_alloc.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_alloc.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_alloc_stat.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_alloc_stat.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_bm.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_bm.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_config.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_config.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_debug.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_debug.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_errno.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_errno.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_localinfo.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_localinfo.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_log.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_log.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_md5.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_md5.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_module_debug.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_module_debug.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_os_nw.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_os_nw.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\su_port.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\su_port.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_source.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_source.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_strlst.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_strlst.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_tag.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_tag.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_tag_class.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_tag_class.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_tag_inline.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_tag_inline.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_tag_io.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_tag_io.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_tagarg.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_tagarg.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_time.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_time.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_types.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_types.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_uniqueid.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_uniqueid.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_vector.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_vector.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\su_wait.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\su_wait.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\su\sofia-sip-1.12.2\tstdef.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\su\sofia-sip-1.12.3\tstdef.h" > </File> </Filter> @@ -3819,7 +3823,7 @@ > </File> <File - RelativePath="..\sofia-sip-1.12.2\su_configure.h" + RelativePath="..\sofia-sip-1.12.3\su_configure.h" > </File> <File @@ -3831,19 +3835,19 @@ Name="ipt headers" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\ipt\sofia-sip-1.12.2\base64.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\ipt\sofia-sip-1.12.3\base64.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\ipt\sofia-sip-1.12.2\rc4.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\ipt\sofia-sip-1.12.3\rc4.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\ipt\sofia-sip-1.12.2\string0.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\ipt\sofia-sip-1.12.3\string0.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\ipt\sofia-sip-1.12.2\token64.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\ipt\sofia-sip-1.12.3\token64.h" > </File> </Filter> @@ -3852,15 +3856,15 @@ Filter="url*.h" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\url\sofia-sip-1.12.2\url.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\url\sofia-sip-1.12.3\url.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\url\sofia-sip-1.12.2\url_tag.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\url\sofia-sip-1.12.3\url_tag.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\url\sofia-sip-1.12.2\url_tag_class.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\url\sofia-sip-1.12.3\url_tag_class.h" > </File> </Filter> @@ -3869,7 +3873,7 @@ Filter="features*.h" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\features\sofia-sip-1.12.2\sofia_features.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\features\sofia-sip-1.12.3\sofia_features.h" > </File> </Filter> @@ -3878,11 +3882,11 @@ Filter="bnf*.h" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\bnf\sofia-sip-1.12.2\bnf.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\bnf\sofia-sip-1.12.3\bnf.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\bnf\sofia-sip-1.12.2\hostdomain.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\bnf\sofia-sip-1.12.3\hostdomain.h" > </File> </Filter> @@ -3890,63 +3894,63 @@ Name="msg headers" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\sofia-sip-1.12.2\msg.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\sofia-sip-1.12.3\msg.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\sofia-sip-1.12.2\msg_addr.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\sofia-sip-1.12.3\msg_addr.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\msg_bnf.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\msg_bnf.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\sofia-sip-1.12.2\msg_buffer.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\sofia-sip-1.12.3\msg_buffer.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\sofia-sip-1.12.2\msg_date.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\sofia-sip-1.12.3\msg_date.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\sofia-sip-1.12.2\msg_header.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\sofia-sip-1.12.3\msg_header.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\msg_internal.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\msg_internal.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\sofia-sip-1.12.2\msg_mclass.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\sofia-sip-1.12.3\msg_mclass.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\sofia-sip-1.12.2\msg_mclass_hash.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\sofia-sip-1.12.3\msg_mclass_hash.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\sofia-sip-1.12.2\msg_mime.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\sofia-sip-1.12.3\msg_mime.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\sofia-sip-1.12.2\msg_mime_protos.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\sofia-sip-1.12.3\msg_mime_protos.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\sofia-sip-1.12.2\msg_parser.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\sofia-sip-1.12.3\msg_parser.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\sofia-sip-1.12.2\msg_protos.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\sofia-sip-1.12.3\msg_protos.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\sofia-sip-1.12.2\msg_tag_class.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\sofia-sip-1.12.3\msg_tag_class.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\msg\sofia-sip-1.12.2\msg_types.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\msg\sofia-sip-1.12.3\msg_types.h" > </File> </Filter> @@ -3954,47 +3958,47 @@ Name="sip headers" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sofia-sip-1.12.2\sip.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sofia-sip-1.12.3\sip.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_extensions.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_extensions.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sofia-sip-1.12.2\sip_hclasses.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sofia-sip-1.12.3\sip_hclasses.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sofia-sip-1.12.2\sip_header.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sofia-sip-1.12.3\sip_header.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sip_internal.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sip_internal.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sofia-sip-1.12.2\sip_parser.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sofia-sip-1.12.3\sip_parser.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sofia-sip-1.12.2\sip_protos.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sofia-sip-1.12.3\sip_protos.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sofia-sip-1.12.2\sip_status.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sofia-sip-1.12.3\sip_status.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sofia-sip-1.12.2\sip_tag.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sofia-sip-1.12.3\sip_tag.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sofia-sip-1.12.2\sip_tag_class.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sofia-sip-1.12.3\sip_tag_class.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sip\sofia-sip-1.12.2\sip_util.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sip\sofia-sip-1.12.3\sip_util.h" > </File> </Filter> @@ -4002,35 +4006,35 @@ Name="http headers" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\http\sofia-sip-1.12.2\http.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\http\sofia-sip-1.12.3\http.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\http\sofia-sip-1.12.2\http_hclasses.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\http\sofia-sip-1.12.3\http_hclasses.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\http\sofia-sip-1.12.2\http_header.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\http\sofia-sip-1.12.3\http_header.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\http\sofia-sip-1.12.2\http_parser.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\http\sofia-sip-1.12.3\http_parser.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\http\sofia-sip-1.12.2\http_protos.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\http\sofia-sip-1.12.3\http_protos.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\http\sofia-sip-1.12.2\http_status.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\http\sofia-sip-1.12.3\http_status.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\http\sofia-sip-1.12.2\http_tag.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\http\sofia-sip-1.12.3\http_tag.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\http\sofia-sip-1.12.2\http_tag_class.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\http\sofia-sip-1.12.3\http_tag_class.h" > </File> </Filter> @@ -4038,11 +4042,11 @@ Name="nth headers" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nth\sofia-sip-1.12.2\nth.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nth\sofia-sip-1.12.3\nth.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nth\sofia-sip-1.12.2\nth_tag.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nth\sofia-sip-1.12.3\nth_tag.h" > </File> </Filter> @@ -4050,23 +4054,23 @@ Name="sresolv headers" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sresolv\sofia-resolv\sres.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sresolv\sofia-resolv\sres.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sresolv\sofia-resolv\sres_async.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sresolv\sofia-resolv\sres_async.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sresolv\sofia-resolv\sres_cache.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sresolv\sofia-resolv\sres_cache.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sresolv\sofia-resolv\sres_record.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sresolv\sofia-resolv\sres_record.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sresolv\sofia-sip-1.12.2\sresolv.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sresolv\sofia-sip-1.12.3\sresolv.h" > </File> </Filter> @@ -4074,15 +4078,15 @@ Name="nea headers" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nea\sofia-sip-1.12.2\nea.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nea\sofia-sip-1.12.3\nea.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nea\nea_debug.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nea\nea_debug.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nea\sofia-sip-1.12.2\nea_tag.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nea\sofia-sip-1.12.3\nea_tag.h" > </File> </Filter> @@ -4090,27 +4094,27 @@ Name="iptsec headers" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\iptsec\sofia-sip-1.12.2\auth_client.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\iptsec\sofia-sip-1.12.3\auth_client.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\iptsec\sofia-sip-1.12.2\auth_digest.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\iptsec\sofia-sip-1.12.3\auth_digest.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\iptsec\sofia-sip-1.12.2\auth_module.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\iptsec\sofia-sip-1.12.3\auth_module.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\iptsec\sofia-sip-1.12.2\auth_ntlm.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\iptsec\sofia-sip-1.12.3\auth_ntlm.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\iptsec\sofia-sip-1.12.2\auth_plugin.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\iptsec\sofia-sip-1.12.3\auth_plugin.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\iptsec\iptsec_debug.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\iptsec\iptsec_debug.h" > </File> </Filter> @@ -4118,15 +4122,15 @@ Name="stun headers" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\stun\sofia-sip-1.12.2\stun.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\stun\sofia-sip-1.12.3\stun.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\stun\sofia-sip-1.12.2\stun_common.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\stun\sofia-sip-1.12.3\stun_common.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\stun\sofia-sip-1.12.2\stun_tag.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\stun\sofia-sip-1.12.3\stun_tag.h" > </File> </Filter> @@ -4134,11 +4138,11 @@ Name="nua headers" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\sofia-sip-1.12.2\nua.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\sofia-sip-1.12.3\nua.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nua\sofia-sip-1.12.2\nua_tag.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nua\sofia-sip-1.12.3\nua_tag.h" > </File> </Filter> @@ -4146,27 +4150,27 @@ Name="nta headers" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nta\sofia-sip-1.12.2\nta.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nta\sofia-sip-1.12.3\nta.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nta\nta_internal.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nta\nta_internal.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nta\sofia-sip-1.12.2\nta_stateless.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nta\sofia-sip-1.12.3\nta_stateless.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nta\sofia-sip-1.12.2\nta_tag.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nta\sofia-sip-1.12.3\nta_tag.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nta\sofia-sip-1.12.2\nta_tport.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nta\sofia-sip-1.12.3\nta_tport.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\nta\sofia-sip-1.12.2\sl_utils.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\nta\sofia-sip-1.12.3\sl_utils.h" > </File> </Filter> @@ -4174,19 +4178,19 @@ Name="tport headers" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\tport\sofia-sip-1.12.2\tport.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\tport\sofia-sip-1.12.3\tport.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\tport\sofia-sip-1.12.2\tport_plugins.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\tport\sofia-sip-1.12.3\tport_plugins.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\tport\sofia-sip-1.12.2\tport_tag.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\tport\sofia-sip-1.12.3\tport_tag.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\tport\tport_tls.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\tport\tport_tls.h" > </File> </Filter> @@ -4194,11 +4198,11 @@ Name="sdp headers" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sdp\sofia-sip-1.12.2\sdp.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sdp\sofia-sip-1.12.3\sdp.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\sdp\sofia-sip-1.12.2\sdp_tag.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\sdp\sofia-sip-1.12.3\sdp_tag.h" > </File> </Filter> @@ -4206,15 +4210,15 @@ Name="soa headers" > <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\soa\sofia-sip-1.12.2\soa.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\soa\sofia-sip-1.12.3\soa.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\soa\sofia-sip-1.12.2\soa_add.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\soa\sofia-sip-1.12.3\soa_add.h" > </File> <File - RelativePath="..\..\sofia-sip-1.12.2\libsofia-sip-ua\soa\sofia-sip-1.12.2\soa_tag.h" + RelativePath="..\..\sofia-sip-1.12.3\libsofia-sip-ua\soa\sofia-sip-1.12.3\soa_tag.h" > </File> </Filter> 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 Oct 4 23:11:09 2006 @@ -371,8 +371,8 @@ char *nonce, *uri, *qop, *cnonce, *nc, *response, *input = NULL, *input2 = NULL; auth_res_t ret = AUTH_OK; char *npassword = NULL; - nonce = uri = qop = cnonce = nc = response = NULL; int cnt = 0; + nonce = uri = qop = cnonce = nc = response = NULL; if (authorization->au_params) { for(index = 0; (cur=(char*)authorization->au_params[index]); index++) { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.vcproj Wed Oct 4 23:11:09 2006 @@ -42,7 +42,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\win32";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\soa";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\iptsec";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\bnf"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\win32";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\soa";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\iptsec";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\bnf"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -126,7 +126,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\win32";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\soa";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\iptsec";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.2\libsofia-sip-ua\bnf"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\su";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\nua";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\win32";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\url";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\sip";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\msg";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\sdp";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\nta";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\nea";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\soa";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\iptsec";"$(InputDir)..\..\..\..\libs\sofia-sip-1.12.3\libsofia-sip-ua\bnf"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;LIBSOFIA_SIP_UA_STATIC;PTW32_STATIC_LIB" RuntimeLibrary="2" UsePrecompiledHeader="0"

1 0

[commit] r2970 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Oct '06

05 Oct '06

Author: anthm Date: Wed Oct 4 20:38:45 2006 New Revision: 2970 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: fix callerid 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 Oct 4 20:38:45 2006 @@ -247,7 +247,6 @@ char *remote_sdp_str; char *local_sdp_str; char *dest; - char *source; char *key; unsigned long rm_rate; switch_payload_t pt; @@ -776,14 +775,19 @@ { private_object_t *tech_pvt; switch_channel_t *channel = NULL; + switch_caller_profile_t *caller_profile; + char *from_str; - channel = switch_core_session_get_channel(session); assert(channel != NULL); tech_pvt = (private_object_t *) switch_core_session_get_private(session); assert(tech_pvt != NULL); + caller_profile = switch_channel_get_caller_profile(channel); + + + tech_choose_port(tech_pvt); set_local_sdp(tech_pvt); switch_set_flag_locked(tech_pvt, TFLAG_READY); @@ -791,15 +795,29 @@ tech_pvt->nh = nua_handle(tech_pvt->profile->nua, NULL, SIPTAG_TO_STR(tech_pvt->dest), TAG_END()); tech_pvt->sofia_private.session = session; nua_handle_bind(tech_pvt->nh, &tech_pvt->sofia_private); - nua_invite(tech_pvt->nh, - SIPTAG_FROM_STR(tech_pvt->source), - SIPTAG_CONTACT_STR(tech_pvt->profile->url), - SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), - SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE), - SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL), - TAG_END()); + + if ((from_str = switch_core_db_mprintf("\"%s\" <sip:%s@%s>", + (char *) caller_profile->caller_id_name, + (char *) caller_profile->caller_id_number, + tech_pvt->profile->sipip + ))) { + + + nua_invite(tech_pvt->nh, + SIPTAG_FROM_STR(from_str), + SIPTAG_CONTACT_STR(tech_pvt->profile->url), + SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), + SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE), + SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL), + TAG_END()); + switch_core_db_free(from_str); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); + } + + } /* @@ -1163,7 +1181,6 @@ if (tech_pvt->nh) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Local SDP:\n%s\n", tech_pvt->local_sdp_str); nua_respond(tech_pvt->nh, SIP_200_OK, - //SIPTAG_CONTACT(tech_pvt->contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), TAG_END()); @@ -1458,7 +1475,6 @@ activate_rtp(tech_pvt); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "183 SDP:\n%s\n", tech_pvt->local_sdp_str); nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, - //SIPTAG_CONTACT(tech_pvt->contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), TAG_END()); @@ -1521,7 +1537,6 @@ private_object_t *tech_pvt = NULL; switch_channel_t *channel; char *host; - char username[512]; *new_session = NULL; @@ -1568,8 +1583,6 @@ snprintf(tech_pvt->dest, strlen(dest) + 5, "sip:%s", dest); } - snprintf(username, sizeof(username), "sip:%s@%s:%d", (char *) outbound_profile->caller_id_number, profile->sipip, profile->sip_port); - tech_pvt->source = switch_core_session_strdup(nsession, username); channel = switch_core_session_get_channel(nsession); attach_private(nsession, profile, tech_pvt, dest); caller_profile = switch_caller_profile_clone(nsession, outbound_profile); @@ -1773,7 +1786,6 @@ } switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); nua_respond(nh, SIP_488_NOT_ACCEPTABLE, - //SIPTAG_CONTACT(tech_pvt->contact), TAG_END()); } } @@ -1811,7 +1823,6 @@ } switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); nua_respond(nh, SIP_488_NOT_ACCEPTABLE, - //SIPTAG_CONTACT(tech_pvt->contact), TAG_END()); } } @@ -1870,7 +1881,6 @@ switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); nua_respond(nh, SIP_488_NOT_ACCEPTABLE, - //SIPTAG_CONTACT(tech_pvt->contact), TAG_END()); } else if (switch_test_flag(tech_pvt, TFLAG_EARLY_MEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_ANS); @@ -2388,9 +2398,6 @@ snprintf(username, sizeof(username), "%s@%s", url_user, (char *) from->a_url->url_host); attach_private(session, profile, tech_pvt, username); - snprintf(username, sizeof(username), "sip:%s@%s", (char *) from->a_url->url_user, (char *) from->a_url->url_host); - tech_pvt->contact = sip_contact_create(tech_pvt->home, URL_STRING_MAKE(username), NULL); - channel = switch_core_session_get_channel(session); switch_channel_set_variable(channel, "endpoint_disposition", "INBOUND CALL"); @@ -2998,7 +3005,7 @@ profile->sipdomain = switch_core_strdup(profile->pool, profile->sipip); } - snprintf(url, sizeof(url), "sip:%s:%d", profile->sipip, profile->sip_port); + snprintf(url, sizeof(url), "sip:%s@%s:%d", profile->name, profile->sipip, profile->sip_port); profile->url = switch_core_strdup(profile->pool, url); } if (profile) {

1 0

[commit] r2969 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 04 Oct '06

04 Oct '06

Author: anthm Date: Wed Oct 4 19:11:11 2006 New Revision: 2969 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr.c Log: sip work in progress changes Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Oct 4 19:11:11 2006 @@ -693,7 +693,9 @@ SWITCH_CAUSE_CRASH = 500, SWITCH_CAUSE_SYSTEM_SHUTDOWN = 501, SWITCH_CAUSE_LOSE_RACE = 502, - SWITCH_CAUSE_MANAGER_REQUEST = 503 + SWITCH_CAUSE_MANAGER_REQUEST = 503, + SWITCH_CAUSE_BLIND_TRANSFER = 600, + SWITCH_CAUSE_ATTENDED_TRANSFER = 601 } switch_call_cause_t; typedef enum { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile Wed Oct 4 19:11:11 2006 @@ -1,6 +1,6 @@ OS_ARCH := $(subst /,_,$(shell uname -s | sed /\ /s//_/)) VERSION = sofia-sip-1.12 -TARBALL = sofia-sip-1.12.2.tar.gz +TARBALL = sofia-sip-1.12.3.tar.gz CFLAGS += -I. -I$(PREFIX)/include/$(VERSION) LDFLAGS += -lsofia-sip-ua LINKER=$(CC) 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 Oct 4 19:11:11 2006 @@ -247,6 +247,7 @@ char *remote_sdp_str; char *local_sdp_str; char *dest; + char *source; char *key; unsigned long rm_rate; switch_payload_t pt; @@ -372,42 +373,54 @@ auth_res_t ret = AUTH_OK; char *npassword = NULL; nonce = uri = qop = cnonce = nc = response = NULL; + int cnt = 0; - - - for(index = 0; (cur=(char*)authorization->au_params[index]); index++) { - char *var, *val, *p, *work; - var = val = work = NULL; - if ((work = strdup(cur))) { - var = work; - if ((val = strchr(var, '='))) { - *val++ = '\0'; - while(*val == '"') { + if (authorization->au_params) { + for(index = 0; (cur=(char*)authorization->au_params[index]); index++) { + char *var, *val, *p, *work; + var = val = work = NULL; + if ((work = strdup(cur))) { + var = work; + if ((val = strchr(var, '='))) { *val++ = '\0'; - } - if ((p = strchr(val, '"'))) { - *p = '\0'; - } + while(*val == '"') { + *val++ = '\0'; + } + if ((p = strchr(val, '"'))) { + *p = '\0'; + } - if (!strcasecmp(var, "nonce")) { - nonce = strdup(val); - } else if (!strcasecmp(var, "uri")) { - uri = strdup(val); - } else if (!strcasecmp(var, "qop")) { - qop = strdup(val); - } else if (!strcasecmp(var, "cnonce")) { - cnonce = strdup(val); - } else if (!strcasecmp(var, "response")) { - response = strdup(val); - } else if (!strcasecmp(var, "nc")) { - nc = strdup(val); + if (!strcasecmp(var, "nonce")) { + nonce = strdup(val); + cnt++; + } else if (!strcasecmp(var, "uri")) { + uri = strdup(val); + cnt++; + } else if (!strcasecmp(var, "qop")) { + qop = strdup(val); + cnt++; + } else if (!strcasecmp(var, "cnonce")) { + cnonce = strdup(val); + cnt++; + } else if (!strcasecmp(var, "response")) { + response = strdup(val); + cnt++; + } else if (!strcasecmp(var, "nc")) { + nc = strdup(val); + cnt++; + } } - } - free(work); + free(work); + } } } + if (cnt != 6) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Authorization header!\n"); + goto end; + } + if (switch_strlen_zero(np)) { if (!get_auth_data(profile->dbname, nonce, np, nplen, profile->ireg_mutex)) { ret = AUTH_STALE; @@ -779,6 +792,8 @@ tech_pvt->sofia_private.session = session; nua_handle_bind(tech_pvt->nh, &tech_pvt->sofia_private); nua_invite(tech_pvt->nh, + SIPTAG_FROM_STR(tech_pvt->source), + SIPTAG_CONTACT_STR(tech_pvt->profile->url), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE), SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL), @@ -1506,6 +1521,7 @@ private_object_t *tech_pvt = NULL; switch_channel_t *channel; char *host; + char username[512]; *new_session = NULL; @@ -1552,6 +1568,8 @@ snprintf(tech_pvt->dest, strlen(dest) + 5, "sip:%s", dest); } + snprintf(username, sizeof(username), "sip:%s@%s:%d", (char *) outbound_profile->caller_id_number, profile->sipip, profile->sip_port); + tech_pvt->source = switch_core_session_strdup(nsession, username); channel = switch_core_session_get_channel(nsession); attach_private(nsession, profile, tech_pvt, dest); caller_profile = switch_caller_profile_clone(nsession, outbound_profile); @@ -2143,7 +2161,9 @@ ); if (regtype == REG_REGISTER) { - nua_respond(nh, SIP_200_OK, SIPTAG_CONTACT(contact), TAG_END()); + nua_respond(nh, SIP_200_OK, SIPTAG_CONTACT(contact), + NUTAG_WITH_THIS(nua), + TAG_END()); return 1; } @@ -2164,11 +2184,12 @@ sip_from_t const *from; sip_to_t const *to; sip_refer_to_t const *refer_to; - char *refer_to_str; switch_core_session_t *session = sofia_private ? sofia_private->session : NULL; if (session) { private_object_t *tech_pvt = NULL; + char *exten; + const char *tmp = NULL; #ifdef this_was_done char *dest; private_object_t *ntech_pvt; @@ -2180,44 +2201,99 @@ tech_pvt = switch_core_session_get_private(session); from = sip->sip_from; to = sip->sip_to; - refer_to = sip->sip_refer_to; + tl_gets(tags, + SIPTAG_REFER_TO_STR_REF(tmp), + TAG_END()); - if ((refer_to_str = sip_header_as_string(tech_pvt->home, (sip_header_t*)refer_to))) { - char *exten = switch_core_session_strdup(session, refer_to_str); - char *p; + if ((refer_to = sip->sip_refer_to)) { + exten = (char *) refer_to->r_url->url_user; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Process REFER to [%s@%s]\n", + exten, (char *) refer_to->r_url->url_host); - if ((p = strchr(exten, ':'))) { - *p++ = '\0'; - exten = p; - } + if (refer_to->r_url->url_headers) { + sip_replaces_t *replaces; + nua_handle_t *bnh; + char *rep; - if ((p = strchr(exten, '@'))) { - switch_channel_t *channel = switch_core_session_get_channel(session); - char *br; + if ((rep = strchr(refer_to->r_url->url_headers, '='))) { + char *buf; + rep++; + + if ((buf = switch_core_session_alloc(session, strlen(rep) + 1))) { + rep = url_unescape(buf, (const char *) rep); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Replaces: [%s]\n", rep); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); + return; + } + if ((replaces = sip_replaces_make(tech_pvt->home, rep)) && (bnh = nua_handle_by_replaces(nua, replaces))) { + sofia_private_t *b_private; + switch_channel_t *channel_a = NULL, *channel_b = NULL; + + channel_a = switch_core_session_get_channel(session); + + if ((b_private = nua_handle_fetch(bnh))) { + char *br_a, *br_b; + + channel_b = switch_core_session_get_channel(b_private->session); - *p = '\0'; - if ((br = switch_channel_get_variable(channel, "BRIDGETO"))) { - switch_core_session_t *bsession; + br_a = switch_channel_get_variable(channel_a, "BRIDGETO"); + //br_a = switch_core_session_get_uuid(session); + br_b = switch_channel_get_variable(channel_b, "BRIDGETO"); + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Attended Transfer [%s][%s]\n", br_a, br_b); + + if (br_a && br_b) { + switch_ivr_uuid_bridge(br_a, br_b); + switch_channel_set_variable(channel_b, "endpoint_disposition", "ATTENDED_TRANSFER"); + switch_channel_hangup(channel_b, SWITCH_CAUSE_ATTENDED_TRANSFER); + switch_channel_set_variable(channel_a, "endpoint_disposition", "ATTENDED_TRANSFER"); + switch_channel_hangup(channel_a, SWITCH_CAUSE_ATTENDED_TRANSFER); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Transfer! [%s][%s]\n", br_a, br_b); + switch_channel_set_variable(channel_b, "endpoint_disposition", "ATTENDED_TRANSFER_ERROR"); + switch_channel_hangup(channel_b, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + switch_channel_set_variable(channel_a, "endpoint_disposition", "ATTENDED_TRANSFER_ERROR"); + switch_channel_hangup(channel_a, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + } + } - if ((bsession = switch_core_session_locate(br))) { - switch_ivr_session_transfer(bsession, exten, profile->dialplan, profile->context); - switch_core_session_rwunlock(bsession); + nua_handle_unref(bnh); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find handle from Replaces!\n"); } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot parse Replaces!\n"); } + return; + } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing Refer-To\n"); + return; + } - } + if (exten) { + switch_channel_t *channel = switch_core_session_get_channel(session); + char *br; + + switch_channel_set_variable(channel, "endpoint_disposition", "BLIND_TRANSFER"); + switch_channel_hangup(channel, SWITCH_CAUSE_BLIND_TRANSFER); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "refer to " URL_PRINT_FORMAT " from %s%s" URL_PRINT_FORMAT " to %s\n", - URL_PRINT_ARGS(from->a_url), - from->a_display ? from->a_display : "", from->a_display ? " " : "", - URL_PRINT_ARGS(from->a_url), - refer_to_str - ); - - su_free(tech_pvt->home, refer_to_str); + if ((br = switch_channel_get_variable(channel, "BRIDGETO"))) { + switch_core_session_t *bsession; + + if ((bsession = switch_core_session_locate(br))) { + channel = switch_core_session_get_channel(bsession); + switch_channel_set_variable(channel, "TRANSFER_FALLBACK", (char *) from->a_user); + switch_ivr_session_transfer(bsession, exten, profile->dialplan, profile->context); + switch_core_session_rwunlock(bsession); + } + } + } + #ifdef this_was_done if (!(nsession = switch_core_session_request(&sofia_endpoint_interface, NULL))) { @@ -2230,7 +2306,7 @@ terminate_session(&nsession, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER, __LINE__); goto done; } - ntech_pvt->dest = switch_core_session_strdup(nsession, refer_to_str); + ntech_pvt->dest = switch_core_session_strdup(nsession, exten); dest = ntech_pvt->dest + 4; channel = switch_core_session_get_channel(session); outbound_profile = switch_channel_get_caller_profile(channel); @@ -2427,12 +2503,10 @@ tl_gets(tags, NUTAG_CALLSTATE_REF(ss_state), - SIPTAG_WWW_AUTHENTICATE_REF(authenticate), + SIPTAG_WWW_AUTHENTICATE_REF(authenticate), TAG_END()); nua_authenticate(nh, NUTAG_AUTH(authentication), TAG_END()); - - } } Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Oct 4 19:11:11 2006 @@ -87,6 +87,8 @@ { "SYSTEM_SHUTDOWN", SWITCH_CAUSE_SYSTEM_SHUTDOWN }, { "LOSE_RACE", SWITCH_CAUSE_LOSE_RACE }, { "MANAGER_REQUEST", SWITCH_CAUSE_MANAGER_REQUEST }, + { "BLIND_TRANSFER", SWITCH_CAUSE_BLIND_TRANSFER }, + { "ATTENDED_TRANSFER", SWITCH_CAUSE_ATTENDED_TRANSFER }, { NULL, 0 } }; @@ -804,43 +806,59 @@ int x, index; assert(channel != NULL); + switch_mutex_lock(channel->flag_mutex); for (x = 0; x < SWITCH_MAX_STATE_HANDLERS; x++) { if (channel->state_handlers[x] == state_handler) { - return x; + index = x; + goto end; } } index = channel->state_handler_index++; if (channel->state_handler_index >= SWITCH_MAX_STATE_HANDLERS) { - return -1; + index = -1; + goto end; } - + channel->state_handlers[index] = state_handler; + + end: + switch_mutex_unlock(channel->flag_mutex); return index; } SWITCH_DECLARE(const switch_state_handler_table_t *) switch_channel_get_state_handler(switch_channel_t *channel, int index) { + const switch_state_handler_table_t *h = NULL; + assert(channel != NULL); if (index > SWITCH_MAX_STATE_HANDLERS || index > channel->state_handler_index) { return NULL; } - return channel->state_handlers[index]; + switch_mutex_lock(channel->flag_mutex); + h = channel->state_handlers[index]; + switch_mutex_unlock(channel->flag_mutex); + + return h; } SWITCH_DECLARE(void) switch_channel_clear_state_handler(switch_channel_t *channel, const switch_state_handler_table_t *state_handler) { - int index, i = 0; + int index, i = channel->state_handler_index; const switch_state_handler_table_t *new_handlers[SWITCH_MAX_STATE_HANDLERS] = {0}; + + switch_mutex_lock(channel->flag_mutex); + assert(channel != NULL); + channel->state_handler_index = 0; if (state_handler) { - for (index = 0; index < channel->state_handler_index; index++) { + for (index = 0; index < i; index++) { if (channel->state_handlers[index] != state_handler) { - new_handlers[i++] = channel->state_handlers[index]; + new_handlers[channel->state_handler_index++] = channel->state_handlers[index]; } } } @@ -849,12 +867,13 @@ } if (state_handler) { - for (index = 0; index < i; index++) { - channel->state_handlers[index] = new_handlers[i]; + for (index = 0; index < channel->state_handler_index; index++) { + channel->state_handlers[index] = new_handlers[index]; } } - channel->state_handler_index = i; + switch_mutex_unlock(channel->flag_mutex); + } SWITCH_DECLARE(void) switch_channel_set_caller_extension(switch_channel_t *channel, Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Oct 4 19:11:11 2006 @@ -1998,7 +1998,7 @@ } done: - *cause = SWITCH_CAUSE_UNALLOCATED; + *cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; if (status == SWITCH_STATUS_SUCCESS) { if (caller_channel) {

1 0

[commit] r2967 - freeswitch/trunk/libs
by Freeswitch SVN 04 Oct '06

04 Oct '06

Author: mikej Date: Tue Oct 3 20:27:59 2006 New Revision: 2967 Modified: freeswitch/trunk/libs/mozilla.build.sh freeswitch/trunk/libs/portaudio.build.sh Log: make attempting to reapply patches just fail and not prompt the user Modified: freeswitch/trunk/libs/mozilla.build.sh ============================================================================== --- freeswitch/trunk/libs/mozilla.build.sh (original) +++ freeswitch/trunk/libs/mozilla.build.sh Tue Oct 3 20:27:59 2006 @@ -3,7 +3,7 @@ cflags="" if [ $hosttype = "FreeBSD" ] ; then -patch <<__EOF__ +patch -p0 -u -f<<__EOF__ --- nsprpub/pr/include/md/_freebsd.h.orig Sat Sep 30 22:19:12 2006 +++ nsprpub/pr/include/md/_freebsd.h Sat Sep 30 22:23:16 2006 @@ -106,6 +106,11 @@ Modified: freeswitch/trunk/libs/portaudio.build.sh ============================================================================== --- freeswitch/trunk/libs/portaudio.build.sh (original) +++ freeswitch/trunk/libs/portaudio.build.sh Tue Oct 3 20:27:59 2006 @@ -1,4 +1,4 @@ -patch <<__EOF__ +patch -p0 -u -f <<__EOF__ --- configure.orig 2006-09-24 23:56:36.000000000 -0700 +++ configure 2006-09-24 23:57:32.000000000 -0700 @@ -1886,7 +1886,7 @@

1 0