Commit eacc732e authored by Niels Möller's avatar Niels Möller

* src/lsh_proxy.c (main): Use make_io_backend(). Pass backend to

make_reaper(). Use io_run rather than reaper_run.
* src/lshd.c (make_lshd_options): Likewise.

Rev: src/lsh_proxy.c:1.18
Rev: src/lshd.c:1.103
parent d38ae8be
......@@ -37,6 +37,7 @@
#include "dsa.h"
#include "format.h"
#include "gateway_channel.h"
#include "handshake.h"
#include "io.h"
#include "io_commands.h"
#include "lookup_verifier.h"
......@@ -593,9 +594,10 @@ int main(int argc, char **argv)
struct make_kexinit *make_kexinit;
struct exception_handler *handler;
NEW(io_backend, backend);
init_backend(backend);
struct io_backend *backend;
backend = make_io_backend();
#if WITH_ALF
proxy_alf_init();
......@@ -613,7 +615,7 @@ int main(int argc, char **argv)
(make_report_exception_info(EXC_IO, EXC_IO, "lsh_proxy: "),
&default_exception_handler,
HANDLER_CONTEXT);
reaper = make_reaper();
reaper = make_reaper(backend);
r = make_default_random(reaper, handler);
algorithms_server = all_symmetric_algorithms();
......@@ -832,7 +834,7 @@ int main(int argc, char **argv)
}
}
reaper_run(reaper, backend);
io_run(backend);
return 0;
}
......@@ -35,6 +35,7 @@
#include "daemon.h"
#include "dsa.h"
#include "format.h"
#include "handshake.h"
#include "io.h"
#include "io_commands.h"
#include "lookup_verifier.h"
......@@ -210,7 +211,7 @@ make_lshd_options(struct io_backend *backend)
self->backend = backend;
self->e = make_lshd_exception_handler(&default_exception_handler,
HANDLER_CONTEXT);
self->reaper = make_reaper();
self->reaper = make_reaper(backend);
self->random = make_default_random(self->reaper, self->e);
self->signature_algorithms = all_signature_algorithms(&self->random->super);
......@@ -631,9 +632,8 @@ main_argp =
int main(int argc, char **argv)
{
struct lshd_options *options;
NEW(io_backend, backend);
init_backend(backend);
struct io_backend *backend = make_io_backend();
/* For filtering messages. Could perhaps also be used when converting
* strings to and from UTF8. */
......@@ -762,7 +762,7 @@ int main(int argc, char **argv)
}
}
reaper_run(options->reaper, backend);
io_run(backend);
return 0;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment