Changeset 710:e60376cb15e8 in freeDiameter for libfdcore/cnxctx.c

Timestamp:

Feb 10, 2011, 4:00:53 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Minor changes

File:

• libfdcore/cnxctx.c (modified) (2 diffs)

libfdcore/cnxctx.c

@@ -622 +622 @@
 again:
         ret = recv(conn->cc_socket, buffer, length, 0);
-        /* Handle special case of timeout */
-        if ((ret < 0) && (errno == EAGAIN)) {
+        /* Handle special case of timeout / interrupts */
+        if ((ret < 0) && ((errno == EAGAIN) || (errno == EINTR))) {
+                pthread_testcancel();
                 if (! fd_cnx_teststate(conn, CC_STATUS_CLOSING ))
                         goto again; /* don't care, just ignore */
@@ -649 +650 @@
         ret = send(conn->cc_socket, buffer, length, 0);
         /* Handle special case of timeout */
-        if ((ret < 0) && (errno == EAGAIN)) {
+        if ((ret < 0) && ((errno == EAGAIN) || (errno == EINTR))) {
+                pthread_testcancel();
                 if (! fd_cnx_teststate(conn, CC_STATUS_CLOSING ))
                         goto again; /* don't care, just ignore */