make route_packet infallible

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/server/server.rs b/server/server.rs
index 68abeed134c9f18cbd3dbfd9fa96f99060a9fa9a..667ff2e56df1bf445bfe4851790ea3449422d172 100644 (file)
--- a/server/server.rs
+++ b/server/server.rs
@@ -53,7 +53,6 @@ mod may_route {
 }
 pub use may_route::MayRoute;
 
-#[throws(PacketError)]
 pub async fn route_packet(global: &Global,
                           transport_conn: &str, source: Option<&ClientName>,
                           packet: RoutedPacketData, daddr: IpAddr,

diff --git a/server/suser.rs b/server/suser.rs
index 5b7ab0fae5895d0e8d80c8fd036599c671152048..856afe855c180be6bd6350ca36bbebd3dfbe354f 100644 (file)
--- a/server/suser.rs
+++ b/server/suser.rs
@@ -144,7 +144,7 @@ pub async fn run(global: Arc<Global>,
             }, |(daddr,packet)| route_packet(
               &global, &conn, Some(&ic.link.client), daddr,
               packet, may_route.clone(),
-            ),
+            ).map(Ok),
               |e| Ok::<_,SlipFramesError<_>>({ warnings.add(&e)?; })
             ).await?;
           }

diff --git a/src/prelude.rs b/src/prelude.rs
index c0392abe3c265a525e534fadac67fd3bb5267290..0fd63053e025d31b824160c903151f9e4bb94033 100644 (file)
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -28,7 +28,7 @@ pub use std::time::{SystemTime, UNIX_EPOCH};
 pub use cervine::Cow as Cervine;
 pub use extend::ext;
 pub use fehler::{throw, throws};
-pub use futures::{poll, future, StreamExt, TryStreamExt};
+pub use futures::{poll, future, FutureExt, StreamExt, TryStreamExt};
 pub use hyper::body::{Bytes, Buf as _};
 pub use hyper::{Method, Uri};
 pub use hyper_tls::HttpsConnector;