X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv_common.c;h=a541d936e46c149b9b204a5811286d540073a02e;hp=3a09e7c0f8611f8666bfadf36f06c989a5e0a990;hb=f491dc59b5eee838165b60e7815a06139fed7f74;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623;ds=sidebyside

diff --git a/recv_common.c b/recv_common.c
index 3a09e7c0..a541d936 100644
--- a/recv_common.c
+++ b/recv_common.c
@@ -1,31 +1,18 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file recv_common.c common functions of para_recv and para_audiod */
 
 #include "para.h"
 
+#include "list.h"
+#include "sched.h"
 #include "recv.h"
 #include "string.h"
 
-void (*crypt_function_recv)(unsigned long len, const unsigned char *indata, unsigned char *outdata) = NULL;
-void (*crypt_function_send)(unsigned long len, const unsigned char *indata, unsigned char *outdata) = NULL;
-
 DEFINE_RECEIVER_ARRAY;
 static void *parse_receiver_args(int receiver_num, char *options)
 {
@@ -38,12 +25,13 @@ static void *parse_receiver_args(int receiver_num, char *options)
 //	PARA_DEBUG_LOG("%s, options: %s\n", r->name,
 //		options? options : "(none)");
 	if (options) {
-//		PARA_DEBUG_LOG("%s options: %s\n", name, options);
-		argc = split_args(options, &argv, ':');
-//		PARA_DEBUG_LOG("argc = %d, argv[0]: %s\n", fn->argc, fn->argv[0]);
-		for (i = argc; i >= 0; i--)
+		PARA_DEBUG_LOG("options: %s\n", options);
+		argc = split_args(options, &argv, " \t");
+		for (i = argc - 1; i >= 0; i--)
 			argv[i + 1] = argv[i];
-		argc += 2;
+		argv[0] = para_strdup(r->name);
+		argc += 1;
+		PARA_DEBUG_LOG("argc = %d, argv[0]: %s\n", argc, argv[0]);
 	} else {
 		argc = 1;
 		argv = para_malloc(2 * sizeof(char*));
@@ -51,20 +39,31 @@ static void *parse_receiver_args(int receiver_num, char *options)
 		argv[1] = NULL;
 	}
 	conf = r->parse_config(argc, argv);
-	if (!conf) {
-		for (i = 0; i < argc; i++)
-			free(argv[i]);
-		free(argv);
-		return NULL;
-	}
+	free(argv[0]);
+	free(argv);
 	return conf;
 }
 
+/**
+ * check if given string is a valid command line for any receiver
+ *
+ * \param \ra string of the form receiver_name:options
+ * \param receiver_num contains the number of the receiver upon success
+ *
+ * This function checks whether \a ra starts with the name of a supported
+ * paraslash receiver, optinally followed by a colon and any options for that
+ * receiver. If a valid receiver name was found and further are present, the
+ * remaining part of \a ra is passed to that receiver's config parser.
+ *
+ * \return On success, a pointer to the gengetopt args info struct is returned
+ * and \a receiver_num contains the number of the receiver. Otherwise this function
+ * returns \p NULL.
+ */
 void *check_receiver_arg(char *ra, int *receiver_num)
 {
 	int j;
 
-//	PARA_DEBUG_LOG("checking %s\n", ra);
+	PARA_DEBUG_LOG("checking %s\n", ra);
 	for (j = 0; receivers[j].name; j++) {
 		const char *name = receivers[j].name;
 		size_t len = strlen(name);
@@ -74,13 +73,13 @@ void *check_receiver_arg(char *ra, int *receiver_num)
 		if (strncmp(name, ra, len))
 			continue;
 		c = ra[len];
-		if (c && c != ':')
+		if (c && c != ' ')
 			continue;
 		if (c && !receivers[j].parse_config)
 			return NULL;
 		*receiver_num = j;
 		return parse_receiver_args(j, c? ra + len + 1: NULL);
 	}
-	PARA_ERROR_LOG("%s", "receiver not found:");
+	PARA_ERROR_LOG("%s", "receiver not found\n");
 	return NULL;
 }