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

This commit is contained in:
Nils O. Selåsdal
2014-03-02 04:00:03 +01:00
+4 -4
View File
@@ -35,14 +35,14 @@ int uc_set_tcp_keepalive(int sockfd);
struct UCKeepConfig { 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 /** The time (in seconds) the connection needs to remain
* idle before TCP starts sending keepalive probes (TCP_KEEPIDLE socket option) * idle before TCP starts sending keepalive probes (TCP_KEEPIDLE socket option)
*/ */
int keepidle; 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. /** The time (in seconds) between individual keepalive probes.
* (TCP_KEEPINTVL socket option) * (TCP_KEEPINTVL socket option)
*/ */