fix symmetric mode responses for delegation

dist-svc · Apr 23, 2024 · 0638024 · 0638024
1 parent 084535c
commit 0638024
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/daemon/src/core/mod.rs b/daemon/src/core/mod.rs
@@ -576,7 +576,6 @@ impl AsyncCore {
 
         // Await operation completion
         let r = rx.await;
-        warn!("rx: {r:?}");
 
         match r {
             Ok(CoreRes::Peer(info)) => Ok(info),

diff --git a/daemon/src/core/services.rs b/daemon/src/core/services.rs
@@ -180,10 +180,15 @@ impl Core {
     where
         F: FnMut(&mut Service, &mut ServiceInfo) -> CoreRes,
     {
+        debug!("Updating service: {id}");
+
         // Look for matching peer
         let s = match self.services.get_mut(id) {
             Some(s) => s,
-            None => return CoreRes::NotFound,
+            None => {
+                error!("Service {id} not found");
+                return CoreRes::NotFound
+            },
         };
 
         // Run update function

diff --git a/daemon/src/daemon/net.rs b/daemon/src/daemon/net.rs
@@ -152,9 +152,10 @@ impl NetIf for Dsf<ByteSink> {
                     pri_key: Some(signing_key.clone()),
                     // target public key for asymmetric encryption
                     pub_key,
-                    // Symmetric key must be in key cache
-                    sec_key: peer_keys.and_then(|k| k.sec_key.clone()),
-                    ..Default::default()
+                    // TODO: why do we need the secret key?
+                    sec_key: peer_keys.as_ref().and_then(|k| k.sec_key.clone()),
+                    // Symmetric key if enabled
+                    sym_keys: peer_keys.as_ref().and_then(|k| k.sym_keys.clone()),
                 };
 
                 // Enable symmetric mode if supported
@@ -286,6 +287,8 @@ where
 
             // DELEGATION: Handle unwrapped objects for constrained / delegated services
             if !container.header().kind().is_message() {
+                let req_id = container.header().index();
+
                 // Handle raw object
                 let resp = match crate::net::handle_net_raw(
                     &engine,
@@ -302,7 +305,14 @@ where
                     }
                 };
 
-                // TODO(high): Send response
+                // Send response
+                let resp = net::Response::new(our_id, req_id as u16, resp, Flags::default());
+                if let Err(e) = net.net_send(vec![(addr, Some(id.clone()))], resp.into()).await {
+                    error!("Failed to forward net response: {e:?}");
+                }
+
+                // Stop processing
+                return;
             }
 
             let message = match message {
@@ -346,7 +356,7 @@ where
                         &message.from(),
                         Box::new(move |p| {
                             if !p.flags.contains(PeerFlags::SYMMETRIC_ENABLED) {
-                                warn!("Enabling symmetric message crypto for peer: {}", p.id);
+                                info!("Enabling symmetric encryption for peer: {}", p.id);
                                 p.flags |= PeerFlags::SYMMETRIC_ENABLED;
                             }
                         }),

diff --git a/daemon/src/rpc/subscribe.rs b/daemon/src/rpc/subscribe.rs
@@ -105,12 +105,14 @@ impl<T: Engine> PubSub for T {
         // Issue subscription requests
         let subs = do_subscribe(self, target.id.clone(), &peers).await?;
 
+        debug!("Updating service {}", target.id);
+
         // Update local service state
         self.svc_update(
             target.id.clone(),
             Box::new(|svc, info| {
                 info.state = ServiceState::Subscribed;
-                CoreRes::Id(svc.id())
+                CoreRes::Service(info.clone())
             }),
         )
         .await?;
@@ -119,6 +121,8 @@ impl<T: Engine> PubSub for T {
 
         // TODO: replicate if enabled
 
+        debug!("Subscribe okay!");
+
         Ok(subs)
     }