mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-09 04:49:05 +00:00
update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3226 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
1 parent
800ec12f5b
commit
082a5a03c0
3 files changed
+30
-11
No files matched your search
@@ -2449,7 +2449,7 @@ static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsessi
|
||||
char *context;
|
||||
char *cid_name;
|
||||
char *cid_num;
|
||||
char *t, *them = NULL;
|
||||
char *tmp, *t, *them = NULL;
|
||||
|
||||
memset(payloads, 0, sizeof(payloads));
|
||||
|
||||
@@ -2481,8 +2481,6 @@ static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsessi
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (!(context = ldl_session_get_value(dlsession, "context"))) {
|
||||
context = profile->context;
|
||||
}
|
||||
@@ -2502,6 +2500,21 @@ static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsessi
|
||||
|
||||
tech_pvt->them = switch_core_session_strdup(session, ldl_session_get_callee(dlsession));
|
||||
tech_pvt->us = switch_core_session_strdup(session, ldl_session_get_caller(dlsession));
|
||||
|
||||
if ((tmp = strdup(tech_pvt->us))) {
|
||||
char *p, *q;
|
||||
|
||||
if ((p = strchr(tmp, '@'))) {
|
||||
*p++ = '\0';
|
||||
if ((q = strchr(p, '/'))) {
|
||||
*q = '\0';
|
||||
}
|
||||
switch_channel_set_variable(channel, "dl_from_user", tmp);
|
||||
switch_channel_set_variable(channel, "dl_from_host", p);
|
||||
}
|
||||
|
||||
switch_safe_free(tmp);
|
||||
}
|
||||
|
||||
if (!tech_pvt->caller_profile) {
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Creating an identity for %s %s <%s> %s\n",
|
||||
|
||||
@@ -1171,7 +1171,7 @@ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel
|
||||
return in;
|
||||
}
|
||||
}
|
||||
nlen = strlen(sub_val);
|
||||
nlen = sub_val ? strlen(sub_val) : 0;
|
||||
if (len + nlen >= olen) {
|
||||
olen += block;
|
||||
cpos = c - data;
|
||||
@@ -1186,10 +1186,11 @@ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel
|
||||
vname = data + vvalpos;
|
||||
}
|
||||
|
||||
len += nlen;
|
||||
strcat(c, sub_val);
|
||||
c += nlen;
|
||||
|
||||
if (nlen) {
|
||||
len += nlen;
|
||||
strcat(c, sub_val);
|
||||
c += nlen;
|
||||
}
|
||||
if (func_val) {
|
||||
free(func_val);
|
||||
func_val = NULL;
|
||||
|
||||
Reference in new issue
Block a user