Changeset 5872 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

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

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c (modified) (2 diffs)

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 */