Merge pull request #163 from alexcrichton/keepalive

Bind TCP keepalive-related options

Author: alexcrichton

curl-sys/lib.rs

@@ -589,9 +589,9 @@ pub const CURLOPT_CLOSESOCKETDATA: CURLoption = CURLOPTTYPE_OBJECTPOINT + 209;
 pub const CURLOPT_GSSAPI_DELEGATION: CURLoption = CURLOPTTYPE_LONG + 210;
 // pub const CURLOPT_DNS_SERVERS: CURLoption = CURLOPTTYPE_OBJECTPOINT + 211;
 // pub const CURLOPT_ACCEPTTIMEOUT_MS: CURLoption = CURLOPTTYPE_LONG + 212;
-// pub const CURLOPT_TCP_KEEPALIVE: CURLoption = CURLOPTTYPE_LONG + 213;
-// pub const CURLOPT_TCP_KEEPIDLE: CURLoption = CURLOPTTYPE_LONG + 214;
-// pub const CURLOPT_TCP_KEEPINTVL: CURLoption = CURLOPTTYPE_LONG + 215;
+pub const CURLOPT_TCP_KEEPALIVE: CURLoption = CURLOPTTYPE_LONG + 213;
+pub const CURLOPT_TCP_KEEPIDLE: CURLoption = CURLOPTTYPE_LONG + 214;
+pub const CURLOPT_TCP_KEEPINTVL: CURLoption = CURLOPTTYPE_LONG + 215;
 pub const CURLOPT_SSL_OPTIONS: CURLoption = CURLOPTTYPE_LONG + 216;
 // pub const CURLOPT_MAIL_AUTH: CURLoption = CURLOPTTYPE_OBJECTPOINT + 217;
 // pub const CURLOPT_SASL_IR: CURLoption = CURLOPTTYPE_LONG + 218;

src/easy/handle.rs

@@ -600,6 +600,21 @@ impl Easy {
         self.inner.tcp_nodelay(enable)
     }
 
+    /// Same as [`Easy2::tcp_keepalive`](struct.Easy2.html#method.tcp_keepalive)
+    pub fn tcp_keepalive(&mut self, enable: bool) -> Result<(), Error> {
+        self.inner.tcp_keepalive(enable)
+    }
+
+    /// Same as [`Easy2::tcp_keepintvl`](struct.Easy2.html#method.tcp_keepalive)
+    pub fn tcp_keepintvl(&mut self, dur: Duration) -> Result<(), Error> {
+        self.inner.tcp_keepintvl(dur)
+    }
+
+    /// Same as [`Easy2::tcp_keepidle`](struct.Easy2.html#method.tcp_keepidle)
+    pub fn tcp_keepidle(&mut self, dur: Duration) -> Result<(), Error> {
+        self.inner.tcp_keepidle(dur)
+    }
+
     /// Same as [`Easy2::address_scope`](struct.Easy2.html#method.address_scope)
     pub fn address_scope(&mut self, scope: u32) -> Result<(), Error> {
         self.inner.address_scope(scope)

src/easy/handler.rs

@@ -923,35 +923,35 @@ impl<H> Easy2<H> {
         self.setopt_long(curl_sys::CURLOPT_TCP_NODELAY, enable as c_long)
     }
 
-    // /// Configures whether TCP keepalive probes will be sent.
-    // ///
-    // /// The delay and frequency of these probes is controlled by `tcp_keepidle`
-    // /// and `tcp_keepintvl`.
-    // ///
-    // /// By default this option is `false` and corresponds to
-    // /// `CURLOPT_TCP_KEEPALIVE`.
-    // pub fn tcp_keepalive(&mut self, enable: bool) -> Result<(), Error> {
-    //     self.setopt_long(curl_sys::CURLOPT_TCP_KEEPALIVE, enable as c_long)
-    // }
+    /// Configures whether TCP keepalive probes will be sent.
+    ///
+    /// The delay and frequency of these probes is controlled by `tcp_keepidle`
+    /// and `tcp_keepintvl`.
+    ///
+    /// By default this option is `false` and corresponds to
+    /// `CURLOPT_TCP_KEEPALIVE`.
+    pub fn tcp_keepalive(&mut self, enable: bool) -> Result<(), Error> {
+        self.setopt_long(curl_sys::CURLOPT_TCP_KEEPALIVE, enable as c_long)
+    }
 
-    // /// Configures the TCP keepalive idle time wait.
-    // ///
-    // /// This is the delay, after which the connection is idle, keepalive probes
-    // /// will be sent. Not all operating systems support this.
-    // ///
-    // /// By default this corresponds to `CURLOPT_TCP_KEEPIDLE`.
-    // pub fn tcp_keepidle(&mut self, amt: Duration) -> Result<(), Error> {
-    //     self.setopt_long(curl_sys::CURLOPT_TCP_KEEPIDLE,
-    //                      amt.as_secs() as c_long)
-    // }
-    //
-    // /// Configures the delay between keepalive probes.
-    // ///
-    // /// By default this corresponds to `CURLOPT_TCP_KEEPINTVL`.
-    // pub fn tcp_keepintvl(&mut self, amt: Duration) -> Result<(), Error> {
-    //     self.setopt_long(curl_sys::CURLOPT_TCP_KEEPINTVL,
-    //                      amt.as_secs() as c_long)
-    // }
+    /// Configures the TCP keepalive idle time wait.
+    ///
+    /// This is the delay, after which the connection is idle, keepalive probes
+    /// will be sent. Not all operating systems support this.
+    ///
+    /// By default this corresponds to `CURLOPT_TCP_KEEPIDLE`.
+    pub fn tcp_keepidle(&mut self, amt: Duration) -> Result<(), Error> {
+        self.setopt_long(curl_sys::CURLOPT_TCP_KEEPIDLE,
+                         amt.as_secs() as c_long)
+    }
+
+    /// Configures the delay between keepalive probes.
+    ///
+    /// By default this corresponds to `CURLOPT_TCP_KEEPINTVL`.
+    pub fn tcp_keepintvl(&mut self, amt: Duration) -> Result<(), Error> {
+        self.setopt_long(curl_sys::CURLOPT_TCP_KEEPINTVL,
+                         amt.as_secs() as c_long)
+    }
 
     /// Configures the scope for local IPv6 addresses.
     ///