WIP

luftaquila · Apr 18, 2024 · 39ff927 · 39ff927
1 parent 5e6910d
commit 39ff927
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/src/client.rs b/src/client.rs
@@ -19,7 +19,7 @@ pub struct Client {
     #[serde(skip)]
     pub ip: Option<SocketAddr>,
     #[serde(skip)]
-    tcp: Option<TcpStream>,
+    pub tcp: Option<TcpStream>,
     #[serde(skip)]
     pub disp: Vec<Rc<RefCell<Display>>>,
     pub displays: Vec<Display>,

diff --git a/src/server.rs b/src/server.rs
@@ -200,6 +200,9 @@ impl Server {
                     });
                 }
             }
+
+            // TODO: check client display without warpzone
+            // TODO: duplicated client to client warpzone
         }
 
         /* merge all configured displays */
@@ -243,16 +246,24 @@ impl Server {
 
                     /* verify client */
                     for (i, client) in self.clients.iter_mut().enumerate() {
-                        if client.borrow().cid == incoming_client.cid {
-                            /* TODO: verify configured displays */
-
+                        let mut client = client.borrow_mut();
+
+                        if client.cid == incoming_client.cid {
+                            /* verify configured displays */
+                            for disp in client.displays.iter() {
+                                for incoming_disp in incoming_client.displays.iter() {
+                                    // TODO: check configured displays are same
+                                }
+                            }
+
+                            client.tcp = Some(stream.try_clone().unwrap());
+                            client.ip = Some(stream.peer_addr().unwrap());
                             verified[i] = true;
-                            client.borrow_mut().ip = Some(stream.peer_addr().unwrap());
 
                             println!(
                                 "client {}({}) verified",
                                 incoming_client.cid,
-                                client.borrow().ip.unwrap()
+                                client.ip.unwrap()
                             );
                         }
                     }