/*
- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#include "error.h"
#include "list.h"
#include "sched.h"
+#include "ggo.h"
#include "recv.h"
#include "string.h"
#include "net.h"
static void dccp_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_dccp_recv_data *pdd = rn->private_data;
- t->ret = 1;
+ t->error = 0;
para_fd_set(pdd->fd, &s->rfds, &s->max_fileno);
}
static void dccp_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_dccp_recv_data *pdd = 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 || !FD_ISSET(pdd->fd, &s->rfds))
- goto out; /* nothing to do */
- t->ret = -E_DCCP_OVERRUN;
- if (rn->loaded >= DCCP_BUFSIZE)
- goto out;
- t->ret = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,
+ if (!FD_ISSET(pdd->fd, &s->rfds))
+ return; /* nothing to do */
+ if (rn->loaded >= DCCP_BUFSIZE) {
+ t->error = -E_DCCP_OVERRUN;
+ return;
+ }
+ t->error = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,
DCCP_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;
- return;
-out:
- if (t->ret < 0)
- rn->error = t->ret;
+ if (!t->error)
+ t->error = -E_RECV_EOF;
}
/**
- * the init function of the dccp receiver
+ * The init function of the dccp receiver.
*
- * \param r pointer to the receiver struct to initialize
+ * \param r Pointer to the receiver struct to initialize.
*
- * Initialize all function pointers of \a r
+ * Initialize all function pointers of \a r.
*/
void dccp_recv_init(struct receiver *r)
{
+ struct dccp_recv_args_info dummy;
+
+ dccp_recv_cmdline_parser_init(&dummy);
r->shutdown = dccp_shutdown;
r->open = dccp_recv_open;
r->close = dccp_recv_close;
r->pre_select = dccp_recv_pre_select;
r->post_select = dccp_recv_post_select;
r->parse_config = dccp_recv_parse_config;
+ r->help = (struct ggo_help) {
+ .short_help = dccp_recv_args_info_help,
+ .detailed_help = dccp_recv_args_info_detailed_help
+ };
}