kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

urldecode the uri 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5994 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-10-19 16:02:44 +00:00
parent a1ebbf1fa7
commit 1934390950
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/mod/endpoints/mod_sofia/sofia.c
View File

@ -1760,6 +1760,17 @@ void sofia_handle_sip_i_info(nua_t *nua, sofia_profile_t *profile, nua_handle_t
return; return;
} }
#define check_decode(_var, _session) do { \
assert(_session); \
if (strchr(_var, '%')) { \
char *tmp = switch_core_session_strdup(_session, _var); \
switch_url_decode(tmp); \
_var = tmp; \
} \
if(_session) break; \
} while(!_session)
#define url_set_chanvars(session, url, varprefix) _url_set_chanvars(session, url, #varprefix "_user", #varprefix "_host", #varprefix "_port", #varprefix "_uri") #define url_set_chanvars(session, url, varprefix) _url_set_chanvars(session, url, #varprefix "_user", #varprefix "_host", #varprefix "_port", #varprefix "_uri")
const char *_url_set_chanvars(switch_core_session_t *session, url_t *url, const char *user_var, const char *_url_set_chanvars(switch_core_session_t *session, url_t *url, const char *user_var,
const char *host_var, const char *port_var, const char *uri_var) const char *host_var, const char *port_var, const char *uri_var)
@ -1774,6 +1785,8 @@ const char *_url_set_chanvars(switch_core_session_t *session, url_t *url, const
port = url->url_port; port = url->url_port;
} }
check_decode(user, session);
if (user) { if (user) {
switch_channel_set_variable(channel, user_var, user); switch_channel_set_variable(channel, user_var, user);
} }
@ -1853,7 +1866,7 @@ void process_rpid(sip_unknown_t *un, private_object_t *tech_pvt)
} }
} }
} }
free(mydata); free(mydata);
} }
} }
} }
@ -1944,9 +1957,12 @@ void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_
from_host = sip->sip_from->a_url->url_host; from_host = sip->sip_from->a_url->url_host;
channel_name = url_set_chanvars(session, sip->sip_from->a_url, sip_from); channel_name = url_set_chanvars(session, sip->sip_from->a_url, sip_from);
switch_channel_set_variable(channel, "sip_mailbox", from_user); check_decode(from_user, session);
if (!switch_strlen_zero(from_user)) { if (!switch_strlen_zero(from_user)) {
switch_channel_set_variable(channel, "sip_mailbox", from_user);
if (*from_user == '+') { if (*from_user == '+') {
switch_channel_set_variable(channel, "sip_from_user_stripped", (const char *) (from_user + 1)); switch_channel_set_variable(channel, "sip_from_user_stripped", (const char *) (from_user + 1));
} else { } else {
@ -1980,6 +1996,7 @@ void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_
} else { } else {
destination_number = sip->sip_request->rq_url->url_user; destination_number = sip->sip_request->rq_url->url_user;
} }
check_decode(destination_number, session);
} }
if (sip->sip_to && sip->sip_to->a_url) { if (sip->sip_to && sip->sip_to->a_url) {
@ -2044,8 +2061,10 @@ void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_
if (sip->sip_request->rq_url) { if (sip->sip_request->rq_url) {
sofia_gateway_t *gateway; sofia_gateway_t *gateway;
char *user = (char *) sip->sip_request->rq_url->url_user;
check_decode(user, session);
char *from_key = switch_core_session_sprintf(session, "sip:%s@%s", char *from_key = switch_core_session_sprintf(session, "sip:%s@%s",
(char *) sip->sip_request->rq_url->url_user, user,
(char *) sip->sip_request->rq_url->url_host); (char *) sip->sip_request->rq_url->url_host);
if ((gateway = sofia_reg_find_gateway(from_key))) { if ((gateway = sofia_reg_find_gateway(from_key))) {