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

Timestamp:

06/22/11 22:18:02 (13 years ago)

Author:

tbretz

Message:

Updated from v19r21 to v19r22

File:

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

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

@@ -34 +34 @@
 #else
 /*
-#define closesock(s) shutdown(s,2);
-*/
-#define closesock close
+#define closesock(s) shutdown(s,2)
+*/
+#define closesock(s) close(s)
 #define readsock(a,b,c,d) read(a,b,c)
 
@@ -990 +990 @@
         Net_conns[conn_id].reading = -1;
         Net_conns[conn_id].timr_ent = NULL;
+        Net_conns[conn_id].write_timedout = 0;
         return(1);
 }
@@ -1114 +1115 @@
         Net_conns[conn_id].reading = -1;
         Net_conns[conn_id].timr_ent = NULL;
+        Net_conns[conn_id].write_timedout = 0;
         return(1);
 }
@@ -1188 +1190 @@
         Net_conns[conn_id].reading = -1;
         Net_conns[conn_id].timr_ent = NULL;
+        Net_conns[conn_id].write_timedout = 0;
         return(1);
 }
@@ -1279 +1282 @@
                 }
                 else
+                {
                         return(0);
+                }
+        }
+        if(wrote == -1)
+        {
+                Net_conns[conn_id].write_timedout = 1;
         }
         return(wrote);
@@ -1300 +1309 @@
         Net_conns[conn_id].task[0] = 0;
         if(channel)
+        {
+                if(Net_conns[conn_id].write_timedout)
+                {
+                        Net_conns[conn_id].write_timedout = 0;
+#if defined(__linux__) && !defined (darwin)
+                        shutdown(channel, 2);
+#endif
+                }
                 closesock(channel);
+        }
         return(1);
 }