#include "net.h"
#include "fd.h"
#include "sched.h"
-
+#include "close_on_fork.h"
+#include "chunk_queue.h"
/** Convert in_addr to ascii. */
#define TARGET_ADDR(oc) inet_ntoa((oc)->addr)
int port;
/** The socket fd. */
int fd;
+ /** The list of queued chunks for this fd. */
+ struct chunk_queue *cq;
};
static struct list_head targets;
static int sender_status;
+static void udp_close_target(struct udp_target *ut)
+{
+ if (ut->fd < 0)
+ return;
+ close(ut->fd);
+ del_close_on_fork_list(ut->fd);
+ cq_destroy(ut->cq);
+ ut->cq = NULL;
+ ut->fd = -1;
+}
+
static void udp_delete_target(struct udp_target *ut, const char *msg)
{
PARA_NOTICE_LOG("deleting %s:%d (%s) from list\n", TARGET_ADDR(ut),
ut->port, msg);
- if (ut->fd >= 0)
- close(ut->fd);
+ udp_close_target(ut);
list_del(&ut->node);
free(ut);
}
if (ut->fd < 0)
continue;
ret = write_nonblock(ut->fd, buf, len, len);
- if (ret < 0) /* TODO: Use chunk queueing */
- return udp_delete_target(ut, "send error");
+ if (ret < 0) {
+ udp_delete_target(ut, para_strerror(-ret));
+ continue;
+ }
if (ret != len)
PARA_WARNING_LOG("short write %zu/%zu\n", ret, len);
}
}
+#define UDP_CQ_BYTES 40000
+
static int udp_init_session(struct udp_target *ut)
{
int ret;
return ret;
ut->fd = ret;
ret = mark_fd_nonblocking(ut->fd);
- if (ret < 0)
+ if (ret < 0) {
close(ut->fd);
- return ret;
+ return ret;
+ }
+ add_close_on_fork_list(ut->fd);
+ ut->cq = cq_new(UDP_CQ_BYTES);
+ return 1;
}
static void udp_shutdown_targets(void)
if (ut->fd < 0)
continue;
write(ut->fd, buf, UDP_AUDIO_HEADER_LEN);
- close(ut->fd);
- ut->fd = -1;
+ udp_close_target(ut);
}
}