Changeset 368

Timestamp:

Mar 30, 2006 4:46:36 PM (18 years ago)

Author:

bennylp

Message:

Support for alternate pool backend

Location:

pjproject/trunk

Files:

• pjsip-apps/src/samples/util.h (modified) (2 diffs)
• pjsip/src/pjsip/sip_endpoint.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (4 diffs)

pjproject/trunk/pjsip-apps/src/samples/util.h

@@ -135 +135 @@
 static void dump_pool_usage( const char *app_name, pj_caching_pool *cp )
 {
+#if !defined(PJ_HAS_POOL_ALT_API) || PJ_HAS_POOL_ALT_API==0
     pj_pool_t   *p;
     unsigned     total_alloc = 0;
@@ -150 +151 @@
                total_alloc / 1000,
                total_used / 1000));
+#endif
 }

pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c

@@ -940 +940 @@
     
     /* Dumping pool factory. */
-    (*endpt->pf->dump_status)(endpt->pf, detail);
+    pj_pool_factory_dump(endpt->pf, detail);
 
     /* Pool health. */

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

@@ -99 +99 @@
 
 /* Close and reopen socket. */
-static pj_status_t reopen_sock( pj_sock_t *sock)
-{
-    pj_sockaddr_in addr;
-    int addrlen;
+static pj_status_t reopen_sock( pj_sock_t *sock, pj_sockaddr_in *addr)
+{
     pj_status_t status;
-
-    addrlen = sizeof(pj_sockaddr_in);
-    status = pj_sock_getsockname(*sock, &addr, &addrlen);
-    if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Error getting RTP/RTCP socket name", status);
-        return status;
-    }
-
-    pj_sock_close(*sock);
 
     status = pj_sock_socket(PJ_AF_INET, PJ_SOCK_DGRAM, 0, sock);
@@ -120 +109 @@
     }
 
-    status = pj_sock_bind(*sock, &addr, sizeof(pj_sockaddr_in));
+    status = pj_sock_bind(*sock, addr, sizeof(pj_sockaddr_in));
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to re-bind RTP/RTCP socket", status);
@@ -142 +131 @@
 
     if (call->session) {
+        pj_sockaddr_in rtp_addr, rtcp_addr;
+        int addrlen;
+
+        addrlen = sizeof(rtp_addr);
+        pj_sock_getsockname(call->skinfo.rtp_sock, &rtp_addr, &addrlen);
+
+        addrlen = sizeof(rtcp_addr);
+        pj_sock_getsockname(call->skinfo.rtcp_sock, &rtcp_addr, &addrlen);
+
+        /* Destroy session (this will also close RTP/RTCP sockets). */
+        pjmedia_session_destroy(call->session);
 
         /* Close and reopen RTP socket.
@@ -147 +147 @@
          * when IOCompletionPort is used.
          */
-        reopen_sock(&call->skinfo.rtp_sock);
+        reopen_sock(&call->skinfo.rtp_sock, &rtp_addr);
 
         /* Close and reopen RTCP socket too. */
-        reopen_sock(&call->skinfo.rtcp_sock);
-
-        /* Must destroy session after socket is closed. */
-        pjmedia_session_destroy(call->session);
+        reopen_sock(&call->skinfo.rtcp_sock, &rtcp_addr);
+
         call->session = NULL;