Add early data reason interface.

Author: ChrisTeg

include/tquic.h

@@ -1006,7 +1006,14 @@ void quic_conn_session(struct quic_conn_t *conn, const uint8_t **out, size_t *ou
 /**
  * Return details why 0-RTT was accepted or rejected.
  */
-int quic_conn_early_data_reason(struct quic_conn_t *conn, const uint8_t **out, size_t *out_len);
+int quic_conn_early_data_reason(struct quic_conn_t *conn);
+
+/**
+ * Return a string representation for reason why 0-RTT was accepted or rejected.
+ */
+int quic_conn_early_data_reason_string(struct quic_conn_t *conn,
+                                       const uint8_t **out,
+                                       size_t *out_len);
 
 /**
  * Send a Ping frame on the active path(s) for keep-alive.

src/connection/connection.rs

@@ -3401,10 +3401,15 @@ impl Connection {
     }
 
     /// Return details why 0-RTT was accepted or rejected.
-    pub fn early_data_reason(&self) -> Result<Option<&str>> {
+    pub fn early_data_reason(&self) -> tls::SslEarlyDataReason {
         self.tls_session.early_data_reason()
     }
 
+    /// Return a string representation for reason why 0-RTT was accepted or rejected.
+    pub fn early_data_reason_string(&self) -> Result<Option<&str>> {
+        self.tls_session.early_data_reason_string()
+    }
+
     /// Check whether the connection is draining.
     ///
     /// If true, the connection object can not yet be dropped, but no data can

src/ffi.rs

@@ -1083,12 +1083,18 @@ pub extern "C" fn quic_conn_session(
 
 /// Return details why 0-RTT was accepted or rejected.
 #[no_mangle]
-pub extern "C" fn quic_conn_early_data_reason(
+pub extern "C" fn quic_conn_early_data_reason(conn: &mut Connection) -> c_int {
+    conn.early_data_reason() as c_int
+}
+
+/// Return a string representation for reason why 0-RTT was accepted or rejected.
+#[no_mangle]
+pub extern "C" fn quic_conn_early_data_reason_string(
     conn: &mut Connection,
     out: &mut *const u8,
     out_len: &mut size_t,
 ) -> c_int {
-    match conn.early_data_reason() {
+    match conn.early_data_reason_string() {
         Ok(reason) => {
             match reason {
                 Some(reason) => {

src/tls/boringssl/tls.rs

@@ -92,7 +92,8 @@ struct SslQuicMethod {
 }
 
 #[repr(C)]
-enum SslEarlyDataReason {
+#[derive(PartialEq, Debug)]
+pub enum SslEarlyDataReason {
     // The handshake has not progressed far enough for the 0-RTT status to be known.
     Unknown = 0,
     // 0-RTT is disabled for this connection.
@@ -774,7 +775,11 @@ impl Session {
         Some(peer_cert)
     }
 
-    pub fn early_data_reason(&self) -> Result<Option<&str>> {
+    pub fn early_data_reason(&self) -> SslEarlyDataReason {
+        unsafe { SSL_get_early_data_reason(self.as_ptr()) }
+    }
+
+    pub fn early_data_reason_string(&self) -> Result<Option<&str>> {
         let reason = unsafe {
             let reason = SSL_early_data_reason_string(SSL_get_early_data_reason(self.as_ptr()));
             match ffi::CStr::from_ptr(reason).to_str() {

src/tls/tls.rs

@@ -41,6 +41,7 @@ pub use boringssl::crypto::Algorithm;
 pub use boringssl::crypto::Open;
 pub use boringssl::crypto::Seal;
 pub use boringssl::tls::SslCtx;
+pub use boringssl::tls::SslEarlyDataReason;
 
 #[repr(C)]
 #[derive(Clone, Copy, Debug, PartialEq, Eq, EnumIter, EnumCount)]
@@ -581,9 +582,13 @@ impl TlsSession {
         self.session.peer_sign_algor()
     }
 
-    pub fn early_data_reason(&self) -> Result<Option<&str>> {
+    pub fn early_data_reason(&self) -> SslEarlyDataReason {
         self.session.early_data_reason()
     }
+
+    pub fn early_data_reason_string(&self) -> Result<Option<&str>> {
+        self.session.early_data_reason_string()
+    }
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -1020,6 +1025,14 @@ pub(crate) mod tests {
         assert!(tls_session_pair.client.is_resumed());
         assert!(tls_session_pair.server.is_completed());
         assert!(tls_session_pair.server.is_resumed());
+        assert_eq!(
+            tls_session_pair.server.early_data_reason_string(),
+            Ok(Some("accepted"))
+        );
+        assert_eq!(
+            tls_session_pair.server.early_data_reason(),
+            SslEarlyDataReason::Accepted
+        );
         tls_session_pair.check_keys(true)
     }
 
@@ -1045,6 +1058,14 @@ pub(crate) mod tests {
         assert!(tls_session_pair.client.is_resumed());
         assert!(tls_session_pair.server.is_completed());
         assert!(tls_session_pair.server.is_resumed());
+        assert_eq!(
+            tls_session_pair.server.early_data_reason_string(),
+            Ok(Some("disabled"))
+        );
+        assert_eq!(
+            tls_session_pair.server.early_data_reason(),
+            SslEarlyDataReason::Disabled
+        );
         tls_session_pair.check_keys(false)
     }
 
@@ -1071,6 +1092,14 @@ pub(crate) mod tests {
         assert!(tls_session_pair.client.data.early_data_rejected);
         assert!(tls_session_pair.server.is_completed());
         assert!(tls_session_pair.server.is_resumed());
+        assert_eq!(
+            tls_session_pair.server.early_data_reason_string(),
+            Ok(Some("disabled"))
+        );
+        assert_eq!(
+            tls_session_pair.server.early_data_reason(),
+            SslEarlyDataReason::Disabled
+        );
         tls_session_pair.check_keys(false)
     }
 
@@ -1098,6 +1127,14 @@ pub(crate) mod tests {
         assert!(tls_session_pair.client.data.early_data_rejected);
         assert!(tls_session_pair.server.is_completed());
         assert!(!tls_session_pair.server.is_resumed());
+        assert_eq!(
+            tls_session_pair.server.early_data_reason_string(),
+            Ok(Some("session_not_resumed"))
+        );
+        assert_eq!(
+            tls_session_pair.server.early_data_reason(),
+            SslEarlyDataReason::SessionNotResumed
+        );
         tls_session_pair.check_keys(false)
     }