X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=recv.c;h=3b1c6917bda57f9a5a810b713bb41261dd1ae045;hp=cf178d207d2ca400a5613fdb610cd35d7258dbc1;hb=b564291f5f15b5bd4a319ea59875023551a705cc;hpb=2a8029478dfc65f0c935d864faf4aea9e3deb27d;ds=sidebyside diff --git a/recv.c b/recv.c index cf178d20..3b1c6917 100644 --- a/recv.c +++ b/recv.c @@ -25,7 +25,7 @@ #include "error.h" #include "stdout.h" -struct gengetopt_args_info conf; +struct recv_args_info conf; INIT_RECV_ERRLISTS; @@ -45,7 +45,7 @@ static void *parse_config(int argc, char *argv[], int *receiver_num) { int i; - if (cmdline_parser(argc, argv, &conf)) + if (recv_cmdline_parser(argc, argv, &conf)) return NULL; if (conf.list_receivers_given) { printf("available receivers: "); @@ -60,7 +60,9 @@ static void *parse_config(int argc, char *argv[], int *receiver_num) void rn_event_handler(struct task *t) { + struct receiver_node *rn = t->private_data; PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret)); + rn->eof = 1; unregister_task(t); } @@ -72,7 +74,6 @@ int main(int argc, char *argv[]) struct stdout_task sot; struct sched s; - init_sched(); s.default_timeout.tv_sec = 1; s.default_timeout.tv_usec = 0; @@ -102,7 +103,6 @@ int main(int argc, char *argv[]) rn.task.pre_select = r->pre_select; rn.task.post_select = r->post_select; rn.task.event_handler = rn_event_handler; - rn.task.flags = 0; sprintf(rn.task.status, "receiver node"); register_task(&rn.task);