X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=fef6ba4a5bc4194048a951d9ceb657d91d14e4ae;hp=4208579b5e756bbbee9ec03cd10613e13c9a596e;hb=afb43ec103ea5c0e194451c1289c514faee3b2e5;hpb=08e8e00a1cd0d48bd9a4189661cd6336e063e887 diff --git a/client.c b/client.c index 4208579b..fef6ba4a 100644 --- a/client.c +++ b/client.c @@ -1,14 +1,17 @@ /* - * Copyright (C) 1997-2008 Andre Noll + * Copyright (C) 1997-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file client.c the client program used to connect to para_server */ +#include + #include "para.h" #include "list.h" #include "sched.h" +#include "crypt.h" #include "client.cmdline.h" #include "string.h" #include "stdin.h" @@ -40,7 +43,7 @@ static void supervisor_post_select(__a_unused struct sched *s, struct task *t) } if (ct->status == CL_RECEIVING) { stdout_set_defaults(&sot); - sot.buf = ct->buf; + sot.bufp = &ct->buf; sot.loaded = &ct->loaded; sot.input_error = &ct->task.error; register_task(&sot.task); @@ -54,7 +57,8 @@ static struct task svt = { .status = "supervisor task" }; -INIT_STDERR_LOGGING(ct->conf.loglevel_arg); +static int client_loglevel; /* loglevel */ +INIT_STDERR_LOGGING(client_loglevel); /** @@ -79,7 +83,7 @@ int main(int argc, char *argv[]) s.default_timeout.tv_sec = 1; s.default_timeout.tv_usec = 0; - ret = client_open(argc, argv, &ct); + ret = client_open(argc, argv, &ct, &client_loglevel); if (ret < 0) /* can not use PARA_LOG here because ct is NULL */ exit(EXIT_FAILURE); register_task(&svt);