X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=grab_client.c;h=20b90651b1862275e749f93970479e24cd68b417;hp=2dfb295b8ce87fcb5f165bcfd4b3c25f3bdb5b50;hb=df3c03e72911edb31e7f1e32ebe29dad063e3b70;hpb=c6a9d624a8e7334b08dbd0acf8c7df016044cb9e

diff --git a/grab_client.c b/grab_client.c
index 2dfb295b..20b90651 100644
--- a/grab_client.c
+++ b/grab_client.c
@@ -24,14 +24,16 @@
  */
 
 #include "para.h"
-#include "close_on_fork.h"
 #include "grab_client.cmdline.h"
 #include "list.h"
+#include "sched.h"
 #include "filter.h"
 #include "grab_client.h"
 #include "audiod.h"
 #include "error.h"
 #include "string.h"
+#include "fd.h"
+#include "crypt.h"
 
 /** grab clients that are not yet attached to a filter node */
 struct list_head inactive_grab_client_list;
@@ -42,7 +44,7 @@ static int max_num_filters(void)
 	for (i = 0; audio_formats[i]; i++) {
 		PARA_INFO_LOG("%s filter chain length: %d\n", audio_formats[i],
 			num_filters(i));
-		ret = MAX(ret, num_filters(i));
+		ret = PARA_MAX(ret, num_filters(i));
 	}
 	PARA_INFO_LOG("maximal filter chain length: %d\n", ret);
 	return ret;
@@ -56,12 +58,10 @@ static int gc_write(char *buf, size_t len, struct filter_callback *fcb)
 
 //	PARA_INFO_LOG("writing %d bytes to fd %d\n", len, gc->fd);
 	fd_set wfds;
-	do {
-		FD_ZERO(&wfds);
-		FD_SET(gc->fd, &wfds);
-		ret = select(gc->fd + 1, NULL, &wfds, NULL, &tv);
-	} while (ret == EAGAIN || ret == EINTR);
-	if (ret != 1) {
+	FD_ZERO(&wfds);
+	FD_SET(gc->fd, &wfds);
+	ret = para_select(gc->fd + 1, NULL, &wfds, &tv);
+	if (ret <= 0) {
 		if (gc->mode == GRAB_PEDANTIC)
 			return -E_PEDANTIC_GRAB;
 		if (gc->mode == GRAB_SLOPPY)
@@ -86,31 +86,35 @@ rewrite:
 	return ret;
 }
 
+/* TODO: gengetopt can handle the grab client modes */
 static int check_gc_args(struct grab_client *gc)
 {
 	int i;
-	struct grab_client_args_info *conf = gc->conf;
+	struct grab_client_args_info *c = gc->conf;
 	char **mv = grab_client_cmdline_parser_mode_values;
 
-	PARA_INFO_LOG("filter_num: %d\n", gc->conf->filter_num_arg);
+	PARA_INFO_LOG("filter_num: %d\n", c->filter_num_arg);
 	for (i = 0; mv[i]; i++)
-		if (!strcmp(conf->mode_arg, mv[i]))
+		if (!strcmp(c->mode_arg, mv[i]))
 			break;
+	if (!mv[i])
+		return -E_GC_SYNTAX;
 	gc->mode = i;
-	if (conf->audio_format_given) {
-		gc->audio_format_num = get_audio_format_num(conf->audio_format_arg);
+	gc->audio_format_num = -1;
+	if (c->audio_format_given) {
+		gc->audio_format_num = get_audio_format_num(c->audio_format_arg);
 		if (gc->audio_format_num < 0)
 			return gc->audio_format_num;
 	}
-	if (conf->slot_arg > MAX_STREAM_SLOTS)
+	if (c->slot_arg > MAX_STREAM_SLOTS)
 		return -E_BAD_GC_SLOT;
-	if (conf->filter_num_arg <= 0)
+	if (c->filter_num_arg <= 0)
 		return -E_BAD_GC_FILTER_NUM;
-	if (conf->audio_format_given) {
-		if (num_filters(gc->audio_format_num) < conf->filter_num_arg)
+	if (c->audio_format_given) {
+		if (num_filters(gc->audio_format_num) < c->filter_num_arg)
 			return -E_BAD_GC_FILTER_NUM;
 	} else
-		if (conf->filter_num_arg > max_num_filters())
+		if (c->filter_num_arg > max_num_filters())
 			return -E_BAD_GC_FILTER_NUM;
 
 	return 1;
@@ -120,7 +124,7 @@ static void add_inactive_gc(struct grab_client *gc)
 {
 	PARA_INFO_LOG("adding grab client %p (fd %d) to inactive list\n",
 		gc, gc->fd);
-	list_add(&gc->node, &inactive_grab_client_list);
+	para_list_add(&gc->node, &inactive_grab_client_list);
 }
 
 static void gc_free(struct grab_client *gc)
@@ -141,7 +145,6 @@ static void gc_close(struct filter_callback *fcb)
 
 	if (gc->conf->one_shot_given || gc->error) {
 		PARA_INFO_LOG("closing fd %d (grab client %p)\n", gc->fd, gc);
-		del_close_on_fork_list(gc->fd);
 		close(gc->fd);
 		gc_free(gc);
 		/* close on fork ?*/
@@ -162,13 +165,13 @@ void activate_grab_client(struct grab_client *gc, struct filter_node *fn)
 {
 	PARA_INFO_LOG("activating %p (fd %d, filter node: %p)\n", gc, gc->fd, fn);
 	list_del(&gc->node);
-	list_add(&gc->fcb.node, &fn->callbacks);
+	para_list_add(&gc->fcb.node, &fn->callbacks);
 }
 
 /**
  * activate inactive grab clients if possible
  *
- * \param slot audiod's slot for the new audio file
+ * \param slot_num audiod's slot for the new audio file
  * \param audio_format_num the number of the audio format of the new audio file
  * \param filter_list the list of activated filters for that new audio file
  *
@@ -181,7 +184,7 @@ void activate_grab_client(struct grab_client *gc, struct filter_node *fn)
  * \sa filter_chain_info::filters, inactive_grab_client_list,
  * activate_grab_client
  */
-void activate_inactive_grab_clients(int slot, int audio_format_num,
+void activate_inactive_grab_clients(int slot_num, int audio_format_num,
 		struct list_head *filter_list)
 {
 	struct grab_client *gc, *tmp;
@@ -190,7 +193,7 @@ void activate_inactive_grab_clients(int slot, int audio_format_num,
 
 	list_for_each_entry_safe(gc, tmp, &inactive_grab_client_list, node) {
 //		PARA_INFO_LOG("checking inactive grab client %p\n", gc);
-		if (gc->conf->slot_arg >= 0 && gc->conf->slot_arg != slot)
+		if (gc->conf->slot_arg >= 0 && gc->conf->slot_arg != slot_num)
 			continue;
 		if (gc->audio_format_num >= 0 && gc->audio_format_num !=
 				audio_format_num)
@@ -214,11 +217,10 @@ void activate_inactive_grab_clients(int slot, int audio_format_num,
  * check the command line options and allocate a grab_client structure
  *
  * \param fd the file descriptor of the client
- * \param argc the number of command line options
- * \param argv pointers to the command line options
+ * \param line the command line
  * \param err non-zero if an error occured
  *
- * If the command line options  given by \a argc and \a argv are valid.
+ * If the command line options given by \a argc and \a argv are valid.
  * allocate a struct grab_client and initialize it with this valid
  * configuration. Moreover, add the new grab client to the inactive list.
  *
@@ -232,21 +234,14 @@ void activate_inactive_grab_clients(int slot, int audio_format_num,
  * argc, argv get freed when com_grab() returns, so we have to make a
  * copy.
  */
-__malloc struct grab_client *grab_client_new(int fd, int argc, char **argv, int *err)
+struct grab_client *grab_client_new(int fd, char *line, int *err)
 {
-	int i, ret;
+	int ret;
 	struct grab_client *gc = para_calloc(sizeof(struct grab_client));
 
 	gc->conf = para_calloc(sizeof(struct grab_client_args_info));
-	gc->argc = argc;
-	gc->argv = para_calloc((argc + 1) * sizeof(char *));
 
-	for (i = 0; i < argc; i++) {
-		gc->argv[i] = para_strdup(argv[i]);
-		PARA_INFO_LOG("argc: %d, argv[%d]: %s\n", argc, i, gc->argv[i]);
-	}
-	PARA_INFO_LOG("argv[%d]: %s\n", argc, gc->argv[argc]);
-	ret = grab_client_cmdline_parser(gc->argc, gc->argv , gc->conf);
+	ret = grab_client_cmdline_parser_string(line, gc->conf, "grab");
 	*err = -E_GC_SYNTAX;
 	if (ret)
 		goto err_out;
@@ -272,9 +267,6 @@ __malloc struct grab_client *grab_client_new(int fd, int argc, char **argv, int
 	add_inactive_gc(gc);
 	return gc;
 err_out:
-	for (i = 0; i < argc; i++)
-		free(gc->argv[i]);
-	free(gc->argv);
 	free(gc->conf);
 	free(gc);
 	return NULL;
@@ -285,7 +277,7 @@ err_out:
  * This has to be called once during startup before any other function from
  * grab_client.c may be used. It initializes \a inactive_grab_client_list.
  */
-void init_grabbing()
+void init_grabbing(void)
 {
 	PARA_INFO_LOG("%s", "grab init\n");
 	INIT_LIST_HEAD(&inactive_grab_client_list);