/*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "server.h"
#include "net.h"
#include "list.h"
-#include "afs.h"
+#include "vss.h"
#include "send.h"
#include "dccp.h"
#include "error.h"
}
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);
}
free(dc);
}
-#define DCCP_RETRIES 100
+/** give up if write would block that many times */
+#define DCCP_WRITE_RETRIES 100
static int dccp_write(int fd, const char *buf, size_t len)
{
size = PARA_MIN(1024, len - written);
ret = write(fd, buf + written, size);
if (ret < 0) {
- if (errno != EAGAIN || !retries++ > DCCP_RETRIES)
+ if (errno != EAGAIN || retries++ > DCCP_WRITE_RETRIES)
goto err_out;
PARA_DEBUG_LOG("EAGAIN #%d@%zd/%zd\n", retries, written, len);
goto again;
__a_unused long unsigned chunks_sent, const char *buf, size_t len)
{
struct dccp_client *dc, *tmp;
- int ret, header_len;
+ int ret;
char *header_buf;
+ unsigned header_len;
if (listen_fd < 0 || !len)
return;
if (!ret)
continue;
if (!dc->header_sent && current_chunk) {
- header_buf = afs_get_header(&header_len);
+ header_buf = vss_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",
+ PARA_ERROR_LOG("header write: %d/%u (%s)\n",
ret, header_len, ret < 0?
strerror(err) : "");
dccp_shutdown_client(dc);