Merged revisions 215522 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r215522 | dvossel | 2009-09-02 12:26:40 -0500 (Wed, 02 Sep 2009) | 11 lines

  SIP uri parsing cleanup

  Now, the scheme passed to parse_uri can either be a
  single scheme, or a list of schemes ',' delimited.
  This gets rid of the whole problem of having to create
  two buffers and calling parse_uri twice to check for
  separate schemes.

  Review: https://reviewboard.asterisk.org/r/343/
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@215524 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 9b60775ad953196c7a6297582e260ec086615672..bd4d1502c07f9df0fb0c512e3ebc1f36389f8878 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3671,6 +3671,7 @@ static char *get_in_brackets(char *tmp)
  * \note 
  * - If scheme is specified, drop it from the top.
  * - If a component is not requested, do not split around it.
+ * - Multiple scheme's can be specified ',' delimited. ex: "sip,sips"
  *
  * This means that if we don't have domain, we cannot split
  * name:pass and domain:port.
@@ -3683,7 +3684,7 @@ static char *get_in_brackets(char *tmp)
  * general form we are expecting is sip[s]:username[:password][;parameter]@host[:port][;...] 
  * \endverbatim
  */
-static int parse_uri(char *uri, char *scheme,
+static int parse_uri(char *uri, const char *scheme,
        char **ret_name, char **pass, char **domain, char **port, char **options, char **transport)
 {
        char *name = NULL;
@@ -3695,11 +3696,18 @@ static int parse_uri(char *uri, char *scheme,
        if (port)
                *port = "";
        if (scheme) {
-               int l = strlen(scheme);
-               if (!strncasecmp(uri, scheme, l))
-                       uri += l;
-               else {
-                       ast_debug(1, "Missing scheme '%s' in '%s'\n", scheme, uri);
+               int l;
+               char *scheme2 = ast_strdupa(scheme);
+               char *cur = strsep(&scheme2, ",");
+               for (; !ast_strlen_zero(cur); cur = strsep(&scheme2, ",")) {
+                       l = strlen(cur);
+                       if (!strncasecmp(uri, cur, l)) {
+                               uri += l;
+                               break;
+                       }
+               }
+               if (ast_strlen_zero(cur)) {
+                       ast_debug(1, "No supported scheme found in '%s' using the scheme[s] %s\n", uri, scheme);
                        error = -1;
                }
        }
@@ -10797,29 +10805,31 @@ static int __set_address_from_contact(const char *fullcontact, struct sockaddr_i
 {
        struct hostent *hp;
        struct ast_hostent ahp;
-       int port;
-       char *host, *pt;
+       int port = STANDARD_SIP_PORT;
+       char *host, *pt, *transport;
        char contact_buf[256];
-       char contact2_buf[256];
-       char *contact, *contact2;
+       char *contact;
 
        /* Work on a copy */
        ast_copy_string(contact_buf, fullcontact, sizeof(contact_buf));
-       ast_copy_string(contact2_buf, fullcontact, sizeof(contact2_buf));
        contact = contact_buf;
-       contact2 = contact2_buf;
 
-       /* We have only the part in <brackets> here so we just need to parse a SIP URI.*/
-       if (tcp) {
-               if (parse_uri(contact, "sips:", &contact, NULL, &host, &pt, NULL, NULL)) {
-                       if (parse_uri(contact2, "sip:", &contact, NULL, &host, &pt, NULL, NULL))
-                               ast_log(LOG_NOTICE, "'%s' is not a valid SIP contact (missing sip:) trying to use anyway\n", contact);
+       /* 
+        * We have only the part in <brackets> here so we just need to parse a SIP URI.
+        *
+        * Note: The outbound proxy could be using UDP between the proxy and Asterisk.
+        * We still need to be able to send to the remote agent through the proxy.
+       */
+
+       if (!parse_uri(contact, "sip,sips", &contact, NULL, &host, &pt, NULL, &transport)) {
+               if (((get_transport_str2enum(transport) == SIP_TRANSPORT_TLS)) ||
+                       !(strncasecmp(fullcontact, "sips", 4))) {
+                       port = !ast_strlen_zero(pt) ? atoi(pt) : STANDARD_TLS_PORT;
+               } else {
+                       port = !ast_strlen_zero(pt) ? atoi(pt) : STANDARD_SIP_PORT;
                }
-               port = !ast_strlen_zero(pt) ? atoi(pt) : STANDARD_TLS_PORT;
        } else {
-               if (parse_uri(contact, "sip:", &contact, NULL, &host, &pt, NULL, NULL))
-                       ast_log(LOG_NOTICE, "'%s' is not a valid SIP contact (missing sip:) trying to use anyway\n", contact);
-               port = !ast_strlen_zero(pt) ? atoi(pt) : STANDARD_SIP_PORT;
+               ast_log(LOG_WARNING, "Invalid contact uri %s (missing sip: or sips:), attempting to use anyway\n", fullcontact);
        }
 
        /* XXX This could block for a long time XXX */
@@ -10856,7 +10866,7 @@ static enum parse_register_result parse_register_contact(struct sip_pvt *pvt, st
        char data[SIPBUFSIZE];
        const char *expires = get_header(req, "Expires");
        int expire = atoi(expires);
-       char *curi, *host, *pt, *curi2, *transport;
+       char *curi, *host, *pt, *transport;
        int port;
        int transport_type;
        const char *useragent;
@@ -10886,7 +10896,6 @@ static enum parse_register_result parse_register_contact(struct sip_pvt *pvt, st
        if (strchr(contact, '<') == NULL)       /* No <, check for ; and strip it */
                strsep(&curi, ";");     /* This is Header options, not URI options */
        curi = get_in_brackets(contact);
-       curi2 = ast_strdupa(curi);
 
        /* if they did not specify Contact: or Expires:, they are querying
           what we currently have stored as their contact address, so return
@@ -10927,16 +10936,8 @@ static enum parse_register_result parse_register_contact(struct sip_pvt *pvt, st
        ast_string_field_build(pvt, our_contact, "<%s>", curi);
 
        /* Make sure it's a SIP URL */
-       if (pvt->socket.type == SIP_TRANSPORT_TLS) {
-               if (parse_uri(curi, "sips:", &curi, NULL, &host, &pt, NULL, &transport)) {
-                       if (parse_uri(curi2, "sip:", &curi, NULL, &host, &pt, NULL, &transport))
-                               ast_log(LOG_NOTICE, "Not a valid SIP contact (missing sip:) trying to use anyway\n");
-               }
-               port = !ast_strlen_zero(pt) ? atoi(pt) : STANDARD_TLS_PORT;
-       } else {
-               if (parse_uri(curi, "sip:", &curi, NULL, &host, &pt, NULL, &transport))
-                       ast_log(LOG_NOTICE, "Not a valid SIP contact (missing sip:) trying to use anyway\n");
-               port = !ast_strlen_zero(pt) ? atoi(pt) : STANDARD_SIP_PORT;
+       if (parse_uri(curi, "sip,sips", &curi, NULL, &host, &pt, NULL, &transport)) {
+               ast_log(LOG_NOTICE, "Not a valid SIP contact (missing sip:) trying to use anyway\n");
        }
 
        /* handle the transport type specified in Contact header. */
@@ -10946,8 +10947,11 @@ static enum parse_register_result parse_register_contact(struct sip_pvt *pvt, st
                 * same transport used by the pvt struct for the Register dialog. */
                if (ast_strlen_zero(pt)) {
                        port = (transport_type == SIP_TRANSPORT_TLS) ? STANDARD_TLS_PORT : STANDARD_SIP_PORT;
+               } else {
+                       port = atoi(pt);
                }
        } else {
+               port = !ast_strlen_zero(pt) ? atoi(pt) : STANDARD_SIP_PORT;
                transport_type = pvt->socket.type;
        }
 
@@ -12704,7 +12708,7 @@ static enum check_auth_result check_user_full(struct sip_pvt *p, struct sip_requ
        char from[256];
        char *dummy;    /* dummy return value for parse_uri */
        char *domain;   /* dummy return value for parse_uri */
-       char *of, *of2;
+       char *of;
        char rpid_num[50];
        const char *rpid;
        enum check_auth_result res;
@@ -12744,17 +12748,10 @@ static enum check_auth_result check_user_full(struct sip_pvt *p, struct sip_requ
        /* save the URI part of the From header */
        ast_string_field_set(p, from, of);
 
-       of2 = ast_strdupa(of);
 
        /* ignore all fields but name */
-       if (p->socket.type == SIP_TRANSPORT_TLS) {
-               if (parse_uri(of, "sips:", &of, &dummy, &domain, &dummy, &dummy, NULL)) {
-                       if (parse_uri(of2, "sip:", &of, &dummy, &domain, &dummy, &dummy, NULL))
-                               ast_log(LOG_NOTICE, "From address missing 'sip:', using it anyway\n");
-               }
-       } else {
-               if (parse_uri(of, "sip:", &of, &dummy, &domain, &dummy, &dummy, NULL))
-                       ast_log(LOG_NOTICE, "From address missing 'sip:', using it anyway\n");
+       if (parse_uri(of, "sip,sips", &of, &dummy, &domain, &dummy, &dummy, NULL)) {
+               ast_log(LOG_NOTICE, "From address missing 'sip:', using it anyway\n");
        }
 
        if (ast_strlen_zero(of)) {