diff --git a/client/src/main.rs b/client/src/main.rs index ac1384c..e77ea5c 100644 --- a/client/src/main.rs +++ b/client/src/main.rs @@ -11,9 +11,9 @@ use proto::writer::oneway::OneWayProtoWriter; #[tokio::main] async fn main() -> anyhow::Result<()> { - let add = "127.0.0.1:5432"; + let addr = "127.0.0.1:5432"; - let mut stream = TcpStream::connect(add).await?; + let mut stream = TcpStream::connect(addr).await?; let (reader, writer) = stream.split(); let mut writer = ProtoWriter::new(BufWriter::new(writer)); diff --git a/server/src/main.rs b/server/src/main.rs index f5ea267..bda6dfd 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -34,6 +34,7 @@ async fn handle_stream(mut stream: TcpStream) -> anyhow::Result<()> { let mut reader = ProtoReader::new(BufReader::new(reader), 1024); let response = HandshakeResponse::new("minisql", 123, 123); + let request = do_server_handshake(&mut writer, &mut reader, response).await?; println!("Handshake complete:\n{request:?}"); @@ -54,7 +55,7 @@ async fn handle_stream(mut stream: TcpStream) -> anyhow::Result<()> { send_error_response(&mut writer, "Car not found").await?; } else if data.query.as_str().to_lowercase().contains("select") { println!("Sending table"); - send_query_repsonse(&mut writer).await?; + send_query_response(&mut writer).await?; } else { println!("Sending empty query"); send_empty_query(&mut writer).await?; @@ -144,7 +145,7 @@ async fn send_row_description(writer: &mut impl BackendProtoWriter) -> anyhow::R Ok(()) } -async fn send_query_repsonse(writer: &mut impl BackendProtoWriter) -> anyhow::Result<()> { +async fn send_query_response(writer: &mut impl BackendProtoWriter) -> anyhow::Result<()> { send_row_description(writer).await?; write_row(writer, b"0", b"1337", b"auto").await?;