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

Merge pull request #1182 from aarroyoc/sockets-arity

Browse Source 
fix socket_client_open/3
This commit is contained in:
Mark Thom
2022-01-09 12:24:39 -07:00
committed by GitHub
parent d01806ee2d 35670c8654
commit 90ecd34cfd
2 changed files with 6 additions and 40 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,

44
src/machine/system_calls.rs
View File

@@ -4115,7 +4115,7 @@ impl Machine {
let socket_atom = cell_as_atom!(addr); let socket_atom = cell_as_atom!(addr);
let _port = read_heap_cell!(port, let port = read_heap_cell!(port,
(HeapCellValueTag::Atom, (name, arity)) => { (HeapCellValueTag::Atom, (name, arity)) => {
debug_assert_eq!(arity, 0); debug_assert_eq!(arity, 0);
name name
@@ -4132,9 +4132,10 @@ impl Machine {
); );
let socket_addr = if socket_atom == atom!("") { let socket_addr = if socket_atom == atom!("") {
atom!("127.0.0.1") atom!("127.0.0.1:80")
} else { } else {
socket_atom let buffer = format!("{}:{}", socket_atom.as_str(), port.as_str());
self.machine_st.atom_tbl.build_with(&buffer)
}; };
let alias = self.machine_st.registers[4]; let alias = self.machine_st.registers[4];
@@ -4160,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;