Changeset 4515 for pjproject/trunk

Timestamp:

May 3, 2013 10:32:35 AM (12 years ago)

Author:

nanang

Message:

Fixed #1664: Fixed the bug of unhandled error events in non-connecting socket state in ioqueue epoll.

File:

• pjproject/trunk/pjlib/src/pj/ioqueue_epoll.c (modified) (3 diffs)

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

@@ -713 +713 @@
             queue[processed].event_type = READABLE_EVENT;
             ++processed;
+            continue;
         }
 
@@ -726 +727 @@
             queue[processed].event_type = WRITEABLE_EVENT;
             ++processed;
+            continue;
         }
 
@@ -740 +742 @@
             queue[processed].event_type = WRITEABLE_EVENT;
             ++processed;
+            continue;
         }
 #endif /* PJ_HAS_TCP */
-        
+
         /*
          * Check for error condition.
          */
-        if (events[i].events & EPOLLERR && (h->connecting) && !IS_CLOSING(h)) {
-                
-#if PJ_IOQUEUE_HAS_SAFE_UNREG
-            increment_counter(h);
-#endif          
-            queue[processed].key = h;
-            queue[processed].event_type = EXCEPTION_EVENT;
-            ++processed;
+        if ((events[i].events & EPOLLERR) && !IS_CLOSING(h)) {
+            /*
+             * We need to handle this exception event.  If it's related to us
+             * connecting, report it as such.  If not, just report it as a
+             * read event and the higher layers will handle it.
+             */
+            if (h->connecting) {
+#if PJ_IOQUEUE_HAS_SAFE_UNREG
+                increment_counter(h);
+#endif
+                queue[processed].key = h;
+                queue[processed].event_type = EXCEPTION_EVENT;
+                ++processed;
+            } else if (!(events[i].events & EPOLLERR) &&
+                       (key_has_pending_read(h) || key_has_pending_accept(h))) {
+#if PJ_IOQUEUE_HAS_SAFE_UNREG
+                increment_counter(h);
+#endif
+                queue[processed].key = h;
+                queue[processed].event_type = READABLE_EVENT;
+                ++processed;
+            }
+            continue;
         }
     }