X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv_common.c;h=0393d7641abbae85e9645e260417551d4e7fea8b;hp=3a09e7c0f8611f8666bfadf36f06c989a5e0a990;hb=883af7d8af543616fe4ca09b0273dd4f59848779;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623

diff --git a/recv_common.c b/recv_common.c
index 3a09e7c0..0393d764 100644
--- a/recv_common.c
+++ b/recv_common.c
@@ -20,12 +20,11 @@
 
 #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 +37,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*));
@@ -64,7 +64,7 @@ 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 +74,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;
 }