CSY/reowolf Changeset - 526b221270eb · Centrum Wiskunde & Informatica (CWI)

Changeset - 526b221270eb

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Christopher Esterhuyse - 5 years ago 2020-07-23 15:39:51
christopher.esterhuyse@gmail.com

tightened visibility. cleaned up and simplified UDP mediator components

1 file changed with 11 insertions and 11 deletions:

src/ffi/pseudo_socket_api.rs

0 comments (0 inline, 0 general)

src/ffi/pseudo_socket_api.rs

➞

Show inline comments

 use super::*;
 use libc::{sockaddr, socklen_t};
 use std::{
     collections::HashMap,
     ffi::c_void,
     net::SocketAddr,
     os::raw::c_int,
     sync::RwLock,
 };
 use std::{collections::HashMap, ffi::c_void, net::SocketAddr, os::raw::c_int, sync::RwLock};
 ///////////////////////////////////////////////////////////////////
 struct FdAllocator {
@@ @@ -20,6 +14,7 @@ enum ConnectorComplex { @@
         peer: Option<SocketAddr>,
     },
     Communication {
         // Invariant: connector in communication state; native has this putter and getter only.
         connector: Connector,
         putter: PortId,
         getter: PortId,
@@ @@ -69,9 +64,14 @@ impl ConnectorComplex { @@
     fn try_become_connected(&mut self) {
         match self {
             ConnectorComplex::Setup { local: Some(local), peer: Some(peer) } => {
                 // setup complete
                 let mut connector = Connector::new(Box::new(crate::DummyLogger), crate::TRIVIAL_PD.clone(), Connector::random_id());
                 // complete setup
                 let mut connector = Connector::new(
                     Box::new(crate::DummyLogger),
                     crate::TRIVIAL_PD.clone(),
                     Connector::random_id(),
                 );
                 let [putter, getter] = connector.new_udp_mediator_component(*local, *peer).unwrap();
                 connector.connect(None).unwrap();
                 *self = ConnectorComplex::Communication { connector, putter, getter }
+            }
             _ => {} // setup incomplete
     let mut cc = if let Ok(cc) = cc.write() { cc } else { return LOCK_POISONED };
     let cc: &mut ConnectorComplex = &mut cc;
     match cc {
         ConnectorComplex::Communication { ..} => WRONG_STATE,
+        ConnectorComplex::Communication { .. } => WRONG_STATE,
         ConnectorComplex::Setup { local, .. } => {
             *local = Some(addr);
             cc.try_become_connected();
@@ @@ -196,4 +196,4 @@ pub unsafe extern "C" fn rw_recv( @@
             slice.len() as isize
+        }
+    }
+}
@@ \ No newline at end of file @@
+}

0 comments (0 inline, 0 general)