summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b74c894)
The udp sender will start to use it soon. Make it take the fd and
the chunk queue instead of a struct sender_client as the udp sender
does not use struct sender_client.
void generic_com_off(struct sender_status *ss);
char *generic_sender_help(void);
struct sender_client *accept_sender_client(struct sender_status *ss);
void generic_com_off(struct sender_status *ss);
char *generic_sender_help(void);
struct sender_client *accept_sender_client(struct sender_status *ss);
+int send_queued_chunks(int fd, struct chunk_queue *cq,
+ size_t max_bytes_per_write);
-/* return: negative on errors, zero if not everything was sent, one otherwise */
-static int send_queued_chunks(struct sender_client *sc,
+/**
+ * Try to empty the chunk queue for this fd.
+ *
+ * \param fd The file descriptor.
+ * \param cq The list of queued chunks.
+ * \param max_bytes_per_write Do not send more than this in one go.
+ *
+ * \return Negative on errors, zero if not everything was sent, one otherwise.
+ */
+int send_queued_chunks(int fd, struct chunk_queue *cq,
size_t max_bytes_per_write)
{
struct queued_chunk *qc;
size_t max_bytes_per_write)
{
struct queued_chunk *qc;
- while ((qc = cq_peek(sc->cq))) {
+ while ((qc = cq_peek(cq))) {
const char *buf;
size_t len;
int ret;
cq_get(qc, &buf, &len);
const char *buf;
size_t len;
int ret;
cq_get(qc, &buf, &len);
- ret = write_nonblock(sc->fd, buf, len, max_bytes_per_write);
+ ret = write_nonblock(fd, buf, len, max_bytes_per_write);
- cq_update(sc->cq, ret);
if (ret != len)
return 0;
if (ret != len)
return 0;
- ret = send_queued_chunks(sc, max_bytes_per_write);
+ ret = send_queued_chunks(sc->fd, sc->cq, max_bytes_per_write);
if (ret < 0) {
shutdown_client(sc, ss);
goto out;
if (ret < 0) {
shutdown_client(sc, ss);
goto out;