cosmetics

[paraslash.git] / recv.c

diff --git a/recv.c b/recv.c
index 4b84e8b600cfeeb7d3907c8b292f97c2338730f2..3b1c6917bda57f9a5a810b713bb41261dd1ae045 100644 (file)
--- 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: ");
@@ -58,102 +58,22 @@ static void *parse_config(int argc, char *argv[], int *receiver_num)
        return check_receiver_arg(conf.receiver_arg, receiver_num);
 }
 
-#if 0
-int main(int argc, char *argv[])
-{
-       int ret, eof = 0, max, r_opened = 0, receiver_num;
-       struct timeval timeout;
-       struct  receiver *r = NULL;
-       fd_set rfds, wfds;
-       struct receiver_node rn;
-
-       memset(&rn, 0, sizeof(struct receiver_node));
-       for (ret = 0; receivers[ret].name; ret++)
-               receivers[ret].init(&receivers[ret]);
-       ret = -E_RECV_SYNTAX;
-       rn.conf = parse_config(argc, argv, &receiver_num);
-       if (!rn.conf) {
-               PARA_EMERG_LOG("%s", "parse failed\n");
-               goto out;
-       }
-       r = &receivers[receiver_num];
-       rn.receiver = r;
-       ret = r->open(&rn);
-       if (ret < 0)
-               goto out;
-       r_opened = 1;
-recv:
-       FD_ZERO(&rfds);
-       FD_ZERO(&wfds);
-       timeout.tv_sec = 0;
-       timeout.tv_usec = 999 * 1000;
-       max = -1;
-       ret = r->pre_select(&rn, &rfds, &wfds, &timeout);
-       max = PARA_MAX(max, ret);
-
-       PARA_DEBUG_LOG("timeout: %lums, max: %d\n", tv2ms(&timeout), max);
-       ret = para_select(max + 1, &rfds, &wfds, &timeout);
-       if (ret < 0) {
-               ret = -E_RECV_SELECT;
-               goto out;
-       }
-       ret = r->post_select(&rn, ret, &rfds, &wfds);
-       if (ret < 0)
-               goto out;
-       if (!ret)
-               eof = 1;
-       if (!rn.loaded) {
-               if (eof)
-                       goto out;
-               goto recv;
-       }
-       ret = write(STDOUT_FILENO, rn.buf, rn.loaded);
-       PARA_DEBUG_LOG("wrote %d/%zd\n", ret, rn.loaded);
-       if (ret < 0) {
-               ret = -E_WRITE_STDOUT;
-               goto out;
-       }
-       if (ret != rn.loaded) {
-               PARA_INFO_LOG("short write %d/%zd\n", ret, rn.loaded);
-               memmove(rn.buf, rn.buf + ret, rn.loaded - ret);
-       }
-       rn.loaded -= ret;
-       if (rn.loaded || !eof)
-               goto recv;
-out:
-       if (r_opened)
-               r->close(&rn);
-       if (r)
-               r->shutdown();
-       if (ret < 0)
-               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-       return ret;
-}
-#endif
-
 void rn_event_handler(struct task *t)
 {
-       PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
-       unregister_task(t);
-}
-
-void stdout_event_handler(struct task *t)
-{
-       PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
+       struct receiver_node *rn = t->private_data;
+       PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
+       rn->eof = 1;
        unregister_task(t);
 }
 
 int main(int argc, char *argv[])
 {
-       int ret, eof = 0, max, r_opened = 0, receiver_num;
-       struct timeval timeout;
+       int ret, r_opened = 0, receiver_num;
        struct  receiver *r = NULL;
-       fd_set rfds, wfds;
        struct receiver_node rn;
        struct stdout_task sot;
        struct sched s;
 
-       init_sched();
        s.default_timeout.tv_sec = 1;
        s.default_timeout.tv_usec = 0;
 
@@ -173,22 +93,16 @@ int main(int argc, char *argv[])
                goto out;
        r_opened = 1;
 
-       sot.task.private_data = &sot;
-       sot.task.pre_select = stdout_pre_select;
-       sot.task.post_select = stdout_post_select;
-       sot.task.event_handler = stdout_event_handler;
-       sot.task.flags = 0;
-       sprintf(sot.task.status, "stdout writer");
+       stdout_set_defaults(&sot);
        sot.buf = rn.buf;
        sot.loaded = &rn.loaded;
-       sot.eof = &rn.eof;
+       sot.input_eof = &rn.eof;
        register_task(&sot.task);
 
        rn.task.private_data = &rn;
        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);