Merge branch 'dev' of /var/lib/git/libucore into dev

2014-03-02 04:00:03 +01:00
parent c3a900ea53 619af7aedc
commit 74f3d9253b
1 changed files with 4 additions and 4 deletions
@@ -35,14 +35,14 @@ int uc_set_tcp_keepalive(int sockfd);


 struct UCKeepConfig {
-    /** The maximum number of keepalive probes TCP should 
-     * send before dropping the connection. (TCP_KEEPCNT socket option)
-     */
-    int keepcnt;
    /** The time (in seconds) the connection needs to remain 
     * idle before TCP starts sending keepalive probes (TCP_KEEPIDLE socket option)
     */
    int keepidle;
+    /** The maximum number of keepalive probes TCP should 
+     * send before dropping the connection. (TCP_KEEPCNT socket option)
+     */
+    int keepcnt;
    /** The time (in seconds) between individual keepalive probes.
     *  (TCP_KEEPINTVL socket option)
     */