Changeset 5872

Timestamp:

Sep 3, 2018 7:13:40 AM (6 years ago)

Author:

ming

Message:

Re #2100: Fixed duplication of crypto names and keys to use pj_strdup(). Otherwise, when the account/global config's input strings are modified (or deallocated) after being passed to PJSIP, then the crypto name matching will fail and we will generate error: PJMEDIA_SRTP_ENOTSUPCRYPTO

Location:

pjproject/trunk/pjsip

Files:

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

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

@@ -4078 +4078 @@
 
 /**
+ * Duplicate SRTP transport setting. If the \a pool argument is NULL,
+ * a simple memcpy() will be used.
+ *
+ * @param pool      Memory to duplicate strings.
+ * @param dst       Destination setting.
+ * @param src       Source setting.
+ * @param check_str If set to TRUE, the function will check if strings
+ *                  are identical before copying. Identical strings
+ *                  will not be duplicated.
+ *                  If set to FALSE, all strings will be duplicated.
+ */
+PJ_DECL(void) pjsua_srtp_opt_dup(pj_pool_t *pool, pjsua_srtp_opt *dst,
+                                 const pjsua_srtp_opt *src,
+                                 pj_bool_t check_str);
+
+
+/**
  * Call this function to initialize account config with default values.
  *

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

@@ -140 +140 @@
     pjsua_turn_config_dup(pool, &dst->turn_cfg, &src->turn_cfg);
 
+    pjsua_srtp_opt_dup(pool, &dst->srtp_opt, &src->srtp_opt, PJ_FALSE);
+
     pj_strdup(pool, &dst->ka_data, &src->ka_data);
 
@@ -1424 +1426 @@
     acc->cfg.ip_change_cfg.hangup_calls = cfg->ip_change_cfg.hangup_calls;    
     acc->cfg.ip_change_cfg.reinvite_flags = cfg->ip_change_cfg.reinvite_flags;
+
+    /* SRTP setting */
+    pjsua_srtp_opt_dup(acc->pool, &acc->cfg.srtp_opt, &cfg->srtp_opt,
+                       PJ_TRUE);
 
     /* RTCP-FB config */

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

@@ -144 +144 @@
         pj_strdup_with_null(pool, &dst->stun_srv[i], &src->stun_srv[i]);
     }
+
+    pjsua_srtp_opt_dup(pool, &dst->srtp_opt, &src->srtp_opt, PJ_FALSE);
 }
 
@@ -261 +263 @@
 {
     pj_bzero(cfg, sizeof(*cfg));
+}
+
+
+PJ_DEF(void) pjsua_srtp_opt_dup( pj_pool_t *pool, pjsua_srtp_opt *dst,
+                                 const pjsua_srtp_opt *src,
+                                 pj_bool_t check_str)
+{
+    pj_memcpy(dst, src, sizeof(*src));
+    if (pool) {
+        unsigned i;
+        
+        for (i = 0; i < src->crypto_count; i++) {
+            if (!check_str ||
+                pj_stricmp(&dst->crypto[i].key, &src->crypto[i].key))
+            {
+                pj_strdup(pool, &dst->crypto[i].key, &src->crypto[i].key);
+            }
+            if (!check_str ||
+                pj_stricmp(&dst->crypto[i].name, &src->crypto[i].name))
+            {
+                pj_strdup(pool, &dst->crypto[i].name, &src->crypto[i].name);
+            }
+        }
+    }
 }