Changeset 710:e60376cb15e8 in freeDiameter for libfdcore/sctp.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/sctp.c (modified) (2 diffs)

libfdcore/sctp.c

@@ -1041 +1041 @@
         ret = sendmsg(conn->cc_socket, &mhdr, 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 */
@@ -1099 +1100 @@
         pthread_cleanup_push(free, data);
         ret = recvmsg(conn->cc_socket, &mhdr, 0);
+        pthread_testcancel();
         pthread_cleanup_pop(0);
         
         /* First, handle timeouts (same as fd_cnx_s_recv) */
-        if ((ret < 0) && (errno == EAGAIN)) {
+        if ((ret < 0) && ((errno == EAGAIN) || (errno == EINTR))) {
                 if (! fd_cnx_teststate(conn, CC_STATUS_CLOSING ))
                         goto again; /* don't care, just ignore */