First draft of the libosl patch series.
[paraslash.git] / http_recv.c
index a3167bd..7f13034 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -14,6 +14,7 @@
 #include "http.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "recv.h"
 #include "http_recv.cmdline.h"
 #include "net.h"
@@ -84,10 +85,10 @@ static char *make_request_msg(void)
 
 static void http_recv_pre_select(struct sched *s, struct task *t)
 {
-       struct receiver_node *rn = t->private_data;
+       struct receiver_node *rn = container_of(t, struct receiver_node, task);
        struct private_http_recv_data *phd = rn->private_data;
 
-       t->ret = 1;
+       t->error = 0;
        if  (phd->status == HTTP_CONNECTED)
                para_fd_set(phd->fd, &s->wfds, &s->max_fileno);
        else
@@ -97,53 +98,47 @@ static void http_recv_pre_select(struct sched *s, struct task *t)
 
 static void http_recv_post_select(struct sched *s, struct task *t)
 {
-       struct receiver_node *rn = t->private_data;
+       struct receiver_node *rn = container_of(t, struct receiver_node, task);
        struct private_http_recv_data *phd = rn->private_data;
 
-       if (rn->output_error && *rn->output_error) {
-               t->ret = *rn->output_error;
-               goto out;
+       if (rn->output_error && *rn->output_error < 0) {
+               t->error = *rn->output_error;
+               return;
        }
-       t->ret = 1;
-       if (!s->select_ret)
-               goto out;
        if  (phd->status == HTTP_CONNECTED) {
                char *rq;
                if (!FD_ISSET(phd->fd, &s->wfds))
-                       goto out;
+                       return;
                rq = make_request_msg();
                PARA_INFO_LOG("sending http request\n");
-               t->ret = send_va_buffer(phd->fd, "%s", rq);
+               t->error = send_va_buffer(phd->fd, "%s", rq);
                free(rq);
-               if (t->ret > 0)
+               if (t->error >= 0)
                        phd->status = HTTP_SENT_GET_REQUEST;
-               goto out;
+               return;
        }
        if (!FD_ISSET(phd->fd, &s->rfds))
-               goto out;
+               return;
        if (phd->status == HTTP_SENT_GET_REQUEST) {
-               t->ret = recv_pattern(phd->fd, HTTP_OK_MSG, MAXLINE);
-               if (t->ret < 0)
-                       goto out;
-               PARA_INFO_LOG("received ok msg, streaming\n");
-               t->ret = 1;
-               phd->status = HTTP_STREAMING;
-               goto out;
+               t->error = recv_pattern(phd->fd, HTTP_OK_MSG, strlen(HTTP_OK_MSG));
+               if (t->error >= 0) {
+                       PARA_INFO_LOG("received ok msg, streaming\n");
+                       phd->status = HTTP_STREAMING;
+               }
+               return;
        }
-       t->ret = -E_HTTP_RECV_OVERRUN;
-       if (rn->loaded >= BUFSIZE)
-               goto out;
-       t->ret = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
+       if (rn->loaded >= BUFSIZE) {
+               t->error = -E_HTTP_RECV_OVERRUN;
+               return;
+       }
+       t->error = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
                BUFSIZE - rn->loaded);
-       if (t->ret <= 0) {
-               if (!t->ret)
-                       t->ret = -E_RECV_EOF;
-               goto out;
+       if (t->error > 0) {
+               rn->loaded += t->error;
+               return;
        }
-       rn->loaded += t->ret;
-out:
-       if (t->ret < 0)
-               rn->error = t->ret;
+       if (!t->error)
+               t->error = -E_RECV_EOF;
 }
 
 static void http_recv_close(struct receiver_node *rn)
@@ -195,10 +190,17 @@ static int http_recv_open(struct receiver_node *rn)
  */
 void http_recv_init(struct receiver *r)
 {
+       struct http_recv_args_info dummy;
+
+       http_recv_cmdline_parser_init(&dummy);
        r->open = http_recv_open;
        r->close = http_recv_close;
        r->pre_select = http_recv_pre_select;
        r->post_select = http_recv_post_select;
        r->shutdown = http_shutdown;
        r->parse_config = http_recv_parse_config;
+       r->help = (struct ggo_help) {
+               .short_help = http_recv_args_info_help,
+               .detailed_help = http_recv_args_info_detailed_help
+       };
 }