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

diff --git a/client.h b/client.h
index 2f257221..87cfc618 100644
--- a/client.h
+++ b/client.h
@@ -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. */
@@ -52,6 +52,16 @@ struct client_task {
 	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);