github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 10:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(gateway): remove unused derives and messages (#4563)

Browse Source
This commit is contained in:
Thomas Eizinger
2024-04-10 19:18:59 +10:00
committed by GitHub
parent 7d88e28872
commit 5e871d955b
1 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
rust/gateway/src/messages.rs
View File

@@ -7,22 +7,21 @@ use connlib_shared::{
Dname,
};
use serde::{Deserialize, Serialize};
use std::net::IpAddr;
// TODO: Should this have a resource?
#[derive(Debug, PartialEq, Eq, Deserialize, Serialize, Clone)]
#[derive(Debug, PartialEq, Eq, Deserialize, Clone)]
pub struct InitGateway {
pub interface: Interface,
pub config: Config,
}
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq)]
#[derive(Debug, Deserialize, Clone, PartialEq, Eq)]
pub struct Config {
pub ipv4_masquerade_enabled: bool,
pub ipv6_masquerade_enabled: bool,
}
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq)]
#[derive(Debug, Deserialize, Clone, PartialEq)]
pub struct Client {
pub id: ClientId,
pub payload: ClientPayload,
@@ -40,31 +39,12 @@ pub struct RequestConnection {
pub expires_at: Option<DateTime<Utc>>,
}
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq)]
pub enum Destination {
DnsName(String),
Ip(Vec<IpAddr>),
}
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq)]
pub struct Metrics {
peers_metrics: Vec<Metric>,
}
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq)]
pub struct Metric {
pub client_id: ClientId,
pub resource_id: ResourceId,
pub rx_bytes: u32,
pub tx_bytes: u32,
}
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq)]
pub struct RemoveResource {
pub id: ResourceId,
}
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq)]
#[derive(Debug, Deserialize, Clone, PartialEq, Eq)]
pub struct AllowAccess {
pub client_id: ClientId,
pub resource: ResourceDescription,
@@ -75,7 +55,7 @@ pub struct AllowAccess {
pub reference: String,
}
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq)]
#[derive(Debug, Deserialize, Clone, PartialEq, Eq)]
pub struct RejectAccess {
pub client_id: ClientId,
pub resource_id: ResourceId,
@@ -94,7 +74,7 @@ pub enum IngressMessages {
}
/// A client's ice candidate message.
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq)]
#[derive(Debug, Serialize, Clone, PartialEq, Eq)]
pub struct BroadcastClientIceCandidates {
/// Client's id the ice candidates are meant for
pub client_ids: Vec<ClientId>,
@@ -103,7 +83,7 @@ pub struct BroadcastClientIceCandidates {
}
/// A client's ice candidate message.
#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq)]
#[derive(Debug, Deserialize, Clone, PartialEq, Eq)]
pub struct ClientIceCandidates {
/// Client's id the ice candidates came from
pub client_id: ClientId,
@@ -113,15 +93,14 @@ pub struct ClientIceCandidates {
// These messages can be sent from a gateway
// to a control pane.
#[derive(Debug, Deserialize, Serialize, Clone)]
#[derive(Debug, Serialize, Clone)]
#[serde(rename_all = "snake_case", tag = "event", content = "payload")]
pub enum EgressMessages {
ConnectionReady(ConnectionReady),
Metrics(Metrics),
BroadcastIceCandidates(BroadcastClientIceCandidates),
}
#[derive(Debug, Deserialize, Serialize, Clone)]
#[derive(Debug, Serialize, Clone)]
pub struct ConnectionReady {
#[serde(rename = "ref")]
pub reference: String,