X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.h;h=7ba56b9168c500bd4f596c5ba9db82ccef3347c5;hp=e304f0923693b5913a5224c4be8327a0fa6795f1;hb=3d33c9e922243e6f9f716c5a220d10e34bd694b7;hpb=d1e6b28f66e243516d01916f9125baee75dd98d6

diff --git a/client.h b/client.h
index e304f092..7ba56b91 100644
--- a/client.h
+++ b/client.h
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 1997-2014 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file client.h Common client functions and exported symbols from client_common.c. */
 
@@ -38,20 +34,28 @@ struct client_task {
 	struct btr_node *btrn[2];
 	/** The hash value of the decrypted challenge. */
 	unsigned char *challenge_hash;
-	/** The configuration (including the command). */
-	struct client_args_info conf;
-	/** The config file for client options. */
-	char *config_file;
+	/** The parsed command line (including the command). */
+	struct lls_parse_result *lpr;
 	/** The RSA private key. */
 	char *key_file;
 	/** Paraslash user name. */
 	char *user;
 	/** The client task structure. */
-	struct task task;
+	struct task *task;
 	/** List of features supported by the server. */
 	char **features;
 };
 
+#define CLIENT_CMD_PTR (lls_cmd(0, client_suite))
+#define CLIENT_OPT_RESULT(_name, _lpr) \
+	(lls_opt_result(LSG_CLIENT_PARA_CLIENT_OPT_ ## _name, _lpr))
+#define CLIENT_OPT_GIVEN(_name, _lpr) \
+	(lls_opt_given(CLIENT_OPT_RESULT(_name, _lpr)))
+#define CLIENT_OPT_UINT32_VAL(_name, _lpr) \
+	(lls_uint32_val(0, CLIENT_OPT_RESULT(_name, _lpr)))
+#define CLIENT_OPT_STRING_VAL(_name, _lpr) \
+	(lls_string_val(0, CLIENT_OPT_RESULT(_name, _lpr)))
+
 void client_close(struct client_task *ct);
 int client_parse_config(int argc, char *argv[], struct client_task **ct_ptr,
 		int *loglevel);