Changeset 12757 for trunk/FACT++/dim/src/tcpip.c

Timestamp:

01/24/12 13:41:57 (13 years ago)

Author:

tbretz

Message:

Switched to v19r27

File:

• trunk/FACT++/dim/src/tcpip.c (modified) (5 diffs)

trunk/FACT++/dim/src/tcpip.c

@@ -89 +89 @@
 static int DIM_IO_valid = 1;
 
-static int Write_timeout = 5;
+static int Keepalive_timeout_set = 0;
+static int Write_timeout = WRITE_TMOUT;
+static int Write_timeout_set = 0;
 static int Write_buffer_size = TCP_SND_BUF_SIZE;
 static int Read_buffer_size = TCP_RCV_BUF_SIZE;
@@ -96 +98 @@
 int Tcpip_max_io_data_read = TCP_RCV_BUF_SIZE - 16;
 
+void dim_set_keepalive_timeout(int secs)
+{
+        Keepalive_timeout_set = secs;
+}
+
+int dim_get_keepalive_timeout()
+{
+        int ret;
+        extern int get_keepalive_tmout();
+
+        if(!(ret = Keepalive_timeout_set))
+        {
+                ret = get_keepalive_tmout();
+        }
+        return(ret);
+}
+
 void dim_set_write_timeout(int secs)
 {
-  Write_timeout = secs;
+        Write_timeout = secs;
+        Write_timeout_set = 1;
 }
 
 int dim_get_write_timeout()
 {
-  return(Write_timeout);
+        int ret;
+        extern int get_write_tmout();
+
+        if(!Write_timeout_set)
+        {
+                if((ret = get_write_tmout()))
+                        Write_timeout = ret;
+        }
+        return(Write_timeout);
 }
 
@@ -196 +224 @@
         void tcpip_pipe_sig_handler();
 #endif
-
-        if(init_done) return(1);
+        extern int get_write_tmout();
+
+        if(init_done) 
+                return(1);
+
+        dim_get_write_timeout();
 #ifdef WIN32
         init_sock();
@@ -462 +494 @@
    val = 3;
    setsockopt(channel, IPPROTO_TCP, TCP_KEEPCNT, (char*)&val, sizeof(val));
-   val = 2;
+   val = tmout/3;
    setsockopt(channel, IPPROTO_TCP, TCP_KEEPINTVL, (char*)&val, sizeof(val));
 }
@@ -490 +522 @@
 void tcpip_set_test_write(int conn_id, int timeout)
 {
+
 #if defined(__linux__) && !defined (darwin)
         tcpip_set_keepalive(Net_conns[conn_id].channel, timeout);
 #else
+
         Net_conns[conn_id].timr_ent = dtq_add_entry( queue_id, timeout, 
                 tcpip_test_write, conn_id );
         Net_conns[conn_id].timeout = timeout;
         Net_conns[conn_id].last_used = time(NULL);
-#endif
+
+#endif
+
 }