kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "chan_pjsip/res_pjsip: Add CHANNEL(pjsip,request_uri)" into 13

Browse Source
This commit is contained in:
Jenkins2
2017-12-13 10:18:37 -06:00
committed by Gerrit Code Review
parent e40bffd53b 73b3390dbe
commit 992b7197b7
4 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
channels/chan_pjsip.c
View File

@@ -511,6 +511,11 @@ static struct ast_channel *chan_pjsip_new(struct ast_sip_session *session, int s
ast_party_id_copy(&ast_channel_caller(chan)->id, &session->id);
ast_party_id_copy(&ast_channel_caller(chan)->ani, &session->id);
if (!ast_strlen_zero(exten)) {
/* Set provided DNID on the new channel. */
ast_channel_dialed(chan)->number.str = ast_strdup(exten);
}
ast_channel_priority_set(chan, 1);
ast_channel_callgroup_set(chan, session->endpoint->pickup.callgroup);

50
channels/pjsip/dialplan_functions.c
View File

@@ -388,7 +388,7 @@
</enumlist>
</enum>
<enum name="target_uri">
<para>The request URI of the <literal>INVITE</literal> request associated with the creation of this channel.</para>
<para>The contact URI where requests are sent.</para>
</enum>
<enum name="local_uri">
<para>The local URI.</para>
@@ -402,6 +402,10 @@
<enum name="remote_tag">
<para>Tag in To header</para>
</enum>
<enum name="request_uri">
<para>The request URI of the incoming <literal>INVITE</literal>
associated with the creation of this channel.</para>
</enum>
<enum name="t38state">
<para>The current state of any T.38 fax on this channel.</para>
<enumlist>
@@ -657,6 +661,27 @@ static int channel_read_rtcp(struct ast_channel *chan, const char *type, const c
return 0;
}
static int print_escaped_uri(struct ast_channel *chan, const char *type,
pjsip_uri_context_e context, const void *uri, char *buf, size_t size)
{
int res;
char *buf_copy;
res = pjsip_uri_print(context, uri, buf, size);
if (res < 0) {
ast_log(LOG_ERROR, "Channel %s: Unescaped %s too long for %d byte buffer\n",
ast_channel_name(chan), type, (int) size);
/* Empty buffer that likely is not terminated. */
buf[0] = '\0';
return -1;
}
buf_copy = ast_strdupa(buf);
ast_escape_quoted(buf_copy, buf, size);
return 0;
}
/*!
* \internal \brief Handle reading signalling information
*/
@@ -665,6 +690,7 @@ static int channel_read_pjsip(struct ast_channel *chan, const char *type, const
struct ast_sip_channel_pvt *channel = ast_channel_tech_pvt(chan);
char *buf_copy;
pjsip_dialog *dlg;
int res = 0;
if (!channel) {
ast_log(AST_LOG_WARNING, "Channel %s has no pvt!\n", ast_channel_name(chan));
@@ -690,25 +716,27 @@ static int channel_read_pjsip(struct ast_channel *chan, const char *type, const
return -1;
#endif
} else if (!strcmp(type, "target_uri")) {
pjsip_uri_print(PJSIP_URI_IN_REQ_URI, dlg->target, buf, buflen);
buf_copy = ast_strdupa(buf);
ast_escape_quoted(buf_copy, buf, buflen);
res = print_escaped_uri(chan, type, PJSIP_URI_IN_REQ_URI, dlg->target, buf,
buflen);
} else if (!strcmp(type, "local_uri")) {
pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR, dlg->local.info->uri, buf, buflen);
buf_copy = ast_strdupa(buf);
ast_escape_quoted(buf_copy, buf, buflen);
res = print_escaped_uri(chan, type, PJSIP_URI_IN_FROMTO_HDR, dlg->local.info->uri,
buf, buflen);
} else if (!strcmp(type, "local_tag")) {
ast_copy_pj_str(buf, &dlg->local.info->tag, buflen);
buf_copy = ast_strdupa(buf);
ast_escape_quoted(buf_copy, buf, buflen);
} else if (!strcmp(type, "remote_uri")) {
pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR, dlg->remote.info->uri, buf, buflen);
buf_copy = ast_strdupa(buf);
ast_escape_quoted(buf_copy, buf, buflen);
res = print_escaped_uri(chan, type, PJSIP_URI_IN_FROMTO_HDR,
dlg->remote.info->uri, buf, buflen);
} else if (!strcmp(type, "remote_tag")) {
ast_copy_pj_str(buf, &dlg->remote.info->tag, buflen);
buf_copy = ast_strdupa(buf);
ast_escape_quoted(buf_copy, buf, buflen);
} else if (!strcmp(type, "request_uri")) {
if (channel->session->request_uri) {
res = print_escaped_uri(chan, type, PJSIP_URI_IN_REQ_URI,
channel->session->request_uri, buf, buflen);
}
} else if (!strcmp(type, "t38state")) {
ast_copy_string(buf, t38state_to_string[channel->session->t38state], buflen);
} else if (!strcmp(type, "local_addr")) {
@@ -744,7 +772,7 @@ static int channel_read_pjsip(struct ast_channel *chan, const char *type, const
return -1;
}
return 0;
return res;
}
/*! \brief Struct used to push function arguments to task processor */