summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2020-06-18 12:34:35 +0200
committerDavid Lönnhager <david.l@mullvad.net>2020-06-18 12:34:35 +0200
commit877fbe0a9ab502e694d78c21a5d08a98583f0519 (patch)
tree01634ecb1474f0df7f1a93f2bc2f9f231ab0231f
parent914a81c77e8050ee5a241ad32d00831e6069bcae (diff)
downloadmullvadvpn-877fbe0a9ab502e694d78c21a5d08a98583f0519.tar.xz
mullvadvpn-877fbe0a9ab502e694d78c21a5d08a98583f0519.zip
Remove unneeded Empty type
-rw-r--r--talpid-core/src/tunnel/openvpn.rs6
-rw-r--r--talpid-openvpn-plugin/proto/openvpn_plugin.proto7
2 files changed, 6 insertions, 7 deletions
diff --git a/talpid-core/src/tunnel/openvpn.rs b/talpid-core/src/tunnel/openvpn.rs
index 391d1f75f5..ad7563fe7c 100644
--- a/talpid-core/src/tunnel/openvpn.rs
+++ b/talpid-core/src/tunnel/openvpn.rs
@@ -631,7 +631,7 @@ mod event_server {
}
use proto::{
openvpn_event_proxy_server::{OpenvpnEventProxy, OpenvpnEventProxyServer},
- Empty, EventType,
+ EventType,
};
#[derive(err_derive::Error, Debug)]
@@ -659,7 +659,7 @@ mod event_server {
async fn event(
&self,
request: Request<EventType>,
- ) -> std::result::Result<Response<Empty>, tonic::Status> {
+ ) -> std::result::Result<Response<()>, tonic::Status> {
log::info!("OpenVPN event {:?}", request);
let request = request.into_inner();
@@ -669,7 +669,7 @@ mod event_server {
(self.on_event)(event_type, request.env);
- Ok(Response::new(Empty {}))
+ Ok(Response::new(()))
}
}
diff --git a/talpid-openvpn-plugin/proto/openvpn_plugin.proto b/talpid-openvpn-plugin/proto/openvpn_plugin.proto
index 76600b0698..07bd9d6f1a 100644
--- a/talpid-openvpn-plugin/proto/openvpn_plugin.proto
+++ b/talpid-openvpn-plugin/proto/openvpn_plugin.proto
@@ -2,14 +2,13 @@ syntax = "proto3";
package talpid_openvpn_plugin;
+import "google/protobuf/empty.proto";
+
service OpenvpnEventProxy {
- rpc Event(EventType) returns (Empty) {}
+ rpc Event(EventType) returns (google.protobuf.Empty) {}
}
message EventType {
int32 event = 1;
map<string, string> env = 2;
}
-
-message Empty {
-}