chiark
/
gitweb
/
~ian
/
hippotat.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0672b53
)
server: wip, ipif
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 8 Aug 2021 00:25:56 +0000
(
01:25
+0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 8 Aug 2021 00:25:56 +0000
(
01:25
+0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
src/bin/server.rs
patch
|
blob
|
history
diff --git
a/src/bin/server.rs
b/src/bin/server.rs
index 4869ce877e7473f95de8991108b6abef0939f022..fa43d51a5d77aca7e747338f21dc6ea61314e27e 100644
(file)
--- a/
src/bin/server.rs
+++ b/
src/bin/server.rs
@@
-16,12
+16,16
@@
pub struct Opts {
#[tokio::main]
async fn main() {
let opts = Opts::from_args();
- let (ics,global) = config::startup("hippotatd", LinkEnd::Server,
- &opts.config, &opts.log, |ics|
+ let (ics,(global,ipif)) = config::startup(
+ "hippotatd", LinkEnd::Server,
+ &opts.config, &opts.log, |ics|
{
let global = config::InstanceConfigGlobal::from(&ics);
- Ok(global)
+ let ipif = Ipif::start(&global.ipif, None)?;
+ Ok((global, ipif))
});
+ ipif.quitting(None).await;
+
dbg!(ics, global);
}