Changeset 3299 for pjproject/trunk/pjlib/src/pj/activesock.c

Timestamp:

Aug 27, 2010 6:46:29 AM (14 years ago)

Author:

ming

Message:

Closed ticket #1107: iOS4 background feature

• pjlib:
  • add support for activesock TCP to work in background mode.
  • add feature in ioqueue to recreate closed UDP sockets.
• pjsip-apps:
  • ipjsua: add support for iPhone OS 4 background mode
  • ipjsystest: add support for iPhone OS 4 background mode

File:

• pjproject/trunk/pjlib/src/pj/activesock.c (modified) (7 diffs)

pjproject/trunk/pjlib/src/pj/activesock.c

@@ -22 +22 @@
 #include <pj/assert.h>
 #include <pj/errno.h>
+#include <pj/log.h>
 #include <pj/pool.h>
 #include <pj/sock.h>
 #include <pj/string.h>
+
+#if defined(PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT) && \
+    PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT!=0
+#   include <CFNetwork/CFNetwork.h>
+#endif
 
 #define PJ_ACTIVESOCK_MAX_LOOP      50
@@ -72 +78 @@
     unsigned             max_loop;
     pj_activesock_cb     cb;
-
+#if defined(PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT) && \
+    PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT!=0
+    int                  bg_setting;
+    pj_sock_t            sock;
+    CFReadStreamRef      readStream;
+#endif
+    
     struct send_data     send_data;
 
@@ -106 +118 @@
 }
 
+#if defined(PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT) && \
+    PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT!=0
+static void activesock_destroy_iphone_os_stream(pj_activesock_t *asock)
+{
+    if (asock->readStream) {
+        CFReadStreamClose(asock->readStream);
+        CFRelease(asock->readStream);
+        asock->readStream = NULL;
+    }
+}
+
+static void activesock_create_iphone_os_stream(pj_activesock_t *asock)
+{
+    if (asock->bg_setting && asock->stream_oriented) {
+        activesock_destroy_iphone_os_stream(asock);
+
+        CFStreamCreatePairWithSocket(kCFAllocatorDefault, asock->sock,
+                                     &asock->readStream, NULL);
+
+        if (!asock->readStream ||
+            CFReadStreamSetProperty(asock->readStream,
+                                    kCFStreamNetworkServiceType,
+                                    kCFStreamNetworkServiceTypeVoIP)
+            != TRUE ||
+            CFReadStreamOpen(asock->readStream) != TRUE)
+        {
+            PJ_LOG(2,("", "Failed to configure TCP transport for VoIP "
+                      "usage. Background mode will not be supported."));
+            
+            activesock_destroy_iphone_os_stream(asock);
+        }
+    }
+}
+
+
+PJ_DEF(void) pj_activesock_set_iphone_os_bg(pj_activesock_t *asock,
+                                            int val)
+{
+    asock->bg_setting = val;
+    if (asock->bg_setting)
+        activesock_create_iphone_os_stream(asock);
+    else
+        activesock_destroy_iphone_os_stream(asock);
+}
+#endif
 
 PJ_DEF(pj_status_t) pj_activesock_create( pj_pool_t *pool,
@@ -157 +214 @@
     }
 
+#if defined(PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT) && \
+    PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT!=0
+    asock->sock = sock;
+    pj_activesock_set_iphone_os_bg(asock,
+                                   PJ_ACTIVESOCK_TCP_IPHONE_OS_BG);
+#endif
+
     *p_asock = asock;
     return PJ_SUCCESS;
@@ -216 +280 @@
     PJ_ASSERT_RETURN(asock, PJ_EINVAL);
     if (asock->key) {
+#if defined(PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT) && \
+    PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT!=0
+        activesock_destroy_iphone_os_stream(asock);
+#endif  
+        
         pj_ioqueue_unregister(asock->key);
         asock->key = NULL;
@@ -734 +803 @@
                 return;
 
+#if defined(PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT) && \
+    PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT!=0
+            activesock_create_iphone_os_stream(asock);
+#endif
         } else if (status==PJ_SUCCESS) {
             /* Application doesn't handle the new socket, we need to 
@@ -776 +849 @@
             return;
         }
+        
+#if defined(PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT) && \
+    PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT!=0
+        activesock_create_iphone_os_stream(asock);
+#endif
+        
     }
 }