X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/c0dadbae5e2cc55cdcbe4a7fe9e1564385a9f8af..8ab2aa9fd51a89e06d92a4f7c3792aaa4a08cc71:/lib/uaudio-rtp.c diff --git a/lib/uaudio-rtp.c b/lib/uaudio-rtp.c index b41bdda..9e7abde 100644 --- a/lib/uaudio-rtp.c +++ b/lib/uaudio-rtp.c @@ -41,24 +41,20 @@ #include "timeval.h" #include "configuration.h" -/** @brief Bytes to send per network packet - * - * This is the maximum number of bytes we pass to write(2); to determine actual - * packet sizes, add a UDP header and an IP header (and a link layer header if - * it's the link layer size you care about). - * - * Don't make this too big or arithmetic will start to overflow. - */ -#define NETWORK_BYTES (1500-8/*UDP*/-40/*IP*/-8/*conservatism*/) +/** @brief Bytes to send per network packet */ +static int rtp_max_payload; /** @brief RTP payload type */ static int rtp_payload; -/** @brief RTP output socket */ -static int rtp_fd; +/** @brief RTP broadcast/multicast output socket */ +static int rtp_fd = -1; + +/** @brief RTP unicast output socket (IPv4) */ +static int rtp_fd4 = -1; -/** @brief RTP output socket (IPv6) */ -static int rtp_fd6; +/** @brief RTP unicast output socket (IPv6) */ +static int rtp_fd6 = -1; /** @brief RTP SSRC */ static uint32_t rtp_id; @@ -75,9 +71,6 @@ static uint16_t rtp_sequence; */ static int rtp_errors; -/** @brief Set while paused */ -static volatile int rtp_paused; - /** @brief RTP mode */ static int rtp_mode; @@ -107,6 +100,8 @@ static const char *const rtp_options[] = { "multicast-ttl", "multicast-loop", "rtp-mode", + "rtp-max-payload", + "rtp-mtu-discovery", NULL }; @@ -209,23 +204,23 @@ static size_t rtp_play(void *buffer, size_t nsamples, unsigned flags) { uaudio_schedule_sent(nsamples); return nsamples; } - if(rtp_mode == RTP_REQUEST) { - struct rtp_recipient *r; - struct msghdr m; - memset(&m, 0, sizeof m); - m.msg_iov = vec; - m.msg_iovlen = 2; - pthread_mutex_lock(&rtp_lock); - for(r = rtp_recipient_list; r; r = r->next) { - m.msg_name = &r->sa; - m.msg_namelen = r->sa.ss_family == AF_INET ? - sizeof(struct sockaddr_in) : sizeof (struct sockaddr_in6); - sendmsg(r->sa.ss_family == AF_INET ? rtp_fd : rtp_fd6, - &m, MSG_DONTWAIT|MSG_NOSIGNAL); - // TODO similar error handling to other case? - } - pthread_mutex_unlock(&rtp_lock); - } else { + /* Send stuff to explicitly registerd unicast addresses unconditionally */ + struct rtp_recipient *r; + struct msghdr m; + memset(&m, 0, sizeof m); + m.msg_iov = vec; + m.msg_iovlen = 2; + pthread_mutex_lock(&rtp_lock); + for(r = rtp_recipient_list; r; r = r->next) { + m.msg_name = &r->sa; + m.msg_namelen = r->sa.ss_family == AF_INET ? + sizeof(struct sockaddr_in) : sizeof (struct sockaddr_in6); + sendmsg(r->sa.ss_family == AF_INET ? rtp_fd4 : rtp_fd6, + &m, MSG_DONTWAIT|MSG_NOSIGNAL); + // TODO similar error handling to other case? + } + pthread_mutex_unlock(&rtp_lock); + if(rtp_mode != RTP_REQUEST) { int written_bytes; do { written_bytes = writev(rtp_fd, vec, 2); @@ -245,13 +240,35 @@ static size_t rtp_play(void *buffer, size_t nsamples, unsigned flags) { return nsamples; } +static void hack_send_buffer_size(int fd, const char *what) { + int sndbuf, target_sndbuf = 131072; + socklen_t len = sizeof sndbuf; + + if(getsockopt(fd, SOL_SOCKET, SO_SNDBUF, + &sndbuf, &len) < 0) + disorder_fatal(errno, "error getting SO_SNDBUF on %s socket", what); + if(target_sndbuf > sndbuf) { + if(setsockopt(fd, SOL_SOCKET, SO_SNDBUF, + &target_sndbuf, sizeof target_sndbuf) < 0) + disorder_error(errno, "error setting SO_SNDBUF on %s socket to %d", + what, target_sndbuf); + else + disorder_info("changed socket send buffer size on %socket from %d to %d", + what, sndbuf, target_sndbuf); + } else + disorder_info("default socket send buffer on %s socket is %d", + what, sndbuf); +} + static void rtp_open(void) { struct addrinfo *dres, *sres; static const int one = 1; - int sndbuf, target_sndbuf = 131072; - socklen_t len; struct netaddress dst[1], src[1]; const char *mode; +#ifdef IP_MTU_DISCOVER + const char *mtu_disc; + int opt; +#endif /* Get the mode */ mode = uaudio_get("rtp-mode", "auto"); @@ -308,22 +325,20 @@ static void rtp_open(void) { rtp_mode = RTP_UNICAST; } } - /* Create the socket */ + rtp_max_payload = atoi(uaudio_get("rtp-max-payload", "-1")); + if(rtp_max_payload < 0) + rtp_max_payload = 1500 - 8/*UDP*/ - 40/*IP*/ - 8/*conservatism*/; + /* Create the sockets */ if(rtp_mode != RTP_REQUEST) { if((rtp_fd = socket(dres->ai_family, dres->ai_socktype, dres->ai_protocol)) < 0) disorder_fatal(errno, "error creating RTP transmission socket"); - } else { /* request mode slightly different */ - if((rtp_fd = socket(AF_INET, - SOCK_DGRAM, - IPPROTO_UDP)) < 0) - disorder_fatal(errno, "error creating v4 RTP transmission socket"); - if((rtp_fd6 = socket(AF_INET6, - SOCK_DGRAM, - IPPROTO_UDP)) < 0) - disorder_fatal(errno, "error creating v6 RTP transmission socket"); } + if((rtp_fd4 = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) + disorder_fatal(errno, "error creating v4 RTP transmission socket"); + if((rtp_fd6 = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP)) < 0) + disorder_fatal(errno, "error creating v6 RTP transmission socket"); /* Configure the socket according to the desired mode */ switch(rtp_mode) { case RTP_MULTICAST: { @@ -372,20 +387,10 @@ static void rtp_open(void) { break; } } - /* Enlarge the socket buffer */ - len = sizeof sndbuf; - if(getsockopt(rtp_fd, SOL_SOCKET, SO_SNDBUF, - &sndbuf, &len) < 0) - disorder_fatal(errno, "error getting SO_SNDBUF"); - if(target_sndbuf > sndbuf) { - if(setsockopt(rtp_fd, SOL_SOCKET, SO_SNDBUF, - &target_sndbuf, sizeof target_sndbuf) < 0) - disorder_error(errno, "error setting SO_SNDBUF to %d", target_sndbuf); - else - disorder_info("changed socket send buffer size from %d to %d", - sndbuf, target_sndbuf); - } else - disorder_info("default socket send buffer is %d", sndbuf); + /* Enlarge the socket buffers */ + if (rtp_fd != -1) hack_send_buffer_size(rtp_fd, "master socket"); + hack_send_buffer_size(rtp_fd4, "IPv4 on-demand socket"); + hack_send_buffer_size(rtp_fd6, "IPv6 on-demand socket"); /* We might well want to set additional broadcast- or multicast-related * options here */ if(rtp_mode != RTP_REQUEST) { @@ -396,6 +401,19 @@ static void rtp_open(void) { disorder_fatal(errno, "error connecting broadcast socket to %s", format_sockaddr(dres->ai_addr)); } +#ifdef IP_MTU_DISCOVER + mtu_disc = uaudio_get("rtp-mtu-discovery", "default"); + do { + if(!strcmp(mtu_disc, "yes")) opt = IP_PMTUDISC_DO; + else if(!strcmp(mtu_disc, "no")) opt = IP_PMTUDISC_DONT; + else break; + if(setsockopt(rtp_fd4, IPPROTO_IP, IP_MTU_DISCOVER, &opt, sizeof opt)) + disorder_fatal(errno, "error setting MTU discovery"); + if(sres->ai_family == AF_INET && + setsockopt(rtp_fd, IPPROTO_IP, IP_MTU_DISCOVER, &opt, sizeof opt)) + disorder_fatal(errno, "error setting MTU discovery"); + } while (0); +#endif if(config->rtp_verbose) disorder_info("RTP: prepared socket"); } @@ -434,7 +452,7 @@ static void rtp_start(uaudio_callback *callback, userdata, rtp_play, 256 / uaudio_sample_size, - (NETWORK_BYTES - sizeof(struct rtp_header)) + (rtp_max_payload - sizeof(struct rtp_header)) / uaudio_sample_size, 0); if(config->rtp_verbose) @@ -443,12 +461,9 @@ static void rtp_start(uaudio_callback *callback, static void rtp_stop(void) { uaudio_thread_stop(); - close(rtp_fd); - rtp_fd = -1; - if(rtp_fd6 >= 0) { - close(rtp_fd6); - rtp_fd6 = -1; - } + if(rtp_fd >= 0) { close(rtp_fd); rtp_fd = -1; } + if(rtp_fd4 >= 0) { close(rtp_fd4); rtp_fd4 = -1; } + if(rtp_fd6 >= 0) { close(rtp_fd6); rtp_fd6 = -1; } } static void rtp_configure(void) { @@ -464,6 +479,9 @@ static void rtp_configure(void) { snprintf(buffer, sizeof buffer, "%ld", config->multicast_ttl); uaudio_set("multicast-ttl", buffer); uaudio_set("multicast-loop", config->multicast_loop ? "yes" : "no"); + snprintf(buffer, sizeof buffer, "%ld", config->rtp_max_payload); + uaudio_set("rtp-max-payload", buffer); + uaudio_set("rtp-mtu-discovery", config->rtp_mtu_discovery); if(config->rtp_verbose) disorder_info("RTP: configured"); }