#include "dccp.h"
#include "error.h"
#include "string.h"
+#include "fd.h"
+#include "close_on_fork.h"
#include "server.cmdline.h"
-extern struct gengetopt_args_info conf;
+
/** the list of connected clients **/
static struct list_head clients;
static int listen_fd = -1;
int header_sent;
};
-static void dccp_pre_select(__a_unused struct audio_format_handler *af,
- int *max_fileno, fd_set *rfds, __a_unused fd_set *wfds)
+static void dccp_pre_select( int *max_fileno, fd_set *rfds,
+ __a_unused fd_set *wfds)
{
if (listen_fd < 0)
return;
*max_fileno = PARA_MAX(*max_fileno, listen_fd);
}
-static void dccp_post_select(__a_unused struct audio_format_handler *af,
- fd_set *rfds, __a_unused fd_set *wfds)
+static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
{
struct dccp_client *dc;
int ret;
}
PARA_NOTICE_LOG("connection from %s\n", inet_ntoa(dc->addr.sin_addr));
dc->fd = ret;
- list_add(&dc->node, &clients);
+ para_list_add(&dc->node, &clients);
+ add_close_on_fork_list(dc->fd);
+ mark_fd_nonblock(dc->fd);
}
static int dccp_open(void)
if (ret < 0)
return -E_DCCP_LISTEN;
PARA_DEBUG_LOG("listening on fd %d\n", listen_fd);
+ add_close_on_fork_list(listen_fd);
+ mark_fd_nonblock(listen_fd);
return 1;
}
PARA_DEBUG_LOG("shutting down %s (fd %d)\n", inet_ntoa(dc->addr.sin_addr),
dc->fd);
close(dc->fd);
+ del_close_on_fork_list(dc->fd);
list_del(&dc->node);
free(dc);
}
+#define DCCP_RETRIES 100
+
static int dccp_write(int fd, const char *buf, size_t len)
{
- size_t send, written = 0;
- int ret;
+ size_t size, written = 0;
+ int ret, retries = 0;
again:
- send = PARA_MIN(1024, len - written);
- ret = write(fd, buf + written, send);
- if (ret < 0)
- goto err_out;
+ size = PARA_MIN(1024, len - written);
+ ret = write(fd, buf + written, size);
+ if (ret < 0) {
+ if (errno != EAGAIN || !retries++ > DCCP_RETRIES)
+ goto err_out;
+ PARA_DEBUG_LOG("EAGAIN #%d@%zd/%zd\n", retries, written, len);
+ goto again;
+ }
+ retries = 0;
written += ret;
if (written >= len)
return written;
return -E_DCCP_WRITE;
}
-static void dccp_send(__a_unused struct audio_format_handler *af,
- long unsigned current_chunk,
+static void dccp_send(long unsigned current_chunk,
__a_unused long unsigned chunks_sent, const char *buf, size_t len)
{
struct dccp_client *dc, *tmp;
}
if (!ret)
continue;
- if (!dc->header_sent && af->get_header_info && current_chunk) {
- header_buf = af->get_header_info(&header_len);
- if (!header_buf || header_len <= 0)
- continue; /* header not yet available */
- ret = dccp_write(dc->fd, header_buf, header_len);
- if (ret != header_len) {
- int err = errno;
- PARA_ERROR_LOG("header write: %d/%d (%s)\n",
- ret, header_len, ret < 0?
- strerror(err) : "");
- dccp_shutdown_client(dc);
- continue;
- }
- dc->header_sent = 1;
- ret = write_ok(dc->fd);
- if (ret < 0) {
- dccp_shutdown_client(dc);
- continue;
+ if (!dc->header_sent && current_chunk) {
+ header_buf = afs_get_header(&header_len);
+ if (header_buf && header_len > 0) {
+ ret = dccp_write(dc->fd, header_buf, header_len);
+ if (ret != header_len) {
+ int err = errno;
+ PARA_ERROR_LOG("header write: %d/%d (%s)\n",
+ ret, header_len, ret < 0?
+ strerror(err) : "");
+ dccp_shutdown_client(dc);
+ continue;
+ }
+ dc->header_sent = 1;
+ ret = write_ok(dc->fd);
+ if (ret < 0) {
+ dccp_shutdown_client(dc);
+ continue;
+ }
+ if (!ret)
+ continue;
}
- if (!ret)
- continue;
}
// PARA_DEBUG_LOG("writing %d bytes to fd %d\n", len, dc->fd);
ret = dccp_write(dc->fd, buf, len);