kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip_messaging.c: Misc cleanups and fixes.

Browse Source 
* Eliminated RAII_VAR in get_outbound_endpoint().

* Simplify update_to() coding.  However, this function can only be a NoOp
because the To string can only be a URI and not a name-address formatted
string.

* Simplify update_from() coding.  Also fixed a code path modifying the
from string when the caller could still want to use the original string.

* Fixed msg_data_create() incompletely removing the "pjsip:" to then add
back the "sip:" string if needed.  The code didn't handle the "pjsip:sip:"
case because it left the colon after pjsip in the string.

Change-Id: I68a09a665f6d4daa9eaa59069045ab69122e28db
This commit is contained in:
Richard Mudgett
2016-09-06 11:46:16 -05:00
parent 004d3c32ba
commit f369dbb705
1 changed files with 71 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
res/res_pjsip_messaging.c
View File

@@ -106,8 +106,9 @@ static const char *skip_sip(const char *fromto)
* *
* Expects the given 'to' to be in one of the following formats: * Expects the given 'to' to be in one of the following formats:
* sip[s]:endpoint[/aor] * sip[s]:endpoint[/aor]
* sip[s]:endpoint[/uri] * sip[s]:endpoint[/uri] - Where uri is: sip[s]:user@domain
* sip[s]:uri <-- will use default outbound endpoint * sip[s]:endpoint[@domain]
* sip[s]:unknown_user@domain <-- will use default outbound endpoint
* *
* If an optional aor is given it will try to find an associated uri * If an optional aor is given it will try to find an associated uri
* to return. If an optional uri is given then that will be returned, * to return. If an optional uri is given then that will be returned,
@@ -116,50 +117,60 @@ static const char *skip_sip(const char *fromto)
* \param to 'From' or 'To' field with possible endpoint * \param to 'From' or 'To' field with possible endpoint
* \param uri Optional uri to return * \param uri Optional uri to return
*/ */
static struct ast_sip_endpoint* get_outbound_endpoint( static struct ast_sip_endpoint *get_outbound_endpoint(const char *to, char **uri)
const char *to, char **uri)
{ {
char *name, *aor_uri; char *name;
struct ast_sip_endpoint* endpoint; char *aor_uri;
RAII_VAR(struct ast_sip_aor *, aor, NULL, ao2_cleanup); struct ast_sip_endpoint *endpoint;
RAII_VAR(struct ast_sip_contact *, contact, NULL, ao2_cleanup);
name = ast_strdupa(skip_sip(to)); name = ast_strdupa(skip_sip(to));
/* attempt to extract the endpoint name */ /* attempt to extract the endpoint name */
if ((aor_uri = strchr(name, '/'))) { if ((aor_uri = strchr(name, '/'))) {
/* format was 'endpoint/' */ /* format was 'endpoint/(aor_name | uri)' */
*aor_uri++ = '\0'; *aor_uri++ = '\0';
} else if ((aor_uri = strchr(name, '@'))) { } else if ((aor_uri = strchr(name, '@'))) {
/* format was 'endpoint@' - don't use the rest */ /* format was 'endpoint@domain' - discard the domain */
*aor_uri = '\0'; *aor_uri = '\0';
} }
/* at this point, if name is not empty then it /* at this point, if name is not empty then it
might be an endpoint, so try to retrieve it */ might be an endpoint, so try to retrieve it */
if (ast_strlen_zero(name) || !(endpoint = ast_sorcery_retrieve_by_id( if (ast_strlen_zero(name)
ast_sip_get_sorcery(), "endpoint", name))) { || !(endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint",
name))) {
/* an endpoint was not found, so assume sending directly /* an endpoint was not found, so assume sending directly
to a uri and use the default outbound endpoint */ to a uri and use the default outbound endpoint */
*uri = ast_strdup(to); *uri = ast_strdup(to);
return ast_sip_default_outbound_endpoint(); return ast_sip_default_outbound_endpoint();
} }
*uri = aor_uri; if (ast_strlen_zero(aor_uri)) {
if (*uri) { *uri = NULL;
char *end = strchr(*uri, '>'); } else {
struct ast_sip_aor *aor;
struct ast_sip_contact *contact = NULL;
char *end;
/* Trim off any stray angle bracket that shouldn't be here */
end = strchr(aor_uri, '>');
if (end) { if (end) {
*end++ = '\0'; *end = '\0';
} }
/* if what's in 'uri' is a retrievable aor use the uri on it /*
instead, otherwise assume what's there is already a uri*/ * if what's in 'uri' is a retrievable aor use the uri on it
if ((aor = ast_sip_location_retrieve_aor(*uri)) && * instead, otherwise assume what's there is already a uri
(contact = ast_sip_location_retrieve_first_aor_contact(aor))) { */
*uri = (char*)contact->uri; aor = ast_sip_location_retrieve_aor(aor_uri);
if (aor && (contact = ast_sip_location_retrieve_first_aor_contact(aor))) {
aor_uri = (char *) contact->uri;
} }
/* need to copy because underlying uri goes away */ /* need to copy because underlying uri goes away */
*uri = ast_strdup(*uri); *uri = ast_strdup(aor_uri);
ao2_cleanup(contact);
ao2_cleanup(aor);
} }
return endpoint; return endpoint;
@@ -176,16 +187,16 @@ static struct ast_sip_endpoint* get_outbound_endpoint(
*/ */
static void update_to(pjsip_tx_data *tdata, char *to) static void update_to(pjsip_tx_data *tdata, char *to)
{ {
pjsip_name_addr *name_addr = (pjsip_name_addr *) pjsip_name_addr *parsed_name_addr;
PJSIP_MSG_TO_HDR(tdata->msg)->uri;
pjsip_uri *parsed;
if ((parsed = pjsip_parse_uri(tdata->pool, to, strlen(to), parsed_name_addr = (pjsip_name_addr *) pjsip_parse_uri(tdata->pool, to, strlen(to),
PJSIP_PARSE_URI_AS_NAMEADDR))) { PJSIP_PARSE_URI_AS_NAMEADDR);
pjsip_name_addr *parsed_name_addr = (pjsip_name_addr *)parsed; if (parsed_name_addr) {
if (pj_strlen(&parsed_name_addr->display)) { if (pj_strlen(&parsed_name_addr->display)) {
pj_strdup(tdata->pool, &name_addr->display, pjsip_name_addr *name_addr =
&parsed_name_addr->display); (pjsip_name_addr *) PJSIP_MSG_TO_HDR(tdata->msg)->uri;
pj_strdup(tdata->pool, &name_addr->display, &parsed_name_addr->display);
} }
} }
} }
@@ -204,22 +215,24 @@ static void update_to(pjsip_tx_data *tdata, char *to)
*/ */
static void update_from(pjsip_tx_data *tdata, char *from) static void update_from(pjsip_tx_data *tdata, char *from)
{ {
pjsip_name_addr *name_addr = (pjsip_name_addr *) pjsip_name_addr *name_addr;
PJSIP_MSG_FROM_HDR(tdata->msg)->uri; pjsip_sip_uri *uri;
pjsip_sip_uri *uri = pjsip_uri_get_uri(name_addr); pjsip_name_addr *parsed_name_addr;
pjsip_uri *parsed;
if (ast_strlen_zero(from)) { if (ast_strlen_zero(from)) {
return; return;
} }
if ((parsed = pjsip_parse_uri(tdata->pool, from, strlen(from), name_addr = (pjsip_name_addr *) PJSIP_MSG_FROM_HDR(tdata->msg)->uri;
PJSIP_PARSE_URI_AS_NAMEADDR))) { uri = pjsip_uri_get_uri(name_addr);
pjsip_name_addr *parsed_name_addr = (pjsip_name_addr *)parsed;
parsed_name_addr = (pjsip_name_addr *) pjsip_parse_uri(tdata->pool, from,
strlen(from), PJSIP_PARSE_URI_AS_NAMEADDR);
if (parsed_name_addr) {
pjsip_sip_uri *parsed_uri = pjsip_uri_get_uri(parsed_name_addr->uri); pjsip_sip_uri *parsed_uri = pjsip_uri_get_uri(parsed_name_addr->uri);
if (pj_strlen(&parsed_name_addr->display)) { if (pj_strlen(&parsed_name_addr->display)) {
pj_strdup(tdata->pool, &name_addr->display, pj_strdup(tdata->pool, &name_addr->display, &parsed_name_addr->display);
&parsed_name_addr->display);
} }
pj_strdup(tdata->pool, &uri->user, &parsed_uri->user); pj_strdup(tdata->pool, &uri->user, &parsed_uri->user);
@@ -228,11 +241,17 @@ static void update_from(pjsip_tx_data *tdata, char *from)
} else { } else {
/* assume it is 'user[@domain]' format */ /* assume it is 'user[@domain]' format */
char *domain = strchr(from, '@'); char *domain = strchr(from, '@');
if (domain) { if (domain) {
*domain++ = '\0'; pj_str_t pj_from;
pj_strdup2(tdata->pool, &uri->host, domain);
pj_strset3(&pj_from, from, domain);
pj_strdup(tdata->pool, &uri->user, &pj_from);
pj_strdup2(tdata->pool, &uri->host, domain + 1);
} else {
pj_strdup2(tdata->pool, &uri->user, from);
} }
pj_strdup2(tdata->pool, &uri->user, from);
} }
} }
@@ -526,7 +545,7 @@ static void msg_data_destroy(void *obj)
ast_msg_destroy(mdata->msg); ast_msg_destroy(mdata->msg);
} }
static struct msg_data* msg_data_create(const struct ast_msg *msg, const char *to, const char *from) static struct msg_data *msg_data_create(const struct ast_msg *msg, const char *to, const char *from)
{ {
char *tag; char *tag;
struct msg_data *mdata = ao2_alloc(sizeof(*mdata), msg_data_destroy); struct msg_data *mdata = ao2_alloc(sizeof(*mdata), msg_data_destroy);
@@ -536,17 +555,17 @@ static struct msg_data* msg_data_create(const struct ast_msg *msg, const char *t
} }
/* typecast to suppress const warning */ /* typecast to suppress const warning */
mdata->msg = ast_msg_ref((struct ast_msg*)msg); mdata->msg = ast_msg_ref((struct ast_msg *) msg);
/* starts with 'pjsip:' the 'pj' needs to be removed and maybe even /* To starts with 'pjsip:' which needs to be removed. */
the entire string. */
if (!(to = strchr(to, ':'))) { if (!(to = strchr(to, ':'))) {
ao2_ref(mdata, -1); ao2_ref(mdata, -1);
return NULL; return NULL;
} }
++to;/* Now skip the ':' */
/* Make sure we start with sip: */ /* Make sure we start with sip: */
mdata->to = ast_begins_with(to, "sip:") ? ast_strdup(++to) : ast_strdup(to - 3); mdata->to = ast_begins_with(to, "sip:") ? ast_strdup(to) : ast_strdup(to - 4);
mdata->from = ast_strdup(from); mdata->from = ast_strdup(from);
if (!mdata->to || !mdata->from) { if (!mdata->to || !mdata->from) {
ao2_ref(mdata, -1); ao2_ref(mdata, -1);
@@ -572,12 +591,13 @@ static int msg_send(void *data)
pjsip_tx_data *tdata; pjsip_tx_data *tdata;
RAII_VAR(char *, uri, NULL, ast_free); RAII_VAR(char *, uri, NULL, ast_free);
RAII_VAR(struct ast_sip_endpoint *, endpoint, get_outbound_endpoint( RAII_VAR(struct ast_sip_endpoint *, endpoint, NULL, ao2_cleanup);
mdata->to, &uri), ao2_cleanup);
endpoint = get_outbound_endpoint(mdata->to, &uri);
if (!endpoint) { if (!endpoint) {
ast_log(LOG_ERROR, "PJSIP MESSAGE - Could not find endpoint '%s' and " ast_log(LOG_ERROR,
"no default outbound endpoint configured\n", mdata->to); "PJSIP MESSAGE - Could not find endpoint '%s' and no default outbound endpoint configured\n",
mdata->to);
return -1; return -1;
} }