Changeset 2913 for pjproject

Timestamp:

Aug 27, 2009 7:55:13 PM (15 years ago)

Author:

nanang

Message:

Ticket #957: Initial version of TLS transport for Symbian, includes:

• Secure socket, generic abstraction and Symbian implementation (using CSecureSocket).
• Initial rewriting of SIP TLS transport.
• Updated symbian_ua.mmp to support SIP transport TLS (experimental).

Location:

pjproject/trunk

Files:

• build.symbian/pjlib.mmp (modified) (1 diff)
• build.symbian/pjsip.mmp (modified) (1 diff)
• build.symbian/symbian_ua.mmp (modified) (1 diff)
• pjlib/include/pj/ssl_sock.h (added)
• pjlib/src/pj/ssl_sock_common.c (added)
• pjlib/src/pj/ssl_sock_symbian.cpp (added)
• pjsip-apps/src/symbian_ua/ua.cpp (modified) (5 diffs)
• pjsip/src/pjsip/sip_transport_tls.c (added)

pjproject/trunk/build.symbian/pjlib.mmp

@@ -72 +72 @@
 SOURCE          os_timestamp_posix.c
 SOURCE          pool_policy_new.cpp
+SOURCE          ssl_sock_common.c
+SOURCE          ssl_sock_symbian.cpp
 SOURCE          sock_symbian.cpp
 SOURCE          sock_select_symbian.cpp

pjproject/trunk/build.symbian/pjsip.mmp

@@ -52 +52 @@
 SOURCE  sip_transport_tcp.c
 SOURCE  sip_transport_udp.c
+SOURCE  sip_transport_tls.c
 SOURCE  sip_ua_layer.c
 SOURCE  sip_uri.c

pjproject/trunk/build.symbian/symbian_ua.mmp

@@ -70 +70 @@
 #endif
 
-LIBRARY                 esock.lib insock.lib charconv.lib euser.lib estlib.lib commdb.lib apengine.lib 
+LIBRARY                 esock.lib insock.lib charconv.lib euser.lib estlib.lib commdb.lib apengine.lib securesocket.lib 
 
 // The default 8KB seems to be insufficient with all bells and

pjproject/trunk/pjsip-apps/src/symbian_ua/ua.cpp

@@ -36 +36 @@
 // Destination URI (to make call, or to subscribe presence)
 //
-#define SIP_DST_URI     "sip:100@pjsip.lab"
+#define SIP_DST_URI     "<sip:100@pjsip.lab>"
 
 //
@@ -53 +53 @@
 
 //
-// Set to 1 if TCP is desired (experimental)
-//
-#define ENABLE_SIP_TCP  0
+// SIP transports
+//
+#define ENABLE_SIP_UDP  1
+#define ENABLE_SIP_TCP  0 // experimental
+#define ENABLE_SIP_TLS  0 // experimental
 
 //
@@ -374 +376 @@
                 &codec_id, PJMEDIA_CODEC_PRIO_DISABLED);
     }
-    
-    /* Add UDP transport. */
+
+    
     pjsua_transport_config tcfg;
     pjsua_transport_id tid;
 
+#if ENABLE_SIP_UDP
+    /* Add UDP transport. */
     pjsua_transport_config_default(&tcfg);
     tcfg.port = SIP_PORT;
@@ -387 +391 @@
             return status;
     }
-
+#endif
+    
+#if ENABLE_SIP_TCP
     /* Add TCP transport */
-#if ENABLE_SIP_TCP
     pjsua_transport_config_default(&tcfg);
     tcfg.port = SIP_PORT;
@@ -395 +400 @@
     if (status != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, "Error creating TCP transport", status);
+            pjsua_destroy();
+            return status;
+    }
+#endif
+    
+#if ENABLE_SIP_TLS
+    /* Add TLS transport */
+    pjsua_transport_config_default(&tcfg);
+    tcfg.port = SIP_PORT + 1;
+    status = pjsua_transport_create(PJSIP_TRANSPORT_TLS, &tcfg, &tid);
+    if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Error creating TLS transport", status);
             pjsua_destroy();
             return status;