diff options
author | Jake McGinty <me@jake.su> | 2018-05-03 13:04:32 -0700 |
---|---|---|
committer | Jake McGinty <me@jake.su> | 2018-05-03 13:04:32 -0700 |
commit | f5d3490f6469cfa43a64c749b50305d61fccc0f0 (patch) | |
tree | 624753f8f36ba0aaea0b2f4114e404edd7b2b732 /src/interface/mod.rs | |
parent | noise: use my updated fork of x25519-dalek to reduce old deps (diff) | |
download | wireguard-rs-f5d3490f6469cfa43a64c749b50305d61fccc0f0.tar.xz wireguard-rs-f5d3490f6469cfa43a64c749b50305d61fccc0f0.zip |
config: refactor to send more specific messages to peer_server on change
Diffstat (limited to 'src/interface/mod.rs')
-rw-r--r-- | src/interface/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/interface/mod.rs b/src/interface/mod.rs index c670bbe..0d12048 100644 --- a/src/interface/mod.rs +++ b/src/interface/mod.rs @@ -99,12 +99,12 @@ impl Interface { let peer_server = PeerServer::new(core.handle(), self.state.clone(), utun_tx.clone())?; let config_server = ConfigurationService::new(&self.name, &self.state, &core.handle())?; - let config_server = config_server.forward(peer_server.config_tx()).map_err(|_|()); // TODO: don't just forward, this is so hacky. + let config_server = config_server.forward(peer_server.tx()).map_err(|_|()); // TODO: don't just forward, this is so hacky. let utun_stream = UtunStream::connect(&self.name, &core.handle())?.framed(VecUtunCodec{}); let (utun_writer, utun_reader) = utun_stream.split(); - let utun_read_fut = peer_server.tx() + let utun_read_fut = peer_server.tunnel_tx() .sink_map_err(|e| -> Error { e.into() }) .send_all(utun_reader.map_err(|e| -> Error { e.into() })) .map_err(|e| { warn!("utun read error: {:?}", e); () }); |