fix Interest operation

lazytiger · May 26, 2021 · 44f671c · 44f671c
1 parent 3621cfd
commit 44f671c
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 16 deletions.
diff --git a/src/proxy/tcp_server.rs b/src/proxy/tcp_server.rs
@@ -257,19 +257,25 @@ impl Connection {
  _ => {
  let mut changed = false;
  if !self.send_buffer.is_empty() && !self.client_readiness.is_writable() {
- self.client_readiness.add(Interest::WRITABLE);
+ self.client_readiness |= Interest::WRITABLE;
  changed = true;
  }
  if self.send_buffer.is_empty() && self.client_readiness.is_writable() {
- self.client_readiness.remove(Interest::WRITABLE);
+ self.client_readiness = self
+ .client_readiness
+ .remove(Interest::WRITABLE)
+ .unwrap_or(Interest::READABLE);
  changed = true;
  }
  if self.server_conn.writable() && !self.client_readiness.is_readable() {
- self.client_readiness.add(Interest::READABLE);
+ self.client_readiness |= Interest::READABLE;
  changed = true;
  }
  if !self.server_conn.writable() && self.client_readiness.is_readable() {
- self.client_readiness.remove(Interest::READABLE);
+ self.client_readiness = self
+ .client_readiness
+ .remove(Interest::READABLE)
+ .unwrap_or(Interest::WRITABLE);
  changed = true;
  }
 

diff --git a/src/server/tcp_backend.rs b/src/server/tcp_backend.rs
@@ -103,22 +103,28 @@ impl Backend for TcpBackend {
  _ => {
  let mut changed = false;
  if !self.send_buffer.is_empty() && !self.readiness.is_writable() {
- self.readiness.add(Interest::WRITABLE);
+ self.readiness |= Interest::WRITABLE;
  changed = true;
  log::debug!("connection:{} add writable to tcp target", self.index);
  }
  if self.send_buffer.is_empty() && self.readiness.is_writable() {
- self.readiness.remove(Interest::WRITABLE);
+ self.readiness = self
+ .readiness
+ .remove(Interest::WRITABLE)
+ .unwrap_or(Interest::READABLE);
  changed = true;
  log::debug!("connection:{} remove writable from tcp target", self.index);
  }
  if readable && !self.readiness.is_readable() {
- self.readiness.add(Interest::READABLE);
+ self.readiness |= Interest::READABLE;
  log::debug!("connection:{} add readable to tcp target", self.index);
  changed = true;
  }
  if !readable && self.readiness.is_readable() {
- self.readiness.remove(Interest::READABLE);
+ self.readiness = self
+ .readiness
+ .remove(Interest::READABLE)
+ .unwrap_or(Interest::WRITABLE);
  log::debug!("connection:{} remove readable from tcp target", self.index);
  changed = true;
  }

diff --git a/src/server/udp_backend.rs b/src/server/udp_backend.rs
@@ -191,22 +191,28 @@ impl Backend for UdpBackend {
  _ => {
  let mut changed = false;
  if !self.send_buffer.is_empty() && !self.readiness.is_writable() {
- self.readiness.add(Interest::WRITABLE);
+ self.readiness |= Interest::WRITABLE;
  changed = true;
  log::debug!("connection:{} add writable to udp target", self.index);
  }
  if self.send_buffer.is_empty() && self.readiness.is_writable() {
- self.readiness.remove(Interest::WRITABLE);
+ self.readiness = self
+ .readiness
+ .remove(Interest::WRITABLE)
+ .unwrap_or(Interest::READABLE);
  changed = true;
  log::debug!("connection:{} remove writable from udp target", self.index);
  }
  if readable && !self.readiness.is_readable() {
- self.readiness.add(Interest::READABLE);
+ self.readiness |= Interest::READABLE;
  log::debug!("connection:{} add readable to udp target", self.index);
  changed = true;
  }
  if !readable && self.readiness.is_readable() {
- self.readiness.remove(Interest::READABLE);
+ self.readiness = self
+ .readiness
+ .remove(Interest::READABLE)
+ .unwrap_or(Interest::WRITABLE);
  log::debug!("connection:{} remove readable to udp target", self.index);
  changed = true;
  }

diff --git a/src/tls_conn.rs b/src/tls_conn.rs
@@ -190,20 +190,26 @@ impl<T: Session> TlsConn<T> {
  _ => {
  let mut changed = false;
  if self.session.wants_write() && !self.readiness.is_writable() {
- self.readiness.add(Interest::WRITABLE);
+ self.readiness |= Interest::WRITABLE;
  changed = true;
  }
  if !self.session.wants_write() && self.readiness.is_writable() {
- self.readiness.remove(Interest::WRITABLE);
+ self.readiness = self
+ .readiness
+ .remove(Interest::WRITABLE)
+ .unwrap_or(Interest::READABLE);
  changed = true;
  }
  if readable && !self.readiness.is_readable() {
- self.readiness.add(Interest::READABLE);
+ self.readiness |= Interest::READABLE;
  changed = true;
  }
 
  if !readable && self.readiness.is_readable() {
- self.readiness.remove(Interest::READABLE);
+ self.readiness = self
+ .readiness
+ .remove(Interest::READABLE)
+ .unwrap_or(Interest::WRITABLE);
  changed = true;
  }
  if changed {