Changeset 1979


Ignore:
Timestamp:
Jun 2, 2008 6:30:15 PM (11 years ago)
Author:
nanang
Message:

More ticket #61: enabled SRTP on Symbian

Location:
pjproject/trunk
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/build.symbian/bld.inf

    r1978 r1979  
    1818pjsip_ua.mmp 
    1919pjsua_lib.mmp 
     20libsrtp.mmp 
    2021 
    2122/* Codecs */ 
  • pjproject/trunk/build.symbian/pjlib_util.mmp

    r1765 r1979  
    3030// PJLIB-UTIL files 
    3131// 
     32SOURCE  base64.c 
    3233SOURCE  crc32.c 
    3334SOURCE  dns.c 
  • pjproject/trunk/build.symbian/pjmedia.mmp

    r1965 r1979  
    7070SOURCE          transport_ice.c 
    7171SOURCE          transport_udp.c 
     72SOURCE          transport_srtp.c 
    7273SOURCE          wav_player.c 
    7374SOURCE          wav_playlist.c 
     
    9394SYSTEMINCLUDE   ..\pjlib-util\include  
    9495SYSTEMINCLUDE   ..\pjnath\include  
     96SYSTEMINCLUDE   ..\third_party\srtp\include 
     97SYSTEMINCLUDE   ..\third_party\srtp\crypto\include 
     98SYSTEMINCLUDE   ..\third_party\build\srtp 
    9599 
    96100SYSTEMINCLUDE   \epoc32\include 
  • pjproject/trunk/build.symbian/symbian_ua.mmp

    r1965 r1979  
    3232        LIBRARY         pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib 
    3333        LIBRARY         pjnath.lib pjlib_util.lib pjlib.lib 
    34         LIBRARY         symbian_audio.lib 
    35         LIBRARY         libgsmcodec.lib 
     34        LIBRARY         symbian_audio.lib libsrtp.lib 
     35        LIBRARY         libgsmcodec.lib libspeexcodec.lib 
    3636#else 
    3737        STATICLIBRARY   pjsua_lib.lib pjsip_ua.lib 
    3838        STATICLIBRARY   pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib 
    3939        STATICLIBRARY   pjnath.lib pjlib_util.lib pjlib.lib 
    40         STATICLIBRARY   symbian_audio.lib 
     40        STATICLIBRARY   symbian_audio.lib libsrtp.lib 
    4141        STATICLIBRARY   libgsmcodec.lib libspeexcodec.lib 
    4242#endif 
  • pjproject/trunk/pjlib/include/pj/config_site_sample.h

    r1971 r1979  
    4646 
    4747        /* SRTP has not been ported to Symbian yet */ 
    48 #   define PJMEDIA_HAS_SRTP                     0 
     48#   define PJMEDIA_HAS_SRTP                     1 
    4949 
    5050    /* Disable these */ 
  • pjproject/trunk/pjsip-apps/src/symbian_ua/ua.cpp

    r1965 r1979  
    7878#define USE_ICE         1 
    7979 
     80// 
     81// Use SRTP? 
     82// 
     83#define USE_SRTP        PJSUA_DEFAULT_USE_SRTP 
    8084 
    8185// 
     
    290294    cfg.max_calls = 2; 
    291295    cfg.thread_cnt = 0; // Disable threading on Symbian 
     296    cfg.use_srtp = USE_SRTP; 
     297    cfg.srtp_secure_signaling = 0; 
     298     
    292299    cfg.cb.on_incoming_call = &on_incoming_call; 
    293300    cfg.cb.on_call_media_state = &on_call_media_state; 
  • pjproject/trunk/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp

    r1973 r1979  
    2727#define SIP_PORT        5060 
    2828#define USE_ICE         0 
     29#define USE_SRTP        PJSUA_DEFAULT_USE_SRTP 
    2930 
    3031static RSocketServ aSocketServer; 
     
    303304    cfg.max_calls = 2; 
    304305    cfg.thread_cnt = 0; // Disable threading on Symbian 
    305     //cfg.use_srtp = 0; 
    306     //cfg.srtp_secure_signaling = 0; 
     306    cfg.use_srtp = USE_SRTP; 
     307    cfg.srtp_secure_signaling = 0; 
    307308 
    308309    cfg.cb.on_incoming_call = &on_incoming_call; 
Note: See TracChangeset for help on using the changeset viewer.