Changeset 1698

Timestamp:

Jan 17, 2008 5:29:36 PM (17 years ago)

Author:

nanang

Message:

Ticket #452:

• Add directory srtp to third_party/build directory
• Add libsrtp project & integrate it to pjproject vs8 solution
• Add transport_srtp.h & .c
• Modify project dependencies to include libsrtp
• Modify Samples-vc.mak, add libsrtp as third party library
• Modify transport interface
• Modify transport_ice & transport_udp to accomodate new transport interface
• Modify other files that uses transport

Location:

pjproject/branches/users/nanang

Files:

• pjmedia/build/pjmedia.vcproj (modified) (4 diffs)
• pjmedia/include/pjmedia.h (modified) (1 diff)
• pjmedia/include/pjmedia/transport.h (modified) (4 diffs)
• pjmedia/include/pjmedia/transport_ice.h (modified) (4 diffs)
• pjmedia/include/pjmedia/transport_srtp.h (added)
• pjmedia/include/pjmedia/transport_udp.h (modified) (3 diffs)
• pjmedia/src/pjmedia/transport_ice.c (modified) (24 diffs)
• pjmedia/src/pjmedia/transport_srtp.c (added)
• pjmedia/src/pjmedia/transport_udp.c (modified) (7 diffs)
• pjproject-vs8.sln (modified) (5 diffs)
• pjsip-apps/build/Samples-vc.mak (modified) (1 diff)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (4 diffs)
• pjsip-apps/src/samples/simpleua.c (modified) (1 diff)
• pjsip-apps/src/samples/siprtp.c (modified) (3 diffs)
• pjsip-apps/src/samples/streamutil.c (modified) (13 diffs)
• pjsip/include/pjsip-ua/sip_inv.h (modified) (2 diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• pjsip/src/pjsip-ua/sip_inv.c (modified) (5 diffs)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (9 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (10 diffs)
• third_party/build/srtp (added)
• third_party/build/srtp/config.h (added)
• third_party/build/srtp/libsrtp.vcproj (added)
• third_party/build/srtp/output (added)

pjproject/branches/users/nanang/pjmedia/build/pjmedia.vcproj

@@ -44 +44 @@
                                 Optimization="2"
                                 InlineFunctionExpansion="1"
-                                AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../.."
+                                AdditionalIncludeDirectories="../include;../../pjlib/include;"../../pjlib-util/include";../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../.."
                                 PreprocessorDefinitions="NDEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1"
                                 StringPooling="true"
@@ -120 +120 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../.."
+                                AdditionalIncludeDirectories="../include;../../pjlib/include;"../../pjlib-util/include";../../pjnath/include;../../third_party/portaudio/include;../../third_party/speex/include;../../third_party/build/srtp;../../third_party/srtp/include;../../third_party/srtp/crypto/include;../.."
                                 PreprocessorDefinitions="_DEBUG;WIN32;_LIB;PJ_WIN32=1;PJ_M_I386=1"
                                 MinimalRebuild="true"
@@ -967 +967 @@
                         </File>
                         <File
+                                RelativePath="..\src\pjmedia\transport_srtp.c"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\pjmedia\transport_udp.c"
                                 >
@@ -1218 +1222 @@
                         </File>
                         <File
+                                RelativePath="..\include\pjmedia\transport_srtp.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\include\pjmedia\transport_udp.h"
                                 >

pjproject/branches/users/nanang/pjmedia/include/pjmedia.h

@@ -55 +55 @@
 #include <pjmedia/transport.h>
 #include <pjmedia/transport_ice.h>
+#include <pjmedia/transport_srtp.h>
 #include <pjmedia/transport_udp.h>
 #include <pjmedia/wav_playlist.h>

pjproject/branches/users/nanang/pjmedia/include/pjmedia/transport.h

@@ -172 +172 @@
  */
 typedef struct pjmedia_transport pjmedia_transport;
+typedef struct pjmedia_sdp_session pjmedia_sdp_session;
 
 
@@ -243 +244 @@
                              const void *pkt,
                              pj_size_t size);
+
+    /**
+     * This function is called by application to generate the SDP parts
+     * related to transport type, e.g: ICE, SRTP.
+     *
+     * Application should call #pjmedia_transport_media_create() instead of 
+     * calling this function directly.
+     */
+    pj_status_t (*media_create)(pjmedia_transport *tp,
+                                pj_pool_t *pool,
+                                pjmedia_sdp_session *sdp_local,
+                                const pjmedia_sdp_session *sdp_remote);
+
+    /**
+     * This function is called by application to start the transport
+     * based on SDP negotiation result.
+     *
+     * Application should call #pjmedia_transport_media_start() instead of 
+     * calling this function directly.
+     */
+    pj_status_t (*media_start) (pjmedia_transport *tp,
+                                pj_pool_t *pool,
+                                pjmedia_sdp_session *sdp_local,
+                                const pjmedia_sdp_session *sdp_remote,
+                                unsigned media_index);
+
+    /**
+     * This function is called by application to stop the transport.
+     *
+     * Application should call #pjmedia_transport_media_stop() instead of 
+     * calling this function directly.
+     */
+    pj_status_t (*media_stop)  (pjmedia_transport *tp);
+
+    /**
+     * This function can be called to simulate packet lost.
+     *
+     * Application should call #pjmedia_transport_simulate_lost() instead of 
+     * calling this function directly.
+     */
+    pj_status_t (*simulate_lost)(pjmedia_transport *tp,
+                                 pjmedia_dir dir,
+                                 unsigned pct_lost);
 
     /**
@@ -411 +455 @@
 
 /**
+ * Generate local SDP parts that are related to the specified media transport.
+ * Remote SDP might be needed as reference when application is in deciding
+ * side of negotiation (callee side), otherwise it should be NULL.
+ * This is just a simple wrapper which calls <tt>media_create()</tt> member 
+ * of the transport.
+ *
+ * @param tp            The media transport.
+ * @param pool          The memory pool.
+ * @param sdp_local     Local SDP.
+ * @param sdp_remote    Remote SDP.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_INLINE(pj_status_t) pjmedia_transport_media_create(pjmedia_transport *tp,
+                                    pj_pool_t *pool,
+                                    pjmedia_sdp_session *sdp_local,
+                                    const pjmedia_sdp_session *sdp_remote)
+{
+    return (*tp->op->media_create)(tp, pool, sdp_local, sdp_remote);
+}
+
+/**
+ * Start the transport with regards to SDP negotiation result. 
+ * This is just a simple wrapper which calls <tt>media_start()</tt> member 
+ * of the transport.
+ *
+ * @param tp            The media transport.
+ * @param pool          The memory pool.
+ * @param sdp_local     Local SDP.
+ * @param sdp_remote    Remote SDP.
+ * @param media_index   Media index to start.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_INLINE(pj_status_t) pjmedia_transport_media_start(pjmedia_transport *tp,
+                                    pj_pool_t *pool,
+                                    pjmedia_sdp_session *sdp_local,
+                                    const pjmedia_sdp_session *sdp_remote,
+                                    unsigned media_index)
+{
+    return (*tp->op->media_start)(tp, pool, sdp_local, sdp_remote, media_index);
+}
+
+
+/**
+ * Stop the transport. 
+ * This is just a simple wrapper which calls <tt>media_stop()</tt> member 
+ * of the transport.
+ *
+ * @param tp            The media transport.
+ *
+ * @return              PJ_SUCCESS on success, or the appropriate error code.
+ */
+PJ_INLINE(pj_status_t) pjmedia_transport_media_stop(pjmedia_transport *tp)
+{
+    return (*tp->op->media_stop)(tp);
+}
+
+/**
  * Close media transport. This is just a simple wrapper which calls 
  * <tt>destroy()</tt> member of the transport. This function will free
@@ -427 +530 @@
 }
 
+/**
+ * Simulate packet lost in the specified direction (for testing purposes).
+ * When enabled, the transport will randomly drop packets to the specified
+ * direction.
+ *
+ * @param tp        The media transport.
+ * @param dir       Media direction to which packets will be randomly dropped.
+ * @param pct_lost  Percent lost (0-100). Set to zero to disable packet
+ *                  lost simulation.
+ *
+ * @return          PJ_SUCCESS on success.
+ */
+PJ_INLINE(pj_status_t) pjmedia_transport_simulate_lost(pjmedia_transport *tp,
+                                                       pjmedia_dir dir,
+                                                       unsigned pct_lost)
+{
+    return (*tp->op->simulate_lost)(tp, dir, pct_lost);
+}
+
 
 PJ_END_DECL

pjproject/branches/users/nanang/pjmedia/include/pjmedia/transport_ice.h

@@ -17 +17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#ifndef __pjmedia_ice_H__
-#define __pjmedia_ice_H__
+#ifndef __PJMEDIA_TRANSPORT_ICE_H__
+#define __PJMEDIA_TRANSPORT_ICE_H__
 
 
@@ -75 +75 @@
                                         const pjmedia_ice_cb *cb,
                                         pjmedia_transport **p_tp);
-
-/**
- * Destroy the media transport.
- *
- * @param tp            The media transport.
- *
- * @return              PJ_SUCCESS.
- */
-PJ_DECL(pj_status_t) pjmedia_ice_destroy(pjmedia_transport *tp);
 
 
@@ -170 +161 @@
                                           const pj_str_t *local_passwd);
 
-/**
- * Modify the SDP to add ICE specific SDP attributes before sending
- * the SDP to remote host.
- *
- * @param tp            The media transport.
- * @param pool          Pool to allocate memory for the SDP elements.
- * @param sdp           The SDP descriptor to be modified.
- *
- * @return              PJ_SUCCESS, or the appropriate error code.
- */
-PJ_DECL(pj_status_t) pjmedia_ice_modify_sdp(pjmedia_transport *tp,
-                                            pj_pool_t *pool,
-                                            pjmedia_sdp_session *sdp);
-
-/**
- * Start ICE connectivity checks.
- *
- * This function will pair the local and remote candidates to create 
- * check list. Once the check list is created and sorted based on the
- * priority, ICE periodic checks will be started. This function will 
- * return immediately, and application will be notified about the 
- * connectivity check status in the callback.
- *
- * @param tp            The media transport.
- * @param pool          Memory pool to parse the SDP.
- * @param rem_sdp       The SDP received from remote agent.
- * @param media_index   The media index (in SDP) to process.
- *
- * @return              PJ_SUCCESS, or the appropriate error code.
- */
-PJ_DECL(pj_status_t) pjmedia_ice_start_ice(pjmedia_transport *tp,
-                                           pj_pool_t *pool,
-                                           const pjmedia_sdp_session *rem_sdp,
-                                           unsigned media_index);
-
-/**
- * Stop the ICE session (typically when the call is terminated). Application
- * may restart the ICE session again by calling #pjmedia_ice_init_ice(),
- * for example to use this media transport for the next call.
- *
- * @param tp            The media transport.
- *
- * @return              PJ_SUCCESS, or the appropriate error code.
- */
-PJ_DECL(pj_status_t) pjmedia_ice_stop_ice(pjmedia_transport *tp);
-
-
-/**
- * Simulate packet lost in the specified direction (for testing purposes).
- * When enabled, the transport will randomly drop packets to the specified
- * direction.
- *
- * @param tp        The ICE media transport.
- * @param dir       Media direction to which packets will be randomly dropped.
- * @param pct_lost  Percent lost (0-100). Set to zero to disable packet
- *                  lost simulation.
- *
- * @return          PJ_SUCCESS on success.
- */
-PJ_DECL(pj_status_t) pjmedia_ice_simulate_lost(pjmedia_transport *tp,
-                                               pjmedia_dir dir,
-                                               unsigned pct_lost);
-
-
-
 
 PJ_END_DECL
@@ -244 +170 @@
 
 
-#endif  /* __pjmedia_ice_H__ */
+#endif  /* __PJMEDIA_TRANSPORT_ICE_H__ */
 
 

pjproject/branches/users/nanang/pjmedia/include/pjmedia/transport_udp.h

@@ -54 +54 @@
     PJMEDIA_UDP_NO_SRC_ADDR_CHECKING = 1
 };
-
-
-/**
- * UDP transport info.
- */
-typedef struct pjmedia_transport_udp_info
-{
-    /**
-     * Media socket info.
-     */
-    pjmedia_sock_info   skinfo;
-
-} pjmedia_transport_udp_info;
 
 
@@ -138 +125 @@
                                                    pjmedia_transport **p_tp);
 
-/**
- * Get media socket info from the specified UDP transport.
- *
- * @param tp        The UDP transport interface.
- * @param info      Media socket info to be initialized.
- *
- * @return          PJ_SUCCESS on success.
- */
-PJ_DECL(pj_status_t) 
-pjmedia_transport_udp_get_info( pjmedia_transport *tp,
-                                pjmedia_transport_udp_info *info);
-
 
 /**
@@ -170 +145 @@
 
 
-/**
- * Simulate packet lost in the specified direction (for testing purposes).
- * When enabled, the transport will randomly drop packets to the specified
- * direction.
- *
- * @param tp        The UDP media transport.
- * @param dir       Media direction to which packets will be randomly dropped.
- * @param pct_lost  Percent lost (0-100). Set to zero to disable packet
- *                  lost simulation.
- *
- * @return          PJ_SUCCESS on success.
- */
-PJ_DECL(pj_status_t) pjmedia_transport_udp_simulate_lost(pjmedia_transport *tp,
-                                                         pjmedia_dir dir,
-                                                         unsigned pct_lost);
-
-
-
-/**
- * Close UDP transport. Application can also use the "destroy" member of
- * media transport interface to close the UDP transport.
- *
- * @param tp        The UDP media transport.
- *
- * @return          PJ_SUCCESS on success.
- */
-PJ_DECL(pj_status_t) pjmedia_transport_udp_close(pjmedia_transport *tp);
-
-
-
 PJ_END_DECL
 

pjproject/branches/users/nanang/pjmedia/src/pjmedia/transport_ice.c

@@ -52 +52 @@
  * These are media transport operations.
  */
-static pj_status_t tp_get_info(pjmedia_transport *tp,
-                               pjmedia_sock_info *info);
-static pj_status_t tp_attach( pjmedia_transport *tp,
-                              void *stream,
-                              const pj_sockaddr_t *rem_addr,
-                              const pj_sockaddr_t *rem_rtcp,
-                              unsigned addr_len,
-                              void (*rtp_cb)(void*,
-                                             const void*,
-                                             pj_ssize_t),
-                              void (*rtcp_cb)(void*,
-                                              const void*,
-                                              pj_ssize_t));
-static void        tp_detach( pjmedia_transport *tp,
-                              void *strm);
-static pj_status_t tp_send_rtp( pjmedia_transport *tp,
-                                const void *pkt,
-                                pj_size_t size);
-static pj_status_t tp_send_rtcp( pjmedia_transport *tp,
-                                 const void *pkt,
-                                 pj_size_t size);
+static pj_status_t transport_get_info (pjmedia_transport *tp,
+                                       pjmedia_sock_info *info);
+static pj_status_t transport_attach   (pjmedia_transport *tp,
+                                       void *user_data,
+                                       const pj_sockaddr_t *rem_addr,
+                                       const pj_sockaddr_t *rem_rtcp,
+                                       unsigned addr_len,
+                                       void (*rtp_cb)(void*,
+                                                      const void*,
+                                                      pj_ssize_t),
+                                       void (*rtcp_cb)(void*,
+                                                       const void*,
+                                                       pj_ssize_t));
+static void        transport_detach   (pjmedia_transport *tp,
+                                       void *strm);
+static pj_status_t transport_send_rtp( pjmedia_transport *tp,
+                                       const void *pkt,
+                                       pj_size_t size);
+static pj_status_t transport_send_rtcp(pjmedia_transport *tp,
+                                       const void *pkt,
+                                       pj_size_t size);
+static pj_status_t transport_media_create(pjmedia_transport *tp,
+                                       pj_pool_t *pool,
+                                       pjmedia_sdp_session *sdp_local,
+                                       const pjmedia_sdp_session *sdp_remote);
+static pj_status_t transport_media_start (pjmedia_transport *tp,
+                                       pj_pool_t *pool,
+                                       pjmedia_sdp_session *sdp_local,
+                                       const pjmedia_sdp_session *sdp_remote,
+                                       unsigned media_index);
+static pj_status_t transport_media_stop(pjmedia_transport *tp);
+static pj_status_t transport_simulate_lost(pjmedia_transport *tp,
+                                       pjmedia_dir dir,
+                                       unsigned pct_lost);
+static pj_status_t transport_destroy  (pjmedia_transport *tp);
 
 /*
@@ -85 +99 @@
 
 
-static pjmedia_transport_op tp_ice_op = 
-{
-    &tp_get_info,
-    &tp_attach,
-    &tp_detach,
-    &tp_send_rtp,
-    &tp_send_rtcp,
-    &pjmedia_ice_destroy
+static pjmedia_transport_op transport_ice_op = 
+{
+    &transport_get_info,
+    &transport_attach,
+    &transport_detach,
+    &transport_send_rtp,
+    &transport_send_rtcp,
+    &transport_media_create,
+    &transport_media_start,
+    &transport_media_stop,
+    &transport_simulate_lost,
+    &transport_destroy
 };
 
@@ -133 +151 @@
     tp_ice->ice_st = ice_st;
     pj_ansi_strcpy(tp_ice->base.name, ice_st->obj_name);
-    tp_ice->base.op = &tp_ice_op;
+    tp_ice->base.op = &transport_ice_op;
     tp_ice->base.type = PJMEDIA_TRANSPORT_TYPE_ICE;
 
@@ -144 +162 @@
     if (p_tp)
         *p_tp = &tp_ice->base;
-
-    return PJ_SUCCESS;
-}
-
-
-/*
- * Destroy ICE media transport.
- */
-PJ_DEF(pj_status_t) pjmedia_ice_destroy(pjmedia_transport *tp)
-{
-    struct transport_ice *tp_ice = (struct transport_ice*)tp;
-
-    if (tp_ice->ice_st) {
-        pj_ice_strans_destroy(tp_ice->ice_st);
-        /*Must not touch tp_ice after ice_st is destroyed!
-         (it has the pool)
-         tp_ice->ice_st = NULL;
-         */
-    }
 
     return PJ_SUCCESS;
@@ -231 +230 @@
                      comp, PJ_EINVAL);
 
-    pj_memcpy(comp, tp_ice->ice_st->comp[comp_id-1], sizeof(pj_ice_strans_comp));
+    pj_memcpy(comp, tp_ice->ice_st->comp[comp_id-1], 
+              sizeof(pj_ice_strans_comp));
     return PJ_SUCCESS;              
 }
@@ -247 +247 @@
 {
     struct transport_ice *tp_ice = (struct transport_ice*)tp;
-    return pj_ice_strans_init_ice(tp_ice->ice_st, role, local_ufrag, local_passwd);
+    return pj_ice_strans_init_ice(tp_ice->ice_st, role, local_ufrag, 
+                                  local_passwd);
 }
 
@@ -255 +256 @@
  * This will add ICE attributes to the SDP.
  */
-PJ_DEF(pj_status_t) pjmedia_ice_modify_sdp(pjmedia_transport *tp,
-                                           pj_pool_t *pool,
-                                           pjmedia_sdp_session *sdp)
+static pj_status_t transport_media_create(pjmedia_transport *tp,
+                                       pj_pool_t *pool,
+                                       pjmedia_sdp_session *sdp_local,
+                                       const pjmedia_sdp_session *sdp_remote)
 {
     struct transport_ice *tp_ice = (struct transport_ice*)tp;
@@ -265 +267 @@
     unsigned i, cand_cnt;
 
+    PJ_UNUSED_ARG(sdp_remote);
+
     buffer = (char*) pj_pool_alloc(pool, MAXLEN);
 
@@ -270 +274 @@
     attr = pjmedia_sdp_attr_create(pool, "ice-ufrag", 
                                    &tp_ice->ice_st->ice->rx_ufrag);
-    sdp->attr[sdp->attr_count++] = attr;
+    sdp_local->attr[sdp_local->attr_count++] = attr;
 
     /* Create ice-pwd attribute */
     attr = pjmedia_sdp_attr_create(pool, "ice-pwd", 
                                    &tp_ice->ice_st->ice->rx_pass);
-    sdp->attr[sdp->attr_count++] = attr;
+    sdp_local->attr[sdp_local->attr_count++] = attr;
 
     /* Add all candidates (to media level) */
@@ -330 +334 @@
         value = pj_str(buffer);
         attr = pjmedia_sdp_attr_create(pool, "candidate", &value);
-        sdp->media[0]->attr[sdp->media[0]->attr_count++] = attr;
+        sdp_local->media[0]->attr[sdp_local->media[0]->attr_count++] = attr;
     }
 
@@ -457 +461 @@
     PJ_LOG(4,(tp_ice->ice_st->obj_name, 
               "Disabling local ICE, reason=%s", reason));
-    pjmedia_ice_stop_ice(&tp_ice->base);
+    transport_media_stop(&tp_ice->base);
 }
 
@@ -464 +468 @@
  * Start ICE checks when both offer and answer are available.
  */
-PJ_DEF(pj_status_t) pjmedia_ice_start_ice(pjmedia_transport *tp,
-                                          pj_pool_t *pool,
-                                          const pjmedia_sdp_session *rem_sdp,
-                                          unsigned media_index)
+static pj_status_t transport_media_start(pjmedia_transport *tp,
+                                         pj_pool_t *pool,
+                                         pjmedia_sdp_session *sdp_local,
+                                         const pjmedia_sdp_session *sdp_remote,
+                                         unsigned media_index)
 {
     struct transport_ice *tp_ice = (struct transport_ice*)tp;
@@ -482 +487 @@
     pj_status_t status;
 
-    PJ_ASSERT_RETURN(tp && pool && rem_sdp, PJ_EINVAL);
-    PJ_ASSERT_RETURN(media_index < rem_sdp->media_count, PJ_EINVAL);
-
-    sdp_med = rem_sdp->media[media_index];
+    PJ_UNUSED_ARG(sdp_local);
+
+    PJ_ASSERT_RETURN(tp && pool && sdp_remote, PJ_EINVAL);
+    PJ_ASSERT_RETURN(media_index < sdp_remote->media_count, PJ_EINVAL);
+
+    sdp_med = sdp_remote->media[media_index];
 
     /* Get the SDP connection for the media stream.
@@ -493 +500 @@
     conn = sdp_med->conn;
     if (conn == NULL)
-        conn = rem_sdp->conn;
+        conn = sdp_remote->conn;
 
     if (conn == NULL) {
@@ -508 +515 @@
     if (attr == NULL) {
         /* Find ice-ufrag attribute in session descriptor */
-        attr = pjmedia_sdp_attr_find2(rem_sdp->attr_count, rem_sdp->attr,
+        attr = pjmedia_sdp_attr_find2(sdp_remote->attr_count, sdp_remote->attr,
                                       "ice-ufrag", NULL);
         if (attr == NULL) {
@@ -522 +529 @@
     if (attr == NULL) {
         /* Find ice-pwd attribute in session descriptor */
-        attr = pjmedia_sdp_attr_find2(rem_sdp->attr_count, rem_sdp->attr,
+        attr = pjmedia_sdp_attr_find2(sdp_remote->attr_count, sdp_remote->attr,
                                       "ice-pwd", NULL);
         if (attr == NULL) {
@@ -609 +616 @@
 
 
-PJ_DEF(pj_status_t) pjmedia_ice_stop_ice(pjmedia_transport *tp)
+static pj_status_t transport_media_stop(pjmedia_transport *tp)
 {
     struct transport_ice *tp_ice = (struct transport_ice*)tp;
@@ -616 +623 @@
 
 
-static pj_status_t tp_get_info(pjmedia_transport *tp,
-                               pjmedia_sock_info *info)
+static pj_status_t transport_get_info(pjmedia_transport *tp,
+                                      pjmedia_sock_info *info)
 {
     struct transport_ice *tp_ice = (struct transport_ice*)tp;
@@ -649 +656 @@
 
 
-static pj_status_t tp_attach( pjmedia_transport *tp,
-                              void *stream,
-                              const pj_sockaddr_t *rem_addr,
-                              const pj_sockaddr_t *rem_rtcp,
-                              unsigned addr_len,
-                              void (*rtp_cb)(void*,
-                                             const void*,
-                                             pj_ssize_t),
-                              void (*rtcp_cb)(void*,
-                                              const void*,
-                                              pj_ssize_t))
+static pj_status_t transport_attach  (pjmedia_transport *tp,
+                                      void *stream,
+                                      const pj_sockaddr_t *rem_addr,
+                                      const pj_sockaddr_t *rem_rtcp,
+                                      unsigned addr_len,
+                                      void (*rtp_cb)(void*,
+                                                     const void*,
+                                                     pj_ssize_t),
+                                      void (*rtcp_cb)(void*,
+                                                      const void*,
+                                                      pj_ssize_t))
 {
     struct transport_ice *tp_ice = (struct transport_ice*)tp;
@@ -674 +681 @@
 
 
-static void tp_detach(pjmedia_transport *tp,
-                      void *strm)
+static void transport_detach(pjmedia_transport *tp,
+                             void *strm)
 {
     struct transport_ice *tp_ice = (struct transport_ice*)tp;
@@ -687 +694 @@
 
 
-static pj_status_t tp_send_rtp(pjmedia_transport *tp,
-                               const void *pkt,
-                               pj_size_t size)
+static pj_status_t transport_send_rtp(pjmedia_transport *tp,
+                                      const void *pkt,
+                                      pj_size_t size)
 {
     struct transport_ice *tp_ice = (struct transport_ice*)tp;
@@ -709 +716 @@
 
 
-static pj_status_t tp_send_rtcp(pjmedia_transport *tp,
-                                const void *pkt,
-                                pj_size_t size)
+static pj_status_t transport_send_rtcp(pjmedia_transport *tp,
+                                       const void *pkt,
+                                       pj_size_t size)
 {
     struct transport_ice *tp_ice = (struct transport_ice*)tp;
@@ -799 +806 @@
 
 /* Simulate lost */
-PJ_DEF(pj_status_t) pjmedia_ice_simulate_lost( pjmedia_transport *tp,
-                                               pjmedia_dir dir,
-                                               unsigned pct_lost)
+static pj_status_t transport_simulate_lost(pjmedia_transport *tp,
+                                           pjmedia_dir dir,
+                                           unsigned pct_lost)
 {
     struct transport_ice *ice = (struct transport_ice*) tp;
@@ -816 +823 @@
 }
 
+
+/*
+ * Destroy ICE media transport.
+ */
+static pj_status_t transport_destroy(pjmedia_transport *tp)
+{
+    struct transport_ice *tp_ice = (struct transport_ice*)tp;
+
+    if (tp_ice->ice_st) {
+        pj_ice_strans_destroy(tp_ice->ice_st);
+        /*Must not touch tp_ice after ice_st is destroyed!
+         (it has the pool)
+         tp_ice->ice_st = NULL;
+         */
+    }
+
+    return PJ_SUCCESS;
+}
+

pjproject/branches/users/nanang/pjmedia/src/pjmedia/transport_udp.c

@@ -95 +95 @@
                        pj_ssize_t bytes_read);
 
-static pj_status_t transport_get_info(pjmedia_transport *tp,
-                                      pjmedia_sock_info *info);
-static pj_status_t transport_attach(   pjmedia_transport *tp,
+/*
+ * These are media transport operations.
+ */
+static pj_status_t transport_get_info (pjmedia_transport *tp,
+                                       pjmedia_sock_info *info);
+static pj_status_t transport_attach   (pjmedia_transport *tp,
                                        void *user_data,
                                        const pj_sockaddr_t *rem_addr,
@@ -108 +111 @@
                                                        const void*,
                                                        pj_ssize_t));
-static void        transport_detach(   pjmedia_transport *tp,
+static void        transport_detach   (pjmedia_transport *tp,
                                        void *strm);
 static pj_status_t transport_send_rtp( pjmedia_transport *tp,
@@ -116 +119 @@
                                        const void *pkt,
                                        pj_size_t size);
+static pj_status_t transport_media_create(pjmedia_transport *tp,
+                                       pj_pool_t *pool,
+                                       pjmedia_sdp_session *sdp_local,
+                                       const pjmedia_sdp_session *sdp_remote);
+static pj_status_t transport_media_start (pjmedia_transport *tp,
+                                       pj_pool_t *pool,
+                                       pjmedia_sdp_session *sdp_local,
+                                       const pjmedia_sdp_session *sdp_remote,
+                                       unsigned media_index);
+static pj_status_t transport_media_stop(pjmedia_transport *tp);
+static pj_status_t transport_simulate_lost(pjmedia_transport *tp,
+                                       pjmedia_dir dir,
+                                       unsigned pct_lost);
+static pj_status_t transport_destroy  (pjmedia_transport *tp);
 
 
@@ -125 +142 @@
     &transport_send_rtp,
     &transport_send_rtcp,
-    &pjmedia_transport_udp_close
+    &transport_media_create,
+    &transport_media_start,
+    &transport_media_stop,
+    &transport_simulate_lost,
+    &transport_destroy
 };
 
@@ -342 +363 @@
 
 on_error:
-    pjmedia_transport_udp_close(&tp->base);
+    transport_destroy(&tp->base);
     return status;
-}
-
-
-/*
- * Get media socket info.
- */
-PJ_DEF(pj_status_t) pjmedia_transport_udp_get_info( pjmedia_transport *tp,
-                                pjmedia_transport_udp_info *inf)
-{
-    return transport_get_info(tp, &inf->skinfo);
 }
 
@@ -360 +371 @@
  * Close UDP transport.
  */
-PJ_DEF(pj_status_t) pjmedia_transport_udp_close(pjmedia_transport *tp)
+static pj_status_t transport_destroy(pjmedia_transport *tp)
 {
     struct transport_udp *udp = (struct transport_udp*) tp;
@@ -727 +738 @@
 
 
-PJ_DEF(pj_status_t) pjmedia_transport_udp_simulate_lost(pjmedia_transport *tp,
-                                                        pjmedia_dir dir,
-                                                        unsigned pct_lost)
+static pj_status_t transport_media_create(pjmedia_transport *tp,
+                                  pj_pool_t *pool,
+                                  pjmedia_sdp_session *sdp_local,
+                                  const pjmedia_sdp_session *sdp_remote)
+{
+    PJ_UNUSED_ARG(tp);
+    PJ_UNUSED_ARG(pool);
+    PJ_UNUSED_ARG(sdp_local);
+    PJ_UNUSED_ARG(sdp_remote);
+
+    return PJ_SUCCESS;
+}
+
+static pj_status_t transport_media_start(pjmedia_transport *tp,
+                                  pj_pool_t *pool,
+                                  pjmedia_sdp_session *sdp_local,
+                                  const pjmedia_sdp_session *sdp_remote,
+                                  unsigned media_index)
+{
+    PJ_UNUSED_ARG(tp);
+    PJ_UNUSED_ARG(pool);
+    PJ_UNUSED_ARG(sdp_local);
+    PJ_UNUSED_ARG(sdp_remote);
+    PJ_UNUSED_ARG(media_index);
+
+    return PJ_SUCCESS;
+}
+
+static pj_status_t transport_media_stop(pjmedia_transport *tp)
+{
+    PJ_UNUSED_ARG(tp);
+
+    return PJ_SUCCESS;
+}
+
+static pj_status_t transport_simulate_lost(pjmedia_transport *tp,
+                                           pjmedia_dir dir,
+                                           unsigned pct_lost)
 {
     struct transport_udp *udp = (struct transport_udp*)tp;

pjproject/branches/users/nanang/pjproject-vs8.sln

@@ -1 +1 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
+# Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlib", "pjlib\build\pjlib.vcproj", "{DA0E03ED-53A7-4050-8A85-90541C5509F8}"
 EndProject
@@ -13 +13 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlib_util_test", "pjlib-util\build\pjlib_util_test.vcproj", "{ED02BE13-8297-4770-8097-27DC2CCABF9A}"
         ProjectSection(ProjectDependencies) = postProject
-                {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8}
-                {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}
+                {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}
+                {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8}
         EndProjectSection
 EndProject
@@ -29 +29 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjsua", "pjsip-apps\build\pjsua.vcproj", "{8310649E-A25E-4AF0-91E8-9E3CC659BB89}"
         ProjectSection(ProjectDependencies) = postProject
+                {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} = {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}
                 {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031}
                 {4BF51C21-5A30-423B-82FE-1ED410E5769D} = {4BF51C21-5A30-423B-82FE-1ED410E5769D}
+                {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}
+                {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}
+                {6794B975-4E84-4F49-B2DC-C31F2224E03E} = {6794B975-4E84-4F49-B2DC-C31F2224E03E}
+                {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}
+                {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} = {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}
+                {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} = {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}
+                {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}
+                {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}
+                {B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21}
+                {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8}
+                {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} = {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}
+                {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}
                 {E53AA5FF-B737-40AA-BD13-387EFA99023D} = {E53AA5FF-B737-40AA-BD13-387EFA99023D}
-                {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}
+        EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjsua_lib", "pjsip\build\pjsua_lib.vcproj", "{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample_debug", "pjsip-apps\build\sample_debug.vcproj", "{A0F1AA62-0F6F-420D-B09A-AC04B6862821}"
+        ProjectSection(ProjectDependencies) = postProject
+                {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}
+                {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}
+                {6794B975-4E84-4F49-B2DC-C31F2224E03E} = {6794B975-4E84-4F49-B2DC-C31F2224E03E}
+                {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}
+                {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} = {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}
+                {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} = {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}
+                {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}
+                {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}
+                {B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21}
+                {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8}
                 {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} = {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}
-                {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8}
-                {B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21}
-                {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}
-                {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}
-                {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} = {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}
-                {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} = {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}
-                {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}
-                {6794B975-4E84-4F49-B2DC-C31F2224E03E} = {6794B975-4E84-4F49-B2DC-C31F2224E03E}
-                {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}
-                {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}
-        EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjsua_lib", "pjsip\build\pjsua_lib.vcproj", "{9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample_debug", "pjsip-apps\build\sample_debug.vcproj", "{A0F1AA62-0F6F-420D-B09A-AC04B6862821}"
-        ProjectSection(ProjectDependencies) = postProject
+                {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}
                 {E53AA5FF-B737-40AA-BD13-387EFA99023D} = {E53AA5FF-B737-40AA-BD13-387EFA99023D}
-                {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}
-                {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} = {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}
-                {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8}
-                {B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21}
-                {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}
-                {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}
-                {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} = {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9}
-                {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} = {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA}
-                {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}
-                {6794B975-4E84-4F49-B2DC-C31F2224E03E} = {6794B975-4E84-4F49-B2DC-C31F2224E03E}
-                {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}
-                {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4}
-                {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031}
+                {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031}
+                {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} = {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}
         EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "samples", "pjsip-apps\build\samples.vcproj", "{E378A1FC-0C9C-4462-860F-7E60BC1BF84E}"
         ProjectSection(ProjectDependencies) = postProject
-                {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}
-                {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8}
-                {B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21}
-                {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}
-                {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}
-                {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}
-                {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}
-                {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031}
+                {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031}
+                {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}
+                {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}
+                {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}
+                {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}
+                {B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21}
+                {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8}
+                {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}
         EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_pjsip", "pjsip\build\test_pjsip.vcproj", "{B3F7D4E9-702F-4EB4-ADA8-098D0A83D770}"
         ProjectSection(ProjectDependencies) = postProject
-                {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}
-                {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8}
-                {B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21}
-                {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}
-                {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}
-                {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}
-                {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}
-                {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031}
+                {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031}
+                {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693}
+                {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65}
+                {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B}
+                {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0} = {4B5945CD-0CB3-49AA-A7FF-7612D93F82C0}
+                {B8719FD5-E8A6-4A36-943C-891D07F5DD21} = {B8719FD5-E8A6-4A36-943C-891D07F5DD21}
+                {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8}
+                {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}
         EndProjectSection
 EndProject
@@ -105 +107 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmilenage", "third_party\build\milenage\libmilenage.vcproj", "{4BF51C21-5A30-423B-82FE-1ED410E5769D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsrtp", "third_party\build\srtp\libsrtp.vcproj", "{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}"
 EndProject
 Global
@@ -200 +204 @@
                 {4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release|Win32.ActiveCfg = Release|Win32
                 {4BF51C21-5A30-423B-82FE-1ED410E5769D}.Release|Win32.Build.0 = Release|Win32
+                {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug|Win32.ActiveCfg = Debug|Win32
+                {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug|Win32.Build.0 = Debug|Win32
+                {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release|Win32.ActiveCfg = Release|Win32
+                {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release|Win32.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution

pjproject/branches/users/nanang/pjsip-apps/build/Samples-vc.mak

@@ -24 +24 @@
 RESAMPLE_LIB = ..\..\third_party\lib\libresample-$(TARGET)$(LIBEXT)
 SPEEX_LIB = ..\..\third_party\lib\libspeex-$(TARGET)$(LIBEXT)
+SRTP_LIB = ..\..\third_party\lib\libsrtp-$(TARGET)$(LIBEXT)
 
 THIRD_PARTY_LIBS = $(GSM_LIB) $(ILBC_LIB) $(PORTAUDIO_LIB) $(RESAMPLE_LIB) \
-                                   $(SPEEX_LIB)
+                                   $(SPEEX_LIB) $(SRTP_LIB)
 
 LIBS = $(PJSUA_LIB_LIB) $(PJSIP_UA_LIB) $(PJSIP_SIMPLE_LIB) \

pjproject/branches/users/nanang/pjsip-apps/src/pjsua/pjsua_app.c

@@ -166 +166 @@
     puts  ("Media Options:");
     puts  ("  --use-ice           Enable ICE (default:no)");
+    puts  ("  --use-srtp          Enable SRTP (default:no)");
     puts  ("  --add-codec=name    Manually add codec (default is to enable all)");
     puts  ("  --dis-codec=name    Disable codec (can be specified multiple times)");
@@ -383 +384 @@
            OPT_ADD_BUDDY, OPT_OFFER_X_MS_MSG, OPT_NO_PRESENCE,
            OPT_AUTO_ANSWER, OPT_AUTO_HANGUP, OPT_AUTO_PLAY, OPT_AUTO_LOOP,
-           OPT_AUTO_CONF, OPT_CLOCK_RATE, OPT_USE_ICE,
+           OPT_AUTO_CONF, OPT_CLOCK_RATE, OPT_USE_ICE, OPT_USE_SRTP,
            OPT_PLAY_FILE, OPT_PLAY_TONE, OPT_RTP_PORT, OPT_ADD_CODEC, 
            OPT_ILBC_MODE, OPT_REC_FILE, OPT_AUTO_REC,
@@ -442 +443 @@
         { "rtp-port",   1, 0, OPT_RTP_PORT},
         { "use-ice",    0, 0, OPT_USE_ICE},
+        { "use-srtp",   0, 0, OPT_USE_SRTP},
         { "add-codec",  1, 0, OPT_ADD_CODEC},
         { "dis-codec",  1, 0, OPT_DIS_CODEC},
@@ -797 +799 @@
             break;
 
+        case OPT_USE_SRTP:
+            cfg->media_cfg.enable_srtp = PJ_TRUE;
+            break;
+
         case OPT_RTP_PORT:
             cfg->rtp_cfg.port = my_atoi(pj_optarg);

pjproject/branches/users/nanang/pjsip-apps/src/samples/simpleua.c

@@ -286 +286 @@
      * the SDP).
      */
-    {
-        pjmedia_transport_udp_info udp_info;
-
-        pjmedia_transport_udp_get_info(g_med_transport, &udp_info);
-        pj_memcpy(&g_med_skinfo, &udp_info.skinfo, 
-                  sizeof(pjmedia_sock_info));
-    }
+    pjmedia_transport_get_info(g_med_transport, &g_med_skinfo);
 
 

pjproject/branches/users/nanang/pjsip-apps/src/samples/siprtp.c

@@ -1006 +1006 @@
     pjmedia_sdp_media *m;
     pjmedia_sdp_attr *attr;
-    pjmedia_transport_udp_info tpinfo;
+    pjmedia_sock_info tpinfo;
     struct media_stream *audio = &call->media[0];
 
@@ -1013 +1013 @@
 
     /* Get transport info */
-    pjmedia_transport_udp_get_info(audio->transport, &tpinfo);
+    pjmedia_transport_get_info(audio->transport, &tpinfo);
 
     /* Create and initialize basic SDP session */
@@ -1047 +1047 @@
     /* Standard media info: */
     m->desc.media = pj_str("audio");
-    m->desc.port = pj_ntohs(tpinfo.skinfo.rtp_addr_name.ipv4.sin_port);
+    m->desc.port = pj_ntohs(tpinfo.rtp_addr_name.ipv4.sin_port);
     m->desc.port_count = 1;
     m->desc.transport = pj_str("RTP/AVP");

pjproject/branches/users/nanang/pjsip-apps/src/samples/streamutil.c

@@ -56 +56 @@
  "  --send-only           Set stream direction to send only             \n"
  "  --recv-only           Set stream direction to recv only (default)   \n"
+ "  --use-srtp[=NAME]     Enable SRTP with crypto suite NAME            \n"
+ "                        e.g: AES_CM_128_HMAC_SHA1_80 (default),       \n"
+ "                             AES_CM_128_HMAC_SHA1_32                  \n"
+ "                        Use this option along with the TX & RX keys,  \n"
+ "                        formated of 60 hex digits (e.g: E148DA..)      \n"
+ "  --srtp-tx-key         SRTP key for transmiting                      \n"
+ "  --srtp-rx-key         SRTP key for receiving                        \n"
  "\n"
 ;
@@ -65 +72 @@
 #include <pjmedia.h>
 #include <pjmedia-codec.h>
+#include <pjmedia/transport_srtp.h>
 
 #include <stdlib.h>     /* atoi() */
@@ -79 +87 @@
 static void print_stream_stat(pjmedia_stream *stream);
 
+/* Prototype for LIBSRTP utility in file datatypes.c */
+int hex_string_to_octet_string(char *raw, char *hex, int len);
 
 /* 
@@ -123 +133 @@
                                   pj_uint16_t local_port,
                                   const pj_sockaddr_in *rem_addr,
+                                  pj_bool_t use_srtp,
+                                  const pj_str_t *crypto_suite,
+                                  const pj_str_t *srtp_tx_key,
+                                  const pj_str_t *srtp_rx_key,
                                   pjmedia_stream **p_stream )
 {
     pjmedia_stream_info info;
-    pjmedia_transport *transport;
+    pjmedia_transport *transport = NULL;
+    pjmedia_transport *srtp_tp = NULL;
     pj_status_t status;
 
@@ -159 +174 @@
         return status;
 
+    /* Check if SRTP enabled */
+    if (use_srtp) {
+        pjmedia_srtp_stream_policy tx_plc, rx_plc;
+
+        status = pjmedia_transport_srtp_create(med_endpt, transport, 
+                            PJMEDIA_SRTP_AUTO_CLOSE_UNDERLYING_TRANSPORT,
+                            &srtp_tp);
+        if (status != PJ_SUCCESS)
+            return status;
+
+        pj_bzero(&tx_plc, sizeof(pjmedia_srtp_stream_policy));
+        pj_bzero(&rx_plc, sizeof(pjmedia_srtp_stream_policy));
+
+        tx_plc.key = *srtp_tx_key;
+        tx_plc.crypto_suite = *crypto_suite;
+        rx_plc.key = *srtp_rx_key;
+        rx_plc.crypto_suite = *crypto_suite;
+        
+        status = pjmedia_transport_srtp_init_session(srtp_tp, &tx_plc, &rx_plc);
+        if (status != PJ_SUCCESS)
+            return status;
+    }
 
     /* Now that the stream info is initialized, we can create the 
@@ -165 +202 @@
 
     status = pjmedia_stream_create( med_endpt, pool, &info, 
-                                    transport, NULL, p_stream);
+                                    (use_srtp?srtp_tp:transport), 
+                                    NULL, p_stream);
 
     if (status != PJ_SUCCESS) {
         app_perror(THIS_FILE, "Error creating stream", status);
-        pjmedia_transport_udp_close(transport);
+        pjmedia_transport_close(transport);
         return status;
     }
@@ -202 +240 @@
     pj_status_t status; 
 
+    /* SRTP variables */
+    pj_bool_t use_srtp = PJ_FALSE;
+    char tmp_tx_key[64];
+    char tmp_rx_key[64];
+    pj_str_t  srtp_tx_key = {NULL, 0};
+    pj_str_t  srtp_rx_key = {NULL, 0};
+    pj_str_t  srtp_crypto_suite = {NULL, 0};
+    int tmp_key_len;
 
     /* Default values */
@@ -221 +267 @@
         OPT_SEND_ONLY   = 's',
         OPT_RECV_ONLY   = 'i',
+        OPT_USE_SRTP    = 'S',
+        OPT_SRTP_TX_KEY = 'x',
+        OPT_SRTP_RX_KEY = 'y',
         OPT_HELP        = 'h',
     };
@@ -233 +282 @@
         { "send-only",      0, 0, OPT_SEND_ONLY },
         { "recv-only",      0, 0, OPT_RECV_ONLY },
+        { "use-srtp",       2, 0, OPT_USE_SRTP },
+        { "srtp-tx-key",    1, 0, OPT_SRTP_TX_KEY },
+        { "srtp-rx-key",    1, 0, OPT_SRTP_RX_KEY },
         { "help",           0, 0, OPT_HELP },
         { NULL, 0, 0, 0 },
@@ -299 +351 @@
             break;
 
+        case OPT_USE_SRTP:
+            use_srtp = PJ_TRUE;
+            if (pj_optarg) {
+                pj_strset(&srtp_crypto_suite, pj_optarg, strlen(pj_optarg));
+            } else {
+                srtp_crypto_suite = pj_str("AES_CM_128_HMAC_SHA1_80");
+            }
+            break;
+
+        case OPT_SRTP_TX_KEY:
+            tmp_key_len = hex_string_to_octet_string(tmp_tx_key, pj_optarg, strlen(pj_optarg));
+            pj_strset(&srtp_tx_key, tmp_tx_key, tmp_key_len/2);
+            break;
+
+        case OPT_SRTP_RX_KEY:
+            tmp_key_len = hex_string_to_octet_string(tmp_rx_key, pj_optarg, strlen(pj_optarg));
+            pj_strset(&srtp_rx_key, tmp_rx_key, tmp_key_len/2);
+            break;
+
         case OPT_HELP:
             usage();
@@ -324 +395 @@
     }
 
+    if (use_srtp) {
+        if (((dir & PJMEDIA_DIR_ENCODING) && !srtp_tx_key.slen) ||
+            ((dir & PJMEDIA_DIR_DECODING) && !srtp_rx_key.slen))
+        {
+            printf("Error: Key for each SRTP stream direction must be set\n");
+            return 1;
+        }
+    }
 
     /* Must create a pool factory before we can allocate any memory. */
@@ -369 +448 @@
     /* Create stream based on program arguments */
     status = create_stream(pool, med_endpt, codec_info, dir, local_port, 
-                           &remote_addr, &stream);
+                           &remote_addr, 
+                           use_srtp, &srtp_crypto_suite, 
+                           &srtp_tx_key, &srtp_rx_key,
+                           &stream);
     if (status != PJ_SUCCESS)
         goto on_exit;
@@ -538 +620 @@
         tp = pjmedia_stream_get_transport(stream);
         pjmedia_stream_destroy(stream);
-        pjmedia_transport_udp_close(tp);
+        
+        pjmedia_transport_close(tp);
     }
 

pjproject/branches/users/nanang/pjsip/include/pjsip-ua/sip_inv.h

@@ -395 +395 @@
  *                      (this is useful e.g. when application wants to send 
  *                      the response statelessly).
+ *
+ * @see pjsip_inv_verify_request2()
  */
 PJ_DECL(pj_status_t) pjsip_inv_verify_request(  pjsip_rx_data *rdata,
@@ -403 +405 @@
                                                 pjsip_tx_data **tdata);
 
+/**
+ * Variant of #pjsip_inv_verify_request() which allows application to specify
+ * the parsed SDP in the \a offer argument. This is useful to avoid having to
+ * re-parse the SDP in the incoming request.
+ *
+ * @see pjsip_inv_verify_request()
+ */
+PJ_DECL(pj_status_t) pjsip_inv_verify_request2( pjsip_rx_data *rdata,
+                                                unsigned *options,
+                                                const pjmedia_sdp_session *offer,
+                                                const pjmedia_sdp_session *answer,
+                                                pjsip_dialog *dlg,
+                                                pjsip_endpoint *endpt,
+                                                pjsip_tx_data **tdata);
 
 /**

pjproject/branches/users/nanang/pjsip/include/pjsua-lib/pjsua.h

@@ -3769 +3769 @@
      */
     pj_bool_t           enable_relay;
+
+    /**
+     * Enable SRTP
+     */
+    pj_bool_t           enable_srtp;
 };
 

pjproject/branches/users/nanang/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -316 +316 @@
 pj_status_t pjsua_media_channel_create_sdp(pjsua_call_id call_id, 
                                            pj_pool_t *pool,
+                                           const pjmedia_sdp_session *rem_sdp,
                                            pjmedia_sdp_session **p_sdp);
 pj_status_t pjsua_media_channel_update(pjsua_call_id call_id,
-                                       const pjmedia_sdp_session *local_sdp,
+                                       pjmedia_sdp_session *local_sdp,
                                        const pjmedia_sdp_session *remote_sdp);
 pj_status_t pjsua_media_channel_deinit(pjsua_call_id call_id);

pjproject/branches/users/nanang/pjsip/src/pjsip-ua/sip_inv.c

@@ -677 +677 @@
  * Verify incoming INVITE request.
  */
-PJ_DEF(pj_status_t) pjsip_inv_verify_request(pjsip_rx_data *rdata,
-                                             unsigned *options,
-                                             const pjmedia_sdp_session *l_sdp,
-                                             pjsip_dialog *dlg,
-                                             pjsip_endpoint *endpt,
-                                             pjsip_tx_data **p_tdata)
+PJ_DEF(pj_status_t) pjsip_inv_verify_request2(pjsip_rx_data *rdata,
+                                              unsigned *options,
+                                              const pjmedia_sdp_session *r_sdp,
+                                              const pjmedia_sdp_session *l_sdp,
+                                              pjsip_dialog *dlg,
+                                              pjsip_endpoint *endpt,
+                                              pjsip_tx_data **p_tdata)
 {
     pjsip_msg *msg;
@@ -723 +724 @@
     pj_list_init(&res_hdr_list);
 
-    /* Check the request body, see if it'inv something that we support
-     * (i.e. SDP). 
+    /* Check the request body, see if it's something that we support,
+     * only when the body hasn't been parsed before.
      */
-    if (msg->body) {
+    if (r_sdp==NULL && msg->body) {
         pjsip_msg_body *body = msg->body;
         pj_str_t str_application = {"application", 11};
@@ -778 +779 @@
         }
 
+        r_sdp = sdp;
+    }
+
+    if (r_sdp) {
         /* Negotiate with local SDP */
         if (l_sdp) {
@@ -788 +793 @@
             /* Create SDP negotiator */
             status = pjmedia_sdp_neg_create_w_remote_offer(
-                            rdata->tp_info.pool, l_sdp, sdp, &neg);
+                            rdata->tp_info.pool, l_sdp, r_sdp, &neg);
             PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
 
@@ -1026 +1031 @@
 
     return status;
+}
+
+
+/*
+ * Verify incoming INVITE request.
+ */
+PJ_DEF(pj_status_t) pjsip_inv_verify_request( pjsip_rx_data *rdata,
+                                              unsigned *options,
+                                              const pjmedia_sdp_session *l_sdp,
+                                              pjsip_dialog *dlg,
+                                              pjsip_endpoint *endpt,
+                                              pjsip_tx_data **p_tdata)
+{
+    return pjsip_inv_verify_request2(rdata, options, NULL, l_sdp, dlg, 
+                                     endpt, p_tdata);
 }
 

pjproject/branches/users/nanang/pjsip/src/pjsua-lib/pjsua_call.c

@@ -335 +335 @@
     offer = NULL;
 #else
-    status = pjsua_media_channel_create_sdp(call->index, dlg->pool, &offer);
+    status = pjsua_media_channel_create_sdp(call->index, dlg->pool, NULL, &offer);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "pjmedia unable to create SDP", status);
@@ -482 +482 @@
     pjsua_call *call;
     int call_id = -1;
-    pjmedia_sdp_session *answer;
+    pjmedia_sdp_session *offer, *answer;
     pj_status_t status;
 
@@ -590 +590 @@
     }
 
+    /* Parse SDP from incoming request */
+    if (rdata->msg_info.msg->body) {
+        status = pjmedia_sdp_parse(rdata->tp_info.pool, 
+                                   rdata->msg_info.msg->body->data,
+                                   rdata->msg_info.msg->body->len, &offer);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Error parsing SDP in incoming INVITE", status);
+            pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 400, NULL,
+                                          NULL, NULL);
+            pjsua_media_channel_deinit(call->index);
+            PJSUA_UNLOCK();
+            return PJ_TRUE;
+        }
+    } else {
+        offer = NULL;
+    }
 
     /* Get media capability from media endpoint: */
-    status = pjsua_media_channel_create_sdp(call->index, rdata->tp_info.pool, &answer);
+    status = pjsua_media_channel_create_sdp(call->index, rdata->tp_info.pool, 
+                                            offer, &answer);
     if (status != PJ_SUCCESS) {
         pjsip_endpt_respond_stateless(pjsua_var.endpt, rdata, 500, NULL,
@@ -613 +630 @@
         options |= PJSIP_INV_REQUIRE_100REL;
 
-    status = pjsip_inv_verify_request(rdata, &options, answer, NULL,
-                                      pjsua_var.endpt, &response);
+    status = pjsip_inv_verify_request2(rdata, &options, offer, answer, NULL,
+                                       pjsua_var.endpt, &response);
     if (status != PJ_SUCCESS) {
 
@@ -1314 +1331 @@
     PJ_UNUSED_ARG(unhold);
     PJ_TODO(create_active_inactive_sdp_based_on_unhold_arg);
-    status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, &sdp);
+    status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, 
+                                            NULL, &sdp);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to get SDP from media endpoint", 
@@ -1380 +1398 @@
 
     /* Create SDP */
-    status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, &sdp);
+    status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, 
+                                            NULL, &sdp);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to get SDP from media endpoint", 
@@ -2321 +2340 @@
 {
     pjsua_call *call;
-    const pjmedia_sdp_session *local_sdp;
+    pjmedia_sdp_session *local_sdp;
     const pjmedia_sdp_session *remote_sdp;
 
@@ -2502 +2521 @@
         }
 
-        status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, &answer);
+        status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, 
+                                                offer, &answer);
     }
 
@@ -2554 +2574 @@
         }
 
-        status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, offer);
+        status = pjsua_media_channel_create_sdp(call->index, call->inv->pool, 
+                                                NULL, offer);
     }
 

pjproject/branches/users/nanang/pjsip/src/pjsua-lib/pjsua_media.c

@@ -535 +535 @@
             goto on_error;
         }
-        status = pjmedia_transport_udp_attach(pjsua_var.med_endpt, NULL,
-                                              &skinfo, 0,
-                                              &pjsua_var.calls[i].med_tp);
+
+        if (pjsua_var.media_cfg.enable_srtp) {
+            pjmedia_transport *tp;
+            unsigned srtp_options = 
+                                PJMEDIA_SRTP_AUTO_CLOSE_UNDERLYING_TRANSPORT;
+
+            status = pjmedia_transport_udp_attach(pjsua_var.med_endpt, NULL,
+                                                  &skinfo, 0, &tp);
+            status = pjmedia_transport_srtp_create(pjsua_var.med_endpt, tp,
+                                                   srtp_options, 
+                                                   &pjsua_var.calls[i].med_tp);
+        } else {
+            status = pjmedia_transport_udp_attach(pjsua_var.med_endpt, NULL,
+                                                  &skinfo, 0,
+                                                  &pjsua_var.calls[i].med_tp);
+        }
         if (status != PJ_SUCCESS) {
             pjsua_perror(THIS_FILE, "Unable to create media transport",
@@ -544 +557 @@
         }
 
-        pjmedia_transport_udp_simulate_lost(pjsua_var.calls[i].med_tp,
-                                            PJMEDIA_DIR_ENCODING,
-                                            pjsua_var.media_cfg.tx_drop_pct);
-
-        pjmedia_transport_udp_simulate_lost(pjsua_var.calls[i].med_tp,
-                                            PJMEDIA_DIR_DECODING,
-                                            pjsua_var.media_cfg.rx_drop_pct);
+        pjmedia_transport_simulate_lost(pjsua_var.calls[i].med_tp,
+                                        PJMEDIA_DIR_ENCODING,
+                                        pjsua_var.media_cfg.tx_drop_pct);
+
+        pjmedia_transport_simulate_lost(pjsua_var.calls[i].med_tp,
+                                        PJMEDIA_DIR_DECODING,
+                                        pjsua_var.media_cfg.rx_drop_pct);
 
     }
@@ -646 +659 @@
         }
 
-        pjmedia_ice_simulate_lost(pjsua_var.calls[i].med_tp,
-                                  PJMEDIA_DIR_ENCODING,
-                                  pjsua_var.media_cfg.tx_drop_pct);
-
-        pjmedia_ice_simulate_lost(pjsua_var.calls[i].med_tp,
-                                  PJMEDIA_DIR_DECODING,
-                                  pjsua_var.media_cfg.rx_drop_pct);
+        pjmedia_transport_simulate_lost(pjsua_var.calls[i].med_tp,
+                                        PJMEDIA_DIR_ENCODING,
+                                        pjsua_var.media_cfg.tx_drop_pct);
+
+        pjmedia_transport_simulate_lost(pjsua_var.calls[i].med_tp,
+                                        PJMEDIA_DIR_DECODING,
+                                        pjsua_var.media_cfg.rx_drop_pct);
 
         status = pjmedia_ice_start_init(pjsua_var.calls[i].med_tp, 0, &addr,
@@ -757 +770 @@
 
         /* Restart ICE */
-        pjmedia_ice_stop_ice(call->med_tp);
+        pjmedia_transport_media_stop(call->med_tp);
 
         status = pjmedia_ice_init_ice(call->med_tp, ice_role, NULL, NULL);
@@ -769 +782 @@
 pj_status_t pjsua_media_channel_create_sdp(pjsua_call_id call_id, 
                                            pj_pool_t *pool,
+                                           const pjmedia_sdp_session *rem_sdp,
                                            pjmedia_sdp_session **p_sdp)
 {
@@ -816 +830 @@
     }
 
-    if (pjsua_var.media_cfg.enable_ice) {
-        status = pjmedia_ice_modify_sdp(call->med_tp, pool, sdp);
+    //if (pjsua_var.media_cfg.enable_ice) {
+        //status = pjmedia_transport_media_create(call->med_tp, pool, sdp, NULL);
+        status = pjmedia_transport_media_create(call->med_tp, pool, 
+                                                sdp, rem_sdp);
         if (status != PJ_SUCCESS)
             goto on_error;
-    }
+    //}
 
     *p_sdp = sdp;
@@ -859 +875 @@
     stop_media_session(call_id);
 
-    if (pjsua_var.media_cfg.enable_ice) {
-        pjmedia_ice_stop_ice(call->med_tp);
-    }
+    //if (pjsua_var.media_cfg.enable_ice) {
+        pjmedia_transport_media_stop(call->med_tp);
+    //}
 
     return PJ_SUCCESS;
@@ -885 +901 @@
 
 pj_status_t pjsua_media_channel_update(pjsua_call_id call_id,
-                                       const pjmedia_sdp_session *local_sdp,
+                                       pjmedia_sdp_session *local_sdp,
                                        const pjmedia_sdp_session *remote_sdp)
 {
@@ -947 +963 @@
 
         /* Shutdown ICE session */
-        if (pjsua_var.media_cfg.enable_ice) {
-            pjmedia_ice_stop_ice(call->med_tp);
-        }
+        //if (pjsua_var.media_cfg.enable_ice) {
+            pjmedia_transport_media_stop(call->med_tp);
+        //}
 
         /* No need because we need keepalive? */
@@ -955 +971 @@
     } else {
         /* Start ICE */
-        if (pjsua_var.media_cfg.enable_ice) {
-            status = pjmedia_ice_start_ice(call->med_tp, call->inv->pool, 
-                                           remote_sdp, 0);
+        //if (pjsua_var.media_cfg.enable_ice) {
+            status = pjmedia_transport_media_start(call->med_tp, 
+                                                   call->inv->pool,
+                                                   local_sdp, remote_sdp, 0);
             if (status != PJ_SUCCESS)
                 return status;
-        }
+        //}
 
         /* Override ptime, if this option is specified. */