Split server and client msgs in libbonknet

bonknet_broker/src/main.rs

@@ -10,15 +10,17 @@ use dataconnmanager::*;
 use actix::prelude::*;
 use std::sync::Arc;
 use libbonknet::*;
+use libbonknet::servermsg::*;
+use libbonknet::clientmsg::*;
 use rustls::{RootCertStore, ServerConfig};
 use rustls::server::WebPkiClientVerifier;
 use actix_tls::accept::rustls_0_22::{Acceptor as RustlsAcceptor, TlsStream};
 use actix_server::Server;
 use actix_rt::net::TcpStream;
-use actix_service::{ServiceFactoryExt as _};
-use futures::{StreamExt, SinkExt};
+use actix_service::ServiceFactoryExt as _;
+use futures::{SinkExt, StreamExt};
 use tokio_util::codec::{Framed, FramedRead, FramedWrite, LengthDelimitedCodec};
-use tracing::{info, error, warn};
+use tracing::{error, info, warn};
 use rcgen::{Certificate, CertificateParams, DnType, KeyPair};
 use tokio::io::{ReadHalf, WriteHalf};
 
@@ -125,7 +127,8 @@ async fn main() {
                                 }
                                 Some(item) => match item {
                                     Ok(buf) => {
-                                        use FromServerConnTypeMessage::*;
+                                        use libbonknet::servermsg::{FromServerConnTypeMessage, ToServerConnTypeReply};
+                                        use libbonknet::servermsg::FromServerConnTypeMessage::*;
                                         let msg: FromServerConnTypeMessage = rmp_serde::from_slice(&buf).unwrap();
                                         info!("{:?}", msg);
                                         match msg {
@@ -207,7 +210,7 @@ async fn server_command_handler(mut transport: TransportStream, peer_cert_bytes:
             }
             Some(item) => match item {
                 Ok(buf) => {
-                    use FromServerCommandMessage::*;
+                    use libbonknet::servermsg::FromServerCommandMessage::*;
                     let msg: FromServerCommandMessage = rmp_serde::from_slice(&buf).unwrap();
                     info!("{:?}", msg);
                     match msg {
@@ -269,7 +272,7 @@ async fn guestserver_handler(mut transport: TransportStream, server_db_addr: Add
             Some(item) => {
                 match item {
                     Ok(buf) => {
-                        use FromGuestServerMessage::*;
+                        use libbonknet::servermsg::FromGuestServerMessage::*;
                         let msg: FromGuestServerMessage = rmp_serde::from_slice(&buf).unwrap();
                         info!("{:?}", msg);
                         match msg {

bonknet_broker/src/servermanager.rs

@@ -1,18 +1,18 @@
 use std::collections::HashMap;
 use std::io::Error;
-use std::sync::{Arc};
+use std::sync::Arc;
 use std::time::{Duration, Instant};
 use actix::prelude::*;
 use rand::random;
 use thiserror::Error;
-use futures::{SinkExt};
+use futures::SinkExt;
 use tokio::sync::{Mutex, oneshot};
 use tokio_util::bytes::{Bytes, BytesMut};
 use tokio_util::codec::{FramedRead, FramedWrite, LengthDelimitedCodec};
 use tracing::{debug, error, info};
-use libbonknet::*;
 use crate::{TransportStream, TransportStreamRx, TransportStreamTx};
 use uuid::Uuid;
+use libbonknet::servermsg::*;
 use crate::pendingdataconndb::*;
 
 #[derive(Error, Debug)]
@@ -122,7 +122,7 @@ impl StreamHandler<Result<BytesMut, Error>> for ServerTransporter {
     fn handle(&mut self, item: Result<BytesMut, Error>, ctx: &mut Self::Context) {
         match item {
             Ok(buf) => {
-                use FromServerReply::*;
+                use libbonknet::servermsg::FromServerReply::*;
                 let msg: FromServerReply = rmp_serde::from_slice(&buf).unwrap();
                 match msg {
                     Pong => {