Author: mikej Date: Tue Jan 2 15:11:09 2007 New Revision: 3895 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: revert previous change 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 Tue Jan 2 15:11:09 2007 @@ -3974,7 +3974,7 @@ sip_from_t const *from = sip->sip_from; sip_to_t const *to = sip->sip_to; char *displayname; - char *username, *req_username = NULL; + char *username, *to_username = NULL; char *url_user = (char *) from->a_url->url_user; char *to_user, *to_host, *to_port; char *req_user, *req_host, *req_port; @@ -4050,6 +4050,14 @@ return; } + if (profile->pflags & PFLAG_FULL_ID) { + if (!(to_username = switch_mprintf("%s@%s:%s", (char *) to_user, (char *) to_host, to_port))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); + switch_safe_free(username); + return; + } + } + attach_private(session, profile, tech_pvt, username); @@ -4097,14 +4105,6 @@ req_port = "5060"; } - if (profile->pflags & PFLAG_FULL_ID) { - if (!(req_username = switch_mprintf("%s@%s:%s", (char *) req_user, (char *) req_host, req_port))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); - switch_safe_free(username); - return; - } - } - switch_channel_set_variable(channel, "sip_req_user", req_user); switch_channel_set_variable(channel, "sip_req_host", req_host); switch_channel_set_variable(channel, "sip_req_port", req_port); @@ -4148,7 +4148,7 @@ (char *)modname, (profile->context && !strcasecmp(profile->context, "_domain_")) ? (char *) from->a_url->url_host : profile->context, - req_username ? req_username : (char *) req_user + to_username ? to_username : (char *) to_user )) != 0) { @@ -4207,7 +4207,7 @@ switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); switch_safe_free(username); - switch_safe_free(req_username); + switch_safe_free(to_username); } if (!(tech_pvt->sofia_private = malloc(sizeof(*tech_pvt->sofia_private)))) {