Changeset 849 for pjproject

Timestamp:

Dec 8, 2006 9:58:31 PM (18 years ago)

Author:

bennylp

Message:

Initial implementation of TLS transport for ticket #3 (still not working at all)

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (8 diffs)
• pjsip/build/pjsip_core.dsp (modified) (2 diffs)
• pjsip/include/pjsip.h (modified) (1 diff)
• pjsip/include/pjsip/sip_config.h (modified) (1 diff)
• pjsip/include/pjsip/sip_transport_tls.h (added)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/src/pjsip/sip_transport_tls_ossl.c (added)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -41 +41 @@
     pj_bool_t               no_tcp;
     pj_bool_t               no_udp;
+    pj_bool_t               use_tls;
     pjsua_transport_config  udp_cfg;
     pjsua_transport_config  rtp_cfg;
@@ -138 +139 @@
     puts  ("  --use-stun1=host[:port]");
     puts  ("  --use-stun2=host[:port]  Resolve local IP with the specified STUN servers");
+#if defined(PJSIP_HAS_TLS_TRANSPORT) && PJSIP_HAS_TLS_TRANSPORT!=0
+    puts  ("  --use-tls           Enable TLS transport");
+    puts  ("  --tls-ca-file       Specify TLS CA file");
+    puts  ("  --tls-key-file      Specify TLS client key file");
+    puts  ("  --tls-password      Specify TLS password");
+#endif
     puts  ("");
     puts  ("Media Options:");
@@ -300 +307 @@
            OPT_DURATION, OPT_NO_TCP, OPT_NO_UDP, OPT_THREAD_CNT,
            OPT_NOREFERSUB,
+           OPT_USE_TLS, OPT_TLS_CA_FILE, OPT_TLS_KEY_FILE, OPT_TLS_PASSWORD,
     };
     struct pj_getopt_option long_options[] = {
@@ -354 +362 @@
         { "duration",   1, 0, OPT_DURATION},
         { "thread-cnt", 1, 0, OPT_THREAD_CNT},
+        { "use-tls",    0, 0, OPT_USE_TLS}, 
+        { "tls-ca-file",1, 0, OPT_TLS_CA_FILE},
+        { "tls-key-file",1,0, OPT_TLS_KEY_FILE}, 
+        { "tls-password",1,0, OPT_TLS_PASSWORD},
         { NULL, 0, 0, 0}
     };
@@ -775 +787 @@
             break;
 
+        case OPT_USE_TLS:
+            cfg->use_tls = PJ_TRUE;
+            break;
+            
+        case OPT_TLS_CA_FILE:
+            cfg->udp_cfg.tls_ca_file = pj_str(pj_optarg);
+            break;
+            
+        case OPT_TLS_KEY_FILE:
+            cfg->udp_cfg.tls_key_file = pj_str(pj_optarg);
+            break;
+            
+        case OPT_TLS_PASSWORD:
+            cfg->udp_cfg.tls_password = pj_str(pj_optarg);
+            break;
+
         default:
             PJ_LOG(1,(THIS_FILE, 
@@ -1003 +1031 @@
     }
 
+    /* TLS */
+    if (config->use_tls)
+        pj_strcat2(&cfg, "--use-tls\n");
+    if (config->udp_cfg.tls_ca_file.slen) {
+        pj_ansi_sprintf(line, "--tls-ca-file %.*s\n",
+                        (int)config->udp_cfg.tls_ca_file.slen, 
+                        config->udp_cfg.tls_ca_file.ptr);
+        pj_strcat2(&cfg, line);
+    }
+    if (config->udp_cfg.tls_key_file.slen) {
+        pj_ansi_sprintf(line, "--tls-key-file %.*s\n",
+                        (int)config->udp_cfg.tls_key_file.slen, 
+                        config->udp_cfg.tls_key_file.ptr);
+        pj_strcat2(&cfg, line);
+    }
+    if (config->udp_cfg.tls_password.slen) {
+        pj_ansi_sprintf(line, "--tls-password %.*s\n",
+                        (int)config->udp_cfg.tls_password.slen, 
+                        config->udp_cfg.tls_password.ptr);
+        pj_strcat2(&cfg, line);
+    }
 
     pj_strcat2(&cfg, "\n#\n# Media settings:\n#\n");
@@ -2765 +2814 @@
     }
 
-
     /* Add UDP transport unless it's disabled. */
     if (!app_config.no_udp) {
@@ -2778 +2826 @@
         pjsua_acc_set_online_status(current_acc, PJ_TRUE);
     }
+
+#if defined(PJSIP_HAS_TLS_TRANSPORT) && PJSIP_HAS_TLS_TRANSPORT!=0
+    /* Add TLS transport when application wants one */
+    if (app_config.use_tls) {
+        status = pjsua_transport_create(PJSIP_TRANSPORT_TLS,
+                                        &app_config.udp_cfg, 
+                                        &transport_id);
+        if (status != PJ_SUCCESS)
+            goto on_error;
+    }
+#endif
 
     if (transport_id == -1) {

pjproject/trunk/pjsip/build/pjsip_core.dsp

@@ -151 +151 @@
 # Begin Source File
 
+SOURCE=..\src\pjsip\sip_transport_tls_ossl.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\pjsip\sip_transport_udp.c
 # End Source File
@@ -287 +291 @@
 # Begin Source File
 
+SOURCE=..\include\pjsip\sip_transport_tls.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\include\pjsip\sip_transport_udp.h
 # End Source File

pjproject/trunk/pjsip/include/pjsip.h

@@ -41 +41 @@
 #include <pjsip/sip_transport_loop.h>
 #include <pjsip/sip_transport_tcp.h>
+#if defined(PJSIP_HAS_TLS_TRANSPORT) && PJSIP_HAS_TLS_TRANSPORT!=0
+#   include <pjsip/sip_transport_tls.h>
+#endif
 #include <pjsip/sip_resolve.h>
 

pjproject/trunk/pjsip/include/pjsip/sip_config.h

@@ -232 +232 @@
 #ifndef PJSIP_MAX_RESOLVED_ADDRESSES
 #   define PJSIP_MAX_RESOLVED_ADDRESSES     8
+#endif
+
+
+/**
+ * Enable TLS SIP transport support. For most systems this means that
+ * OpenSSL must be installed.
+ *
+ * Default: 0 (for now)
+ */
+#ifndef PJSIP_HAS_TLS_TRANSPORT
+#   define PJSIP_HAS_TLS_TRANSPORT          0
 #endif
 

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

@@ -840 +840 @@
      */
     pjsua_stun_config   stun_config;
+
+    /**
+     * TLS root CA file path (only used for TLS transport).
+     */
+    pj_str_t            tls_ca_file;
+
+    /**
+     * TLS client key path (only used for TLS transport).
+     */
+    pj_str_t            tls_key_file;
+
+    /**
+     * TLS password (only used for TLS transport).
+     */
+    pj_str_t            tls_password;
 
 } pjsua_transport_config;

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

@@ -1045 +1045 @@
         pjsua_var.tpdata[id].data.factory = tcp;
 
+#if defined(PJSIP_HAS_TLS_TRANSPORT) && PJSIP_HAS_TLS_TRANSPORT!=0
+    } else if (type == PJSIP_TRANSPORT_TLS) {
+        /*
+         * Create TLS transport.
+         */
+        pjsip_tpfactory *tls;
+
+        status = pjsip_tls_transport_start(pjsua_var.endpt, 
+                                           &cfg->tls_key_file,
+                                           &cfg->tls_password, 
+                                           &cfg->tls_ca_file,
+                                           NULL, NULL, 1, &tls);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Error creating SIP TLS listener", 
+                         status);
+            goto on_return;
+        }
+
+        /* Save the transport */
+        pjsua_var.tpdata[id].type = type;
+        pjsua_var.tpdata[id].local_name = tls->addr_name;
+        pjsua_var.tpdata[id].data.factory = tls;
+#endif
+
     } else {
         status = PJSIP_EUNSUPTRANSPORT;