Merge "res_pjsip: Add ignore_uri_user_options option." into 13

diff --cc res/res_pjsip_messaging.c
index a3cc8afcf833124d853ed99d76c4b41330010a03,07869052de103dcc01034ca035a57043cc42d23a..835a383939d78203e0b5e5b235c9c77b348e10d9
--- 1/res/res_pjsip_messaging.c
--- 2/res/res_pjsip_messaging.c
+++ b/res/res_pjsip_messaging.c
@@@ -127,11 -128,17 +127,17 @@@ static struct ast_sip_endpoint *get_out
  
        /* attempt to extract the endpoint name */
        if ((aor_uri = strchr(name, '/'))) {
 -              /* format was 'endpoint/' */
 +              /* format was 'endpoint/(aor_name | uri)' */
                *aor_uri++ = '\0';
        } else if ((aor_uri = strchr(name, '@'))) {
 -              /* format was 'endpoint@' - don't use the rest */
 +              /* format was 'endpoint@domain' - discard the domain */
                *aor_uri = '\0';
+ 
+               /*
+                * We may want to match without any user options getting
+                * in the way.
+                */
+               AST_SIP_USER_OPTIONS_TRUNCATE_CHECK(name);
        }
  
        /* at this point, if name is not empty then it
@@@ -545,9 -538,9 +557,9 @@@ static void msg_data_destroy(void *obj
        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 *uri_params;
        struct msg_data *mdata = ao2_alloc(sizeof(*mdata), msg_data_destroy);
  
        if (!mdata) {