michael/panorama
1
0
Fork 0
Code Issues 11 Pull requests Projects 1 Releases Wiki Activity

WOW accidentally left a read_line statement in there, caused all the problems...

Browse source
This commit is contained in:
Michael Zhang 2021-02-21 07:48:11 -06:00
parent 417c008190
commit 0b6b853662
Signed by: michael
GPG key ID: BDA47A31A3C8EE6B
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
imap/src/client/inner.rs
View file

@ -97,6 +97,7 @@ where
let cmd_str = format!("{}{} {}\r\n", TAG_PREFIX, id, cmd); let cmd_str = format!("{}{} {}\r\n", TAG_PREFIX, id, cmd);
debug!("[{}] writing to socket: {:?}", id, cmd_str); debug!("[{}] writing to socket: {:?}", id, cmd_str);
self.conn.write_all(cmd_str.as_bytes()).await?; self.conn.write_all(cmd_str.as_bytes()).await?;
self.conn.flush().await?;
debug!("[{}] written.", id); debug!("[{}] written.", id);
ExecHandle(self, id).await; ExecHandle(self, id).await;
@ -215,6 +216,7 @@ where
match future::select(fut, fut2).await { match future::select(fut, fut2).await {
Either::Left((_, _)) => { Either::Left((_, _)) => {
debug!("got a new line");
let next_line = next_line.trim_end_matches('\n').trim_end_matches('\r'); let next_line = next_line.trim_end_matches('\n').trim_end_matches('\r');
let mut parts = next_line.split(" "); let mut parts = next_line.split(" ");
@ -223,6 +225,8 @@ where
if tag == "*" { if tag == "*" {
debug!("UNTAGGED {:?}", rest); debug!("UNTAGGED {:?}", rest);
// TODO: verify that the greeting is actually an OK
if let Some(greeting) = greeting.take() { if let Some(greeting) = greeting.take() {
let (greeting, waker) = &mut *greeting.write(); let (greeting, waker) = &mut *greeting.write();
debug!("got greeting"); debug!("got greeting");
@ -249,8 +253,6 @@ where
break; break;
} }
} }
reader.read_line(&mut next_line).await?;
} }
let conn = reader.into_inner(); let conn = reader.into_inner();