Send channel status in conn set

2024-08-26 17:28:10 +02:00
parent a715f7f9c7
commit 4550d26f37
7 changed files with 92 additions and 100 deletions
@@ -7,6 +7,8 @@ use err::thiserror;
 use err::ThisError;
 use futures_util::Future;
 use futures_util::FutureExt;
+use netpod::channelstatus::ChannelStatus;
+use netpod::channelstatus::ChannelStatusClosedReason;
 use netpod::DtNano;
 use netpod::Shape;
 use netpod::TsMs;
@@ -408,94 +410,6 @@ pub struct ConnectionStatusItem {
    pub status: ConnectionStatus,
 }

-#[derive(Debug, Clone)]
-pub enum ChannelStatusClosedReason {
-    ShutdownCommand,
-    ChannelRemove,
-    ProtocolError,
-    FrequencyQuota,
-    BandwidthQuota,
-    InternalError,
-    IocTimeout,
-    NoProtocol,
-    ProtocolDone,
-    ConnectFail,
-    IoError,
-}
-
-#[derive(Debug, Clone)]
-pub enum ChannelStatus {
-    AssignedToAddress,
-    Opened,
-    Closed(ChannelStatusClosedReason),
-    Pong,
-    MonitoringSilenceReadStart,
-    MonitoringSilenceReadTimeout,
-    MonitoringSilenceReadUnchanged,
-}
-
-impl ChannelStatus {
-    pub fn to_kind(&self) -> u32 {
-        use ChannelStatus::*;
-        use ChannelStatusClosedReason::*;
-        match self {
-            AssignedToAddress => 24,
-            Opened => 1,
-            Closed(x) => match x {
-                ShutdownCommand => 2,
-                ChannelRemove => 3,
-                ProtocolError => 4,
-                FrequencyQuota => 5,
-                BandwidthQuota => 6,
-                InternalError => 7,
-                IocTimeout => 8,
-                NoProtocol => 9,
-                ProtocolDone => 10,
-                ConnectFail => 11,
-                IoError => 12,
-            },
-            Pong => 25,
-            MonitoringSilenceReadStart => 26,
-            MonitoringSilenceReadTimeout => 27,
-            MonitoringSilenceReadUnchanged => 28,
-        }
-    }
-
-    pub fn from_kind(kind: u32) -> Result<Self, err::Error> {
-        use ChannelStatus::*;
-        use ChannelStatusClosedReason::*;
-        let ret = match kind {
-            1 => Opened,
-            2 => Closed(ShutdownCommand),
-            3 => Closed(ChannelRemove),
-            4 => Closed(ProtocolError),
-            5 => Closed(FrequencyQuota),
-            6 => Closed(BandwidthQuota),
-            7 => Closed(InternalError),
-            8 => Closed(IocTimeout),
-            9 => Closed(NoProtocol),
-            10 => Closed(ProtocolDone),
-            11 => Closed(ConnectFail),
-            12 => Closed(IoError),
-            24 => AssignedToAddress,
-            25 => Pong,
-            26 => MonitoringSilenceReadStart,
-            27 => MonitoringSilenceReadTimeout,
-            28 => MonitoringSilenceReadUnchanged,
-            _ => {
-                return Err(err::Error::with_msg_no_trace(format!(
-                    "unknown ChannelStatus kind {kind}"
-                )));
-            }
-        };
-        Ok(ret)
-    }
-
-    pub fn to_u64(&self) -> u64 {
-        self.to_kind() as u64
-    }
-}
-
 #[derive(Debug, Clone)]
 pub enum ShutdownReason {
    ConnectRefused,