upgrade protobuf to 3.1.0 and use with-bytes feature, issues:958

libs/hbb_common/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-protobuf = "3.0.0-alpha.2"
+protobuf = { version = "3.1.0", features = ["with-bytes"] }
 tokio = { version = "1.15", features = ["full"] }
 tokio-util = { version = "0.6", features = ["full"] }
 futures = "0.3"
@@ -38,7 +38,7 @@ mac_address = "1.1"
 quic = []
 
 [build-dependencies]
-protobuf-codegen-pure = "3.0.0-alpha.2"
+protobuf-codegen = { version = "3.1.0" }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi = { version = "0.3", features = ["winuser"] }

libs/hbb_common/build.rs

@@ -1,6 +1,7 @@
 fn main() {
     std::fs::create_dir_all("src/protos").unwrap();
-    protobuf_codegen_pure::Codegen::new()
+    protobuf_codegen::Codegen::new()
+        .pure()
         .out_dir("src/protos")
         .inputs(&["protos/rendezvous.proto", "protos/message.proto"])
         .include("protos")

libs/hbb_common/src/fs.rs

@@ -573,7 +573,7 @@ impl TransferJob {
             log::info!("file num truncated, ignoring");
         } else {
             match r.union {
-                Some(file_transfer_send_confirm_request::Union::skip(s)) => {
+                Some(file_transfer_send_confirm_request::Union::Skip(s)) => {
                     if s {
                         log::debug!("skip file id:{}, file_num:{}", r.id, r.file_num);
                         self.skip_current_file();
@@ -581,7 +581,7 @@ impl TransferJob {
                         self.set_file_confirmed(true);
                     }
                 }
-                Some(file_transfer_send_confirm_request::Union::offset_blk(_offset)) => {
+                Some(file_transfer_send_confirm_request::Union::OffsetBlk(_offset)) => {
                     self.set_file_confirmed(true);
                 }
                 _ => {}

libs/hbb_common/src/lib.rs

@@ -1,8 +1,7 @@
 pub mod compress;
-#[path = "./protos/message.rs"]
-pub mod message_proto;
-#[path = "./protos/rendezvous.rs"]
-pub mod rendezvous_proto;
+pub mod protos;
+pub use  protos::message as message_proto;
+pub use  protos::rendezvous as rendezvous_proto;
 pub use bytes;
 pub use futures;
 pub use protobuf;