Changeset 201:1b47afa59358 in freeDiameter

Timestamp:

Feb 10, 2010, 11:22:42 AM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Also timeout on sends

Location:

freeDiameter

Files:

• cnxctx.c (modified) (4 diffs)
• cnxctx.h (modified) (1 diff)
• sctp.c (modified) (3 diffs)
• sctps.c (modified) (1 diff)

freeDiameter/cnxctx.c

@@ -507 +507 @@
         tv.tv_sec = 3;  /* allow 3 seconds timeout for TLS session cleanup */
         CHECK_SYS_DO( setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)), /* best effort only */ );
+        CHECK_SYS_DO( setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)), /* Also timeout for sending, to avoid waiting forever */ );
 }       
 
@@ -533 +534 @@
 static ssize_t fd_cnx_s_send(struct cnxctx * conn, void *buffer, size_t length)
 {
-        return send(conn->cc_socket, buffer, length, 0);
+        ssize_t ret = 0;
+        int timedout = 0;
+again:
+        ret = send(conn->cc_socket, buffer, length, 0);
+        /* Handle special case of timeout */
+        if ((ret < 0) && (errno == EAGAIN)) {
+                if (!conn->cc_closing)
+                        goto again; /* don't care, just ignore */
+                if (!timedout) {
+                        timedout ++; /* allow for one timeout while closing */
+                        goto again;
+                }
+                CHECK_SYS_DO(ret, /* continue */);
+        }
+        
+        return ret;
 }
 
@@ -1236 +1252 @@
                         CHECK_GNUTLS_DO( ret = fd_tls_send_handle_error(conn, conn->cc_tls_para.session, buf + sent, len - sent), return ENOTCONN );
                 } else {
-                        CHECK_SYS( ret = send(conn->cc_socket, buf + sent, len - sent, 0) ); /* better to replace with sendmsg for atomic sending? */
+                        CHECK_SYS( ret = fd_cnx_s_send(conn, buf + sent, len - sent) ); /* better to replace with sendmsg for atomic sending? */
                 }
                 sent += ret;
@@ -1272 +1288 @@
                         } else {
                                 if (!conn->cc_tls) {
-                                        CHECK_FCT( fd_sctp_sendstr(conn->cc_socket, conn->cc_sctp_para.next, buf, len) );
+                                        CHECK_FCT( fd_sctp_sendstr(conn->cc_socket, conn->cc_sctp_para.next, buf, len, &conn->cc_closing) );
                                 } else {
                                         /* push the record to the appropriate session */

freeDiameter/cnxctx.h

@@ -103 +103 @@
 int fd_sctp_get_remote_ep(int sock, struct fd_list * list);
 int fd_sctp_get_str_info( int sock, uint16_t *in, uint16_t *out, sSS *primary );
-int fd_sctp_sendstr(int sock, uint16_t strid, uint8_t * buf, size_t len);
+int fd_sctp_sendstr(int sock, uint16_t strid, uint8_t * buf, size_t len, int * cc_closing);
 int fd_sctp_recvmeta(int sock, uint16_t * strid, uint8_t ** buf, size_t * len, int *event, int * cc_closing);
 

freeDiameter/sctp.c

@@ -1042 +1042 @@
 
 /* Send a buffer over a specified stream */
-int fd_sctp_sendstr(int sock, uint16_t strid, uint8_t * buf, size_t len)
+int fd_sctp_sendstr(int sock, uint16_t strid, uint8_t * buf, size_t len, int * cc_closing)
 {
         struct msghdr mhdr;
@@ -1051 +1051 @@
         } anci;
         ssize_t ret;
-        
-        TRACE_ENTRY("%d %hu %p %zd", sock, strid, buf, len);
+        int timedout = 0;
+        
+        TRACE_ENTRY("%d %hu %p %zd %p", sock, strid, buf, len, cc_closing);
+        CHECK_PARAMS(cc_closing);
         
         memset(&mhdr, 0, sizeof(mhdr));
@@ -1078 +1080 @@
         
         TRACE_DEBUG(FULL, "Sending %db data on stream %hu of socket %d", len, strid, sock);
-        
-        CHECK_SYS( ret = sendmsg(sock, &mhdr, 0) );
+again:  
+        ret = sendmsg(sock, &mhdr, 0);
+        /* Handle special case of timeout */
+        if ((ret < 0) && (errno == EAGAIN)) {
+                if (!*cc_closing)
+                        goto again; /* don't care, just ignore */
+                if (!timedout) {
+                        timedout ++; /* allow for one timeout while closing */
+                        goto again;
+                }
+        }
+        
+        CHECK_SYS( ret );
         ASSERT( ret == len ); /* There should not be partial delivery with sendmsg... */
         

freeDiameter/sctps.c

@@ -166 +166 @@
         CHECK_PARAMS_DO( tr && data, { errno = EINVAL; return -1; } );
         
-        CHECK_FCT_DO( fd_sctp_sendstr(ctx->parent->cc_socket, ctx->strid, (uint8_t *)data, len), /* errno is already set */ return -1 );
+        CHECK_FCT_DO( fd_sctp_sendstr(ctx->parent->cc_socket, ctx->strid, (uint8_t *)data, len, &ctx->parent->cc_closing), /* errno is already set */ return -1 );
         
         return len;