projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make mp3_seek_next_header() more readable.
[paraslash.git]
/
dccp_recv.c
diff --git
a/dccp_recv.c
b/dccp_recv.c
index 64506737195de991134df0e692e897375c832e85..d0bc53542137ac06cce22b75fcbe17d649041b9b 100644
(file)
--- a/
dccp_recv.c
+++ b/
dccp_recv.c
@@
-73,12
+73,12
@@
static int dccp_recv_open(struct receiver_node *rn)
ret = -ERRNO_TO_PARA_ERROR(errno);
goto err;
}
ret = -ERRNO_TO_PARA_ERROR(errno);
goto err;
}
-
+ ret = mark_fd_nonblocking(fd);
+ if (ret < 0)
+ goto err;
rn->buf = para_calloc(DCCP_BUFSIZE);
rn->private_data = pdd = para_calloc(sizeof(struct private_dccp_recv_data));
rn->buf = para_calloc(DCCP_BUFSIZE);
rn->private_data = pdd = para_calloc(sizeof(struct private_dccp_recv_data));
-
- pdd->fd = ret;
- mark_fd_nonblocking(pdd->fd);
+ pdd->fd = fd;
return 1;
err:
close(fd);
return 1;
err:
close(fd);
@@
-102,48
+102,44
@@
static void *dccp_recv_parse_config(int argc, char **argv)
static void dccp_recv_pre_select(struct sched *s, struct task *t)
{
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;
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)
{
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;
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;
+ }
+ if (!FD_ISSET(pdd->fd, &s->rfds))
+ return; /* nothing to do */
+ if (rn->loaded >= DCCP_BUFSIZE) {
+ t->error = -E_DCCP_OVERRUN;
+ 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,
+ t->error = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,
DCCP_BUFSIZE - 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)
{
*/
void dccp_recv_init(struct receiver *r)
{