upd_send.c: Use write_nonblock() rather than write_all().

[paraslash.git] / udp_send.c

diff --git a/udp_send.c b/udp_send.c
index 61cab430c04dca75f1e89c5e4821be3b24328dfe..8bbcbae7fa611473d1abd67a65d70506380aa8a5 100644 (file)
--- a/udp_send.c
+++ b/udp_send.c
@@ -61,14 +61,13 @@ static void udp_send_buf(char *buf, size_t len)
        int ret;
 
        list_for_each_entry_safe(ut, tmp, &targets, node) {
-               size_t written = len;
                if (ut->fd < 0)
                        continue;
-               ret = write_all(ut->fd, buf, &written);
+               ret = write_nonblock(ut->fd, buf, len, len);
                if (ret < 0) /* TODO: Use chunk queueing */
                        return udp_delete_target(ut, "send error");
-               if (written != len)
-                       PARA_WARNING_LOG("short write %zu/%zu\n", written, len);
+               if (ret != len)
+                       PARA_WARNING_LOG("short write %zu/%zu\n", ret, len);
        }
 }
 
@@ -79,12 +78,15 @@ static int udp_init_session(struct udp_target *ut)
        if (ut->fd >= 0) /* nothing to do */
                return 0;
        PARA_NOTICE_LOG("sending to udp %s:%d\n", TARGET_ADDR(ut), ut->port);
-       /* TODO: Make ttl configurable. */
-       ret = create_udp_send_socket(TARGET_ADDR(ut), ut->port, 10);
+       ret = create_udp_send_socket(TARGET_ADDR(ut), ut->port,
+               conf.udp_ttl_arg);
        if (ret < 0)
                return ret;
        ut->fd = ret;
-       return mark_fd_nonblocking(ut->fd);
+       ret = mark_fd_nonblocking(ut->fd);
+       if (ret < 0)
+               close(ut->fd);
+       return ret;
 }
 
 static void udp_shutdown_targets(void)