Changeset 1979

Timestamp:

Jun 2, 2008 6:30:15 PM (16 years ago)

Author:

nanang

Message:

More ticket #61: enabled SRTP on Symbian

Location:

pjproject/trunk

Files:

• build.symbian/bld.inf (modified) (1 diff)
• build.symbian/libsrtp.mmp (added)
• build.symbian/pjlib_util.mmp (modified) (1 diff)
• build.symbian/pjmedia.mmp (modified) (2 diffs)
• build.symbian/symbian_ua.mmp (modified) (1 diff)
• pjlib/include/pj/config_site_sample.h (modified) (1 diff)
• pjsip-apps/src/symbian_ua/ua.cpp (modified) (2 diffs)
• pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp (modified) (2 diffs)

pjproject/trunk/build.symbian/bld.inf

@@ -18 +18 @@
 pjsip_ua.mmp
 pjsua_lib.mmp
+libsrtp.mmp
 
 /* Codecs */

pjproject/trunk/build.symbian/pjlib_util.mmp

@@ -30 +30 @@
 // PJLIB-UTIL files
 //
+SOURCE  base64.c
 SOURCE  crc32.c
 SOURCE  dns.c

pjproject/trunk/build.symbian/pjmedia.mmp

@@ -70 +70 @@
 SOURCE          transport_ice.c
 SOURCE          transport_udp.c
+SOURCE          transport_srtp.c
 SOURCE          wav_player.c
 SOURCE          wav_playlist.c
@@ -93 +94 @@
 SYSTEMINCLUDE   ..\pjlib-util\include 
 SYSTEMINCLUDE   ..\pjnath\include 
+SYSTEMINCLUDE   ..\third_party\srtp\include
+SYSTEMINCLUDE   ..\third_party\srtp\crypto\include
+SYSTEMINCLUDE   ..\third_party\build\srtp
 
 SYSTEMINCLUDE   \epoc32\include

pjproject/trunk/build.symbian/symbian_ua.mmp

@@ -32 +32 @@
         LIBRARY         pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib
         LIBRARY         pjnath.lib pjlib_util.lib pjlib.lib
-        LIBRARY         symbian_audio.lib
-        LIBRARY         libgsmcodec.lib
+        LIBRARY         symbian_audio.lib libsrtp.lib
+        LIBRARY         libgsmcodec.lib libspeexcodec.lib
 #else
         STATICLIBRARY   pjsua_lib.lib pjsip_ua.lib
         STATICLIBRARY   pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib
         STATICLIBRARY   pjnath.lib pjlib_util.lib pjlib.lib
-        STATICLIBRARY   symbian_audio.lib
+        STATICLIBRARY   symbian_audio.lib libsrtp.lib
         STATICLIBRARY   libgsmcodec.lib libspeexcodec.lib
 #endif

pjproject/trunk/pjlib/include/pj/config_site_sample.h

@@ -46 +46 @@
 
         /* SRTP has not been ported to Symbian yet */
-#   define PJMEDIA_HAS_SRTP                     0
+#   define PJMEDIA_HAS_SRTP                     1
 
     /* Disable these */

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

@@ -78 +78 @@
 #define USE_ICE         1
 
+//
+// Use SRTP?
+//
+#define USE_SRTP        PJSUA_DEFAULT_USE_SRTP
 
 //
@@ -290 +294 @@
     cfg.max_calls = 2;
     cfg.thread_cnt = 0; // Disable threading on Symbian
+    cfg.use_srtp = USE_SRTP;
+    cfg.srtp_secure_signaling = 0;
+    
     cfg.cb.on_incoming_call = &on_incoming_call;
     cfg.cb.on_call_media_state = &on_call_media_state;

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

@@ -27 +27 @@
 #define SIP_PORT        5060
 #define USE_ICE         0
+#define USE_SRTP        PJSUA_DEFAULT_USE_SRTP
 
 static RSocketServ aSocketServer;
@@ -303 +304 @@
     cfg.max_calls = 2;
     cfg.thread_cnt = 0; // Disable threading on Symbian
-    //cfg.use_srtp = 0;
-    //cfg.srtp_secure_signaling = 0;
+    cfg.use_srtp = USE_SRTP;
+    cfg.srtp_secure_signaling = 0;
 
     cfg.cb.on_incoming_call = &on_incoming_call;