Changeset 248

Timestamp:

Feb 27, 2006 11:54:58 PM (18 years ago)

Author:

bennylp

Message:

Changed pjsip_endpt_handle_events() to return pj_status_t instead of void

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_endpoint.h (modified) (1 diff)
• src/pjsip/sip_endpoint.c (modified) (3 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_endpoint.h

@@ -109 +109 @@
  * @param max_timeout   Maximum time to wait for events, or NULL to wait forever
  *                      until event is received.
- */
-PJ_DECL(void) pjsip_endpt_handle_events( pjsip_endpoint *endpt, 
-                                         const pj_time_val *max_timeout);
+ *
+ * @return              PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjsip_endpt_handle_events( pjsip_endpoint *endpt, 
+                                                const pj_time_val *max_timeout);
 
 

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

@@ -66 +66 @@
     pj_ioqueue_t        *ioqueue;
 
+    /** Last ioqueue err */
+    pj_status_t          ioq_last_err;
+
     /** DNS Resolver. */
     pjsip_resolver_t    *resolver;
@@ -590 +593 @@
  * Handle events.
  */
-PJ_DEF(void) pjsip_endpt_handle_events( pjsip_endpoint *endpt,
-                                        const pj_time_val *max_timeout)
+PJ_DEF(pj_status_t) pjsip_endpt_handle_events(pjsip_endpoint *endpt,
+                                              const pj_time_val *max_timeout)
 {
     /* timeout is 'out' var. This just to make compiler happy. */
@@ -612 +615 @@
 
     /* Poll ioqueue. */
-    pj_ioqueue_poll( endpt->ioqueue, &timeout);
+    if (pj_ioqueue_poll( endpt->ioqueue, &timeout) < 0) {
+        pj_thread_sleep(1);
+        return pj_get_netos_error();
+    } else {
+        return PJ_SUCCESS;
+    }
 }