revert back from lan discovery merge

libs/hbb_common/build.rs

@@ -2,7 +2,7 @@ fn main() {
     std::fs::create_dir_all("src/protos").unwrap();
     protobuf_codegen_pure::Codegen::new()
         .out_dir("src/protos")
-        .inputs(&["protos/rendezvous.proto", "protos/base_proto.proto", "protos/message.proto", "protos/discovery.proto"])
+        .inputs(&["protos/rendezvous.proto", "protos/message.proto"])
         .include("protos")
         .run()
         .expect("Codegen failed.");

libs/hbb_common/protos/base_proto.proto

@@ -1,21 +0,0 @@
-syntax = "proto3";
-package base;
-
-message DisplayInfo {
-  sint32 x = 1;
-  sint32 y = 2;
-  int32 width = 3;
-  int32 height = 4;
-  string name = 5;
-  bool online = 6;
-}
-
-message PeerInfo {
-  string username = 1;
-  string hostname = 2;
-  string platform = 3;
-  repeated DisplayInfo displays = 4;
-  int32 current_display = 5;
-  bool sas_enabled = 6;
-  string version = 7;
-}

libs/hbb_common/protos/discovery.proto

@@ -1,16 +0,0 @@
-syntax = "proto3";
-package discovery;
-
-import "base_proto.proto";
-
-message Discovery {
-  string id = 1;
-  base.PeerInfo peer = 2;
-  /// response port for current listening port(udp for now)
-  int32 port = 3;
-}
-
-message DiscoveryBack {
-  string id = 1;
-  base.PeerInfo peer = 2;
-}

libs/hbb_common/protos/message.proto

@@ -1,8 +1,6 @@
 syntax = "proto3";
 package hbb;
 
-import "base_proto.proto";
-
 message VP9 {
   bytes data = 1;
   bool key = 2;
@@ -27,6 +25,15 @@ message VideoFrame {
   }
 }
 
+message DisplayInfo {
+  sint32 x = 1;
+  sint32 y = 2;
+  int32 width = 3;
+  int32 height = 4;
+  string name = 5;
+  bool online = 6;
+}
+
 message PortForward {
   string host = 1;
   int32 port = 2;
@@ -51,10 +58,20 @@ message LoginRequest {
 
 message ChatMessage { string text = 1; }
 
+message PeerInfo {
+  string username = 1;
+  string hostname = 2;
+  string platform = 3;
+  repeated DisplayInfo displays = 4;
+  int32 current_display = 5;
+  bool sas_enabled = 6;
+  string version = 7;
+}
+
 message LoginResponse {
   oneof union {
     string error = 1;
-    base.PeerInfo peer_info = 2;
+    PeerInfo peer_info = 2;
   }
 }
 

libs/hbb_common/src/lib.rs

@@ -1,8 +1,4 @@
 pub mod compress;
-#[path = "./protos/base_proto.rs"]
-pub mod base_proto;
-#[path = "./protos/discovery.rs"]
-pub mod discovery_proto;
 #[path = "./protos/message.rs"]
 pub mod message_proto;
 #[path = "./protos/rendezvous.rs"]