Changeset 4592 for pjproject

Timestamp:

Sep 6, 2013 10:04:39 AM (11 years ago)

Author:

nanang

Message:

Fixed #1698: Follow account config in generating contact's secure scheme and deprecate PJSUA_SECURE_SCHEME.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (1 diff)
• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsua-lib/pjsua_acc.c (modified) (6 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -2535 +2535 @@
 
 /**
- * This macro specifies the URI scheme to use in Contact header
- * when secure transport such as TLS is used. Application can specify
- * either "sip" or "sips".
- */
-#ifndef PJSUA_SECURE_SCHEME
-#   define PJSUA_SECURE_SCHEME          "sip"
-#endif
-
-
-/**
  * Maximum time to wait for unpublication transaction(s) to complete
  * during shutdown process, before sending unregistration. The library

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -215 +215 @@
     pj_str_t         display;       /**< Display name, if any.          */
     pj_str_t         user_part;     /**< User part of local URI.        */
+    pj_bool_t        is_sips;       /**< Local URI uses "sips"?         */
     pj_str_t         contact;       /**< Our Contact header.            */
     pj_str_t         reg_contact;   /**< Contact header for REGISTER.

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -202 +202 @@
         acc->srv_port = 0;
     }
+    acc->is_sips = PJSIP_URI_SCHEME_IS_SIPS(name_addr);
 
 
@@ -912 +913 @@
         pj_strdup_with_null(acc->pool, &acc->srv_domain, &id_sip_uri->host);
         acc->srv_port = 0;
+        acc->is_sips = PJSIP_URI_SCHEME_IS_SIPS(id_name_addr);
         update_reg = PJ_TRUE;
         unreg_first = PJ_TRUE;
@@ -1705 +1707 @@
         char transport_param[32];
         int len;
+        pj_bool_t secure;
+
+        secure = pjsip_transport_get_flag_from_type(tp->key.type) &
+                 PJSIP_TRANSPORT_SECURE;
 
         /* Enclose IPv6 address in square brackets */
@@ -1728 +1734 @@
         tmp = (char*) pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE);
         len = pj_ansi_snprintf(tmp, PJSIP_MAX_URL_SIZE,
-                               "<sip:%.*s%s%s%.*s%s:%d%s%.*s%s>%.*s",
+                               "<%s:%.*s%s%s%.*s%s:%d%s%.*s%s>%.*s",
+                               ((secure && acc->is_sips)? "sips" : "sip"),
                                (int)acc->user_part.slen,
                                acc->user_part.ptr,
@@ -3080 +3087 @@
                                      acc->display.ptr,
                                      (acc->display.slen?"\" " : ""),
-                                     (secure ? PJSUA_SECURE_SCHEME : "sip"),
+                                     ((secure && acc->is_sips)? "sips" : "sip"),
                                      (int)acc->user_part.slen,
                                      acc->user_part.ptr,
@@ -3251 +3258 @@
                                      acc->display.ptr,
                                      (acc->display.slen?"\" " : ""),
-                                     (secure ? PJSUA_SECURE_SCHEME : "sip"),
+                                     ((secure && acc->is_sips)? "sips" : "sip"),
                                      (int)acc->user_part.slen,
                                      acc->user_part.ptr,