X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.h;h=87cfc618d64825684d0d607a07cf4605d4476ae2;hp=e304f0923693b5913a5224c4be8327a0fa6795f1;hb=6ba4caacaeb4ac2d8e5fc15699bf89f496d59901;hpb=bfdd36f2879b8dee1f6d3330bc49fbb5644d3caf

diff --git a/client.h b/client.h
index e304f092..87cfc618 100644
--- a/client.h
+++ b/client.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -38,8 +38,8 @@ 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 parsed command line (including the command). */
+	struct lls_parse_result *lpr;
 	/** The config file for client options. */
 	char *config_file;
 	/** The RSA private key. */
@@ -47,11 +47,21 @@ struct client_task {
 	/** 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);