Page MenuHomePhorge
Files F32171824

D15177.1765061111.diff
No OneTemporary
Actions

Size
6 KB
Referenced Files
None
Subscribers
None

D15177.1765061111.diff
View Options

diff --git a/services/tunnelbroker/src/websockets/session.rs b/services/tunnelbroker/src/websockets/session.rs
--- a/services/tunnelbroker/src/websockets/session.rs
+++ b/services/tunnelbroker/src/websockets/session.rs
@@ -474,7 +474,7 @@
debug!("Received message for {}", message_request.device_id);
let result = self.handle_message_to_device(&message_request).await;
- Some(self.get_message_to_device_status(
+ Some(MessageSentStatus::from_result(
&message_request.client_message_id,
result,
))
@@ -503,7 +503,7 @@
let result = self
.handle_message_to_tunnelbroker(&message_to_tunnelbroker)
.await;
- Some(self.get_message_to_device_status(
+ Some(MessageSentStatus::from_result(
&message_request.client_message_id,
result,
))
@@ -531,10 +531,10 @@
{
Ok(token) => token,
Err(e) => {
- return Some(
- self
- .get_message_to_device_status(&notif.client_message_id, Err(e)),
- )
+ return Some(MessageSentStatus::from_result(
+ &notif.client_message_id,
+ Err(e),
+ ));
}
};
@@ -559,13 +559,13 @@
};
}
}
- return Some(
- self
- .get_message_to_device_status(&notif.client_message_id, response),
- );
+ return Some(MessageSentStatus::from_result(
+ &notif.client_message_id,
+ response,
+ ));
}
- Some(self.get_message_to_device_status(
+ Some(MessageSentStatus::from_result(
&notif.client_message_id,
Err(SessionError::MissingAPNsClient),
))
@@ -596,10 +596,10 @@
{
Ok(token) => token,
Err(e) => {
- return Some(
- self
- .get_message_to_device_status(&notif.client_message_id, Err(e)),
- )
+ return Some(MessageSentStatus::from_result(
+ &notif.client_message_id,
+ Err(e),
+ ))
}
};
@@ -625,12 +625,13 @@
};
}
}
- return Some(
- self.get_message_to_device_status(&notif.client_message_id, result),
- );
+ return Some(MessageSentStatus::from_result(
+ &notif.client_message_id,
+ result,
+ ));
}
- Some(self.get_message_to_device_status(
+ Some(MessageSentStatus::from_result(
&notif.client_message_id,
Err(SessionError::MissingFCMClient),
))
@@ -647,7 +648,7 @@
debug!("Received WebPush notif for {}", notif.device_id);
let Some(web_push_client) = self.notif_client.web_push.clone() else {
- return Some(self.get_message_to_device_status(
+ return Some(MessageSentStatus::from_result(
&notif.client_message_id,
Err(SessionError::MissingWebPushClient),
));
@@ -659,10 +660,10 @@
{
Ok(token) => token,
Err(e) => {
- return Some(
- self
- .get_message_to_device_status(&notif.client_message_id, Err(e)),
- )
+ return Some(MessageSentStatus::from_result(
+ &notif.client_message_id,
+ Err(e),
+ ))
}
};
@@ -696,9 +697,10 @@
);
}
}
- Some(
- self.get_message_to_device_status(&notif.client_message_id, result),
- )
+ Some(MessageSentStatus::from_result(
+ &notif.client_message_id,
+ result,
+ ))
}
DeviceToTunnelbrokerMessage::WNSNotif(notif) => {
if !self.device_info.is_authenticated {
@@ -711,7 +713,7 @@
debug!("Received WNS notif for {}", notif.device_id);
let Some(wns_client) = self.notif_client.wns.clone() else {
- return Some(self.get_message_to_device_status(
+ return Some(MessageSentStatus::from_result(
&notif.client_message_id,
Err(SessionError::MissingWNSClient),
));
@@ -723,10 +725,10 @@
{
Ok(token) => token,
Err(e) => {
- return Some(
- self
- .get_message_to_device_status(&notif.client_message_id, Err(e)),
- )
+ return Some(MessageSentStatus::from_result(
+ &notif.client_message_id,
+ Err(e),
+ ))
}
};
@@ -749,9 +751,10 @@
};
}
}
- Some(
- self.get_message_to_device_status(&notif.client_message_id, result),
- )
+ Some(MessageSentStatus::from_result(
+ &notif.client_message_id,
+ result,
+ ))
}
_ => {
error!("Client sent invalid message type");
@@ -824,23 +827,6 @@
}
}
- pub fn get_message_to_device_status<E>(
- &mut self,
- client_message_id: &str,
- result: Result<(), E>,
- ) -> MessageSentStatus
- where
- E: std::error::Error,
- {
- match result {
- Ok(()) => MessageSentStatus::Success(client_message_id.to_string()),
- Err(err) => MessageSentStatus::Error(Failure {
- id: client_message_id.to_string(),
- error: err.to_string(),
- }),
- }
- }
-
async fn get_device_token(
&self,
device_id: String,
diff --git a/shared/tunnelbroker_messages/src/messages/message_to_device_request_status.rs b/shared/tunnelbroker_messages/src/messages/message_to_device_request_status.rs
--- a/shared/tunnelbroker_messages/src/messages/message_to_device_request_status.rs
+++ b/shared/tunnelbroker_messages/src/messages/message_to_device_request_status.rs
@@ -31,6 +31,21 @@
SerializationError(String),
}
+impl MessageSentStatus {
+ pub fn from_result<E>(client_message_id: &str, result: Result<(), E>) -> Self
+ where
+ E: std::error::Error,
+ {
+ match result {
+ Ok(()) => MessageSentStatus::Success(client_message_id.to_string()),
+ Err(err) => MessageSentStatus::Error(Failure {
+ id: client_message_id.to_string(),
+ error: err.to_string(),
+ }),
+ }
+ }
+}
+
// NOTE: Keep this in sync with
// lib/types/tunnelbroker/device-to-tunnelbroker-request-status-types.js
#[derive(Serialize, Deserialize, PartialEq, Debug)]

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 6, 10:45 PM (22 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5841251
Default Alt Text
D15177.1765061111.diff (6 KB)

Event Timeline