projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ortp_send: Fix EOF packet sending
[paraslash.git]
/
dccp_send.c
diff --git
a/dccp_send.c
b/dccp_send.c
index 74976cf202a27c430be96448011a966865fbf249..e838b3d87f23a64faa7eb4829f38c2dbcac7cf1c 100644
(file)
--- a/
dccp_send.c
+++ b/
dccp_send.c
@@
-50,17
+50,17
@@
struct dccp_client {
int header_sent;
};
int header_sent;
};
-static void dccp_pre_select(__unused struct audio_format *af, int *max_fileno, fd_set *rfds,
- __unused fd_set *wfds)
+static void dccp_pre_select(__
a_
unused struct audio_format *af, int *max_fileno, fd_set *rfds,
+ __
a_
unused fd_set *wfds)
{
if (listen_fd < 0)
return;
FD_SET(listen_fd, rfds);
{
if (listen_fd < 0)
return;
FD_SET(listen_fd, rfds);
- *max_fileno = MAX(*max_fileno, listen_fd);
+ *max_fileno =
PARA_
MAX(*max_fileno, listen_fd);
}
}
-static void dccp_post_select(__unused struct audio_format *af, fd_set *rfds,
- __unused fd_set *wfds)
+static void dccp_post_select(__
a_
unused struct audio_format *af, fd_set *rfds,
+ __
a_
unused fd_set *wfds)
{
struct dccp_client *dc;
int ret;
{
struct dccp_client *dc;
int ret;
@@
-119,7
+119,7
@@
static int dccp_write(int fd, const char *buf, size_t len)
size_t send, written = 0;
int ret;
again:
size_t send, written = 0;
int ret;
again:
- send = MIN(1024, len - written);
+ send =
PARA_
MIN(1024, len - written);
ret = write(fd, buf + written, send);
if (ret < 0)
goto err_out;
ret = write(fd, buf + written, send);
if (ret < 0)
goto err_out;
@@
-133,9
+133,9
@@
err_out:
return -E_DCCP_WRITE;
}
return -E_DCCP_WRITE;
}
-static void dccp_send(__unused struct audio_format *af,
+static void dccp_send(__
a_
unused struct audio_format *af,
long unsigned current_chunk,
long unsigned current_chunk,
- __unused long unsigned chunks_sent, const char *buf, size_t len)
+ __
a_
unused long unsigned chunks_sent, const char *buf, size_t len)
{
struct dccp_client *dc, *tmp;
int ret, header_len;
{
struct dccp_client *dc, *tmp;
int ret, header_len;
@@
-234,8
+234,9
@@
void dccp_send_init(struct sender *s)
s->client_cmds[SENDER_DELETE] = NULL;
self = s;
ret = dccp_open();
s->client_cmds[SENDER_DELETE] = NULL;
self = s;
ret = dccp_open();
- if (ret < 0)
+ if (ret < 0)
{
PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
- else
+ s->status = SENDER_OFF;
+ } else
s->status = SENDER_ON;
}
s->status = SENDER_ON;
}