itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2025-11-17 13:59:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Established connection!

Browse Source
This commit is contained in:
Daniel Akhterov 2019-06-24 01:01:58 -07:00 committed by Daniel Akhterov
parent 89b89eaec7
commit 3679593f63
4 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mason-mariadb/src/connection/establish.rs
View File

@ -28,16 +28,14 @@ pub async fn establish<'a, 'b: 'a>(
Err(failure::err_msg("Failed to connect")) Err(failure::err_msg("Failed to connect"))
}?; }?;
// println!("{:?}", init_packet);
let handshake = HandshakeResponsePacket { let handshake = HandshakeResponsePacket {
server_capabilities: init_packet.capabilities, server_capabilities: init_packet.capabilities,
sequence_number: 0, sequence_number: 1,
capabilities: init_packet.capabilities, capabilities: Capabilities::CLIENT_PROTOCOL_41,
max_packet_size: 1024, max_packet_size: 1024,
collation: 0, collation: 0,
extended_capabilities: Some(Capabilities::from_bits_truncate(0)), extended_capabilities: Some(Capabilities::from_bits_truncate(0)),
username: Bytes::from("username"), username: Bytes::from("root"),
auth_data: None, auth_data: None,
auth_response_len: None, auth_response_len: None,
auth_response: None, auth_response: None,
@ -49,7 +47,6 @@ pub async fn establish<'a, 'b: 'a>(
conn.send(handshake).await?; conn.send(handshake).await?;
if let Some(message) = conn.incoming.next().await { if let Some(message) = conn.incoming.next().await {
println!("{:?}", message);
Ok(()) Ok(())
} else { } else {
Err(failure::err_msg("Handshake Failed")) Err(failure::err_msg("Handshake Failed"))

2
mason-mariadb/src/connection/mod.rs
View File

@ -105,8 +105,6 @@ async fn receiver(
break; break;
} }
println!("{:?}", rbuf);
while len > 0 { while len > 0 {
let size = rbuf.len(); let size = rbuf.len();
let message = if first_packet { let message = if first_packet {

10
mason-mariadb/src/protocol/deserialize.rs
View File

@ -39,8 +39,8 @@ pub fn deserialize_int_lenenc(buf: &Bytes, index: &mut usize) -> Option<usize> {
} }
0xFF => panic!("int<lenenc> unprocessable first byte 0xFF"), 0xFF => panic!("int<lenenc> unprocessable first byte 0xFF"),
_ => { _ => {
let value = Some(buf[*index + 1] as usize); let value = Some(buf[*index] as usize);
*index += 2; *index += 1;
value value
} }
} }
@ -198,12 +198,12 @@ mod tests {
#[test] #[test]
fn it_decodes_int_lenenc_0x_fa() { fn it_decodes_int_lenenc_0x_fa() {
let buf = BytesMut::from(b"\xFA\x01".to_vec()); let buf = BytesMut::from(b"\xFA".to_vec());
let mut index = 0; let mut index = 0;
let int: Option<usize> = deserialize_int_lenenc(&buf.freeze(), &mut index); let int: Option<usize> = deserialize_int_lenenc(&buf.freeze(), &mut index);
assert_eq!(int, Some(1)); assert_eq!(int, Some(0xfA));
assert_eq!(index, 2); assert_eq!(index, 1);
} }
#[test] #[test]

11
mason-mariadb/src/protocol/server.rs
View File

@ -195,13 +195,11 @@ impl Message {
let serial_number = [3]; let serial_number = [3];
let tag = buf[4]; let tag = buf[4];
println!("{:?}", buf);
Ok(Some(match tag { Ok(Some(match tag {
0xFF => { 0xFF => {
Message::ErrPacket(ErrPacket::deserialize(&buf)?) Message::ErrPacket(ErrPacket::deserialize(&buf)?)
} }
0x00 => { 0x00 | 0xFE => {
Message::OkPacket(OkPacket::deserialize(&buf)?) Message::OkPacket(OkPacket::deserialize(&buf)?)
} }
_ => { _ => {
@ -215,7 +213,6 @@ impl Message {
return Ok(None); return Ok(None);
} }
println!("length: {:?}", length);
match InitialHandshakePacket::deserialize(&buf.split_to(length + 4).freeze()) { match InitialHandshakePacket::deserialize(&buf.split_to(length + 4).freeze()) {
Ok(v) => Ok(Some(Message::InitialHandshakePacket(v))), Ok(v) => Ok(Some(Message::InitialHandshakePacket(v))),
Err(_) => Ok(None), Err(_) => Ok(None),
@ -305,12 +302,14 @@ impl Deserialize for OkPacket {
fn deserialize(buf: &Bytes) -> Result<Self, Error> { fn deserialize(buf: &Bytes) -> Result<Self, Error> {
let mut index = 0; let mut index = 0;
// Packet header
let length = deserialize_length(&buf, &mut index)?; let length = deserialize_length(&buf, &mut index)?;
let _sequence_number = deserialize_int_1(&buf, &mut index); let _sequence_number = deserialize_int_1(&buf, &mut index);
// Packet body
let packet_header = deserialize_int_1(&buf, &mut index); let packet_header = deserialize_int_1(&buf, &mut index);
if packet_header != 0 { if packet_header != 0 && packet_header != 0xFE {
panic!("Packet header is not 0 for OkPacket"); panic!("Packet header is not 0 or 0xFE for OkPacket");
} }
let affected_rows = deserialize_int_lenenc(&buf, &mut index); let affected_rows = deserialize_int_lenenc(&buf, &mut index);