From: Markus Triska <triska@metalevel.at>
Date: Sun, 5 Dec 2021 16:11:38 +0000 (+0100)
Subject: implement tls_client_negotiate/3 for explicit negotiation
X-Git-Tag: v0.9.0~4^2~2
X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=7e8a635e7eb41e11058703784a08c9810ce0a00e;p=scryer-prolog.git

implement tls_client_negotiate/3 for explicit negotiation
---

diff --git a/src/clause_types.rs b/src/clause_types.rs
index 5419eb85..cb654867 100644
--- a/src/clause_types.rs
+++ b/src/clause_types.rs
@@ -274,6 +274,7 @@ pub(crate) enum SystemClauseType {
     SocketServerAccept,
     SocketServerClose,
     TLSAcceptClient,
+    TLSClientConnect,
     Succeed,
     TermAttributedVariables,
     TermVariables,
@@ -565,6 +566,7 @@ impl SystemClauseType {
             &SystemClauseType::SocketServerAccept => clause_name!("$socket_server_accept"),
             &SystemClauseType::SocketServerClose => clause_name!("$socket_server_close"),
             &SystemClauseType::TLSAcceptClient => clause_name!("$tls_accept_client"),
+            &SystemClauseType::TLSClientConnect => clause_name!("$tls_client_connect"),
             &SystemClauseType::Succeed => clause_name!("$succeed"),
             &SystemClauseType::TermAttributedVariables => {
                 clause_name!("$term_attributed_variables")
@@ -747,6 +749,7 @@ impl SystemClauseType {
             ("$socket_server_accept", 7) => Some(SystemClauseType::SocketServerAccept),
             ("$socket_server_close", 1) => Some(SystemClauseType::SocketServerClose),
             ("$tls_accept_client", 4) => Some(SystemClauseType::TLSAcceptClient),
+            ("$tls_client_connect", 3) => Some(SystemClauseType::TLSClientConnect),
             ("$store_global_var", 2) => Some(SystemClauseType::StoreGlobalVar),
             ("$store_backtrackable_global_var", 2) => {
                 Some(SystemClauseType::StoreBacktrackableGlobalVar)
diff --git a/src/machine/system_calls.rs b/src/machine/system_calls.rs
index 960cc361..0505e138 100644
--- a/src/machine/system_calls.rs
+++ b/src/machine/system_calls.rs
@@ -4176,45 +4176,7 @@ impl MachineState {
                     Ok(tcp_stream) => {
                         let socket_addr = clause_name!(socket_addr, self.atom_tbl);
 
-                        let mut stream = {
-                            let tls = match self.store(self.deref(self[temp_v!(8)])) {
-                                Addr::Con(h) if self.heap.atom_at(h) => {
-                                    if let HeapCellValue::Atom(ref atom, _) = &self.heap[h] {
-                                        atom.as_str()
-                                    } else {
-                                        unreachable!()
-                                    }
-                                }
-                                _ => {
-                                    unreachable!()
-                                }
-                            };
-
-                            match tls {
-                                "false" => Stream::from_tcp_stream(socket_addr, tcp_stream),
-                                "true" => {
-                                    let connector = TlsConnector::new().unwrap();
-                                    let stream = Stream::from_tcp_stream(socket_addr, tcp_stream);
-                                    let stream =
-                                        match connector.connect(socket_atom.as_str(), stream) {
-                                            Ok(tls_stream) => tls_stream,
-                                            Err(_) => {
-                                                return Err(self.open_permission_error(
-                                                    addr,
-                                                    "socket_client_open",
-                                                    3,
-                                                ));
-                                            }
-                                        };
-
-                                    let addr = clause_name!("TLS".to_string(), self.atom_tbl);
-                                    Stream::from_tls_stream(addr, stream)
-                                }
-                                _ => {
-                                    unreachable!()
-                                }
-                            }
-                        };
+                        let mut stream = Stream::from_tcp_stream(socket_addr, tcp_stream);
 
                         *stream.options_mut() = options;
 
@@ -4418,6 +4380,37 @@ impl MachineState {
                     }
                 }
             }
+            &SystemClauseType::TLSClientConnect => {
+                let hostname = self.heap_pstr_iter(self[temp_v!(1)]).to_string();
+
+                let stream0 = self.get_stream_or_alias(
+                    self[temp_v!(2)],
+                    &indices.stream_aliases,
+                    "tls_client_negotiate",
+                    3,
+                )?;
+
+                let connector = TlsConnector::new().unwrap();
+                let stream =
+                    match connector.connect(&hostname, stream0) {
+                        Ok(tls_stream) => tls_stream,
+                        Err(_) => {
+                            return Err(self.open_permission_error(
+                                self[temp_v!(1)],
+                                "tls_client_negotiate",
+                                3,
+                            ));
+                        }
+                    };
+
+                let addr = clause_name!("TLS".to_string(), self.atom_tbl);
+                let stream = Stream::from_tls_stream(addr, stream);
+                indices.streams.insert(stream.clone());
+
+                let stream = self.heap.to_unifiable(HeapCellValue::Stream(stream));
+                let stream_addr = self.store(self.deref(self[temp_v!(3)]));
+                self.bind(stream_addr.as_var().unwrap(), stream);
+            }
             &SystemClauseType::TLSAcceptClient => {
                 let pkcs12 = self.string_encoding_bytes(1, "octet");
                 let password = self.heap_pstr_iter(self[temp_v!(2)]).to_string();