Changeset 6004 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

Timestamp:

May 24, 2019 3:32:17 AM (4 years ago)

Author:

riza

Message:

Close #1017: TURN TLS transport implementation.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c (modified) (5 diffs)

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

@@ -239 +239 @@
         dst->turn_server = src->turn_server;
         dst->turn_auth_cred = src->turn_auth_cred;
+
+#if PJ_HAS_SSL_SOCK
+        pj_memcpy(&dst->turn_tls_setting, &src->turn_tls_setting,
+                  sizeof(src->turn_tls_setting));
+#endif
     } else {
         if (pj_stricmp(&dst->turn_server, &src->turn_server))
@@ -244 +249 @@
         pj_stun_auth_cred_dup(pool, &dst->turn_auth_cred,
                               &src->turn_auth_cred);
+
+#if PJ_HAS_SSL_SOCK
+        pj_turn_sock_tls_cfg_dup(pool, &dst->turn_tls_setting,
+                                 &src->turn_tls_setting);
+#endif
     }
 }
@@ -256 +266 @@
         pj_stun_auth_cred_dup(pool, &dst->turn_auth_cred,
                               &src->turn_auth_cred);
+
+#if PJ_HAS_SSL_SOCK
+        pj_turn_sock_tls_cfg_dup(pool, &dst->turn_tls_setting,
+                                 &src->turn_tls_setting);
+#endif
     }
 }
@@ -408 +423 @@
 
     cfg->turn_conn_type = PJ_TURN_TP_UDP;
+#if PJ_HAS_SSL_SOCK
+    pj_turn_sock_tls_cfg_default(&cfg->turn_tls_setting);
+#endif
     cfg->vid_preview_enable_native = PJ_TRUE;
 }
@@ -1928 +1946 @@
                 pjsua_acc_set_registration(i, PJ_FALSE);
             }
+#if PJ_HAS_SSL_SOCK
+            pj_turn_sock_tls_cfg_wipe_keys(
+                              &pjsua_var.acc[i].cfg.turn_cfg.turn_tls_setting);
+#endif
         }