rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove TLS option in socket_client_open/3

Browse Source
This commit is contained in:
Adrián Arroyo Calle
2022-01-09 17:04:54 +01:00
parent 07bc97fb31
commit 35670c8654
3 changed files with 3 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/instructions-template/src/lib.rs
View File

@@ -442,7 +442,7 @@ enum SystemClauseType {
SkipMaxList, SkipMaxList,
#[strum_discriminants(strum(props(Arity = "1", Name = "$sleep")))] #[strum_discriminants(strum(props(Arity = "1", Name = "$sleep")))]
Sleep, Sleep,
#[strum_discriminants(strum(props(Arity = "8", Name = "$socket_client_open")))] #[strum_discriminants(strum(props(Arity = "7", Name = "$socket_client_open")))]
SocketClientOpen, SocketClientOpen,
#[strum_discriminants(strum(props(Arity = "3", Name = "$socket_server_open")))] #[strum_discriminants(strum(props(Arity = "3", Name = "$socket_server_open")))]
SocketServerOpen, SocketServerOpen,

2
src/lib/sockets.pl
View File

@@ -25,7 +25,7 @@ socket_client_open(Addr, Stream, Options) :-
builtins:parse_stream_options(Options, builtins:parse_stream_options(Options,
[Alias, EOFAction, Reposition, Type], [Alias, EOFAction, Reposition, Type],
socket_client_open/3), socket_client_open/3),
'$socket_client_open'(Address, Port, Stream, Alias, EOFAction, Reposition, Type, false). '$socket_client_open'(Address, Port, Stream, Alias, EOFAction, Reposition, Type).
socket_server_open(Addr, ServerSocket) :- socket_server_open(Addr, ServerSocket) :-

37
src/machine/system_calls.rs
View File

@@ -4161,42 +4161,7 @@ impl Machine {
let stream = match TcpStream::connect(socket_addr.as_str()).map_err(|e| e.kind()) { let stream = match TcpStream::connect(socket_addr.as_str()).map_err(|e| e.kind()) {
Ok(tcp_stream) => { Ok(tcp_stream) => {
let mut stream = { let mut stream = Stream::from_tcp_stream(socket_addr, tcp_stream, &mut self.machine_st.arena);
let tls = cell_as_atom!(self.machine_st.store(self.machine_st.deref(
self.machine_st.registers[8]
)));
match tls {
atom!("false") => {
Stream::from_tcp_stream(socket_addr, tcp_stream, &mut self.machine_st.arena)
}
atom!("true") => {
let connector = TlsConnector::new().unwrap();
let stream = Stream::from_tcp_stream(
socket_addr,
tcp_stream,
&mut self.machine_st.arena,
);
let stream =
match connector.connect(socket_atom.as_str(), stream) {
Ok(tls_stream) => tls_stream,
Err(_) => {
return Err(self.machine_st.open_permission_error(
addr,
atom!("socket_client_open"),
3,
));
}
};
Stream::from_tls_stream(atom!("TLS"), stream, &mut self.machine_st.arena)
}
_ => {
unreachable!()
}
}
};
*stream.options_mut() = options; *stream.options_mut() = options;