#include <string.h>
#include <assert.h>
#include <errno.h>
+#include <netinet/in.h>
+#include <sys/time.h>
+#include <sys/un.h>
+#include <unistd.h>
#include "log.h"
#include "mem.h"
#include "vector.h"
#include "heap.h"
#include "timeval.h"
+#include "client.h"
#include "playrtp.h"
+#include "inputline.h"
#define readahead linux_headers_are_borked
+/** @brief Obsolete synonym */
+#ifndef IPV6_JOIN_GROUP
+# define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP
+#endif
+
/** @brief RTP socket */
static int rtpfd;
#if HAVE_ALSA_ASOUNDLIB_H
# define DEFAULT_BACKEND playrtp_alsa
-#elif HAVE_SYS_SOUNDCARD_H
+#elif HAVE_SYS_SOUNDCARD_H || EMPEG_HOST
# define DEFAULT_BACKEND playrtp_oss
#elif HAVE_COREAUDIO_AUDIOHARDWARE_H
# define DEFAULT_BACKEND playrtp_coreaudio
HEAP_DEFINE(pheap, struct packet *, lt_packet);
+/** @brief Control socket or NULL */
+const char *control_socket;
+
static const struct option options[] = {
{ "help", no_argument, 0, 'h' },
{ "version", no_argument, 0, 'V' },
{ "buffer", required_argument, 0, 'b' },
{ "rcvbuf", required_argument, 0, 'R' },
{ "multicast", required_argument, 0, 'M' },
-#if HAVE_SYS_SOUNDCARD_H
+#if HAVE_SYS_SOUNDCARD_H || EMPEG_HOST
{ "oss", no_argument, 0, 'o' },
#endif
#if HAVE_ALSA_ASOUNDLIB_H
#if HAVE_COREAUDIO_AUDIOHARDWARE_H
{ "core-audio", no_argument, 0, 'c' },
#endif
+ { "socket", required_argument, 0, 's' },
+ { "config", required_argument, 0, 'C' },
{ 0, 0, 0, 0 }
};
+/** @brief Control thread
+ *
+ * This thread is responsible for accepting control commands from Disobedience
+ * (or other controllers) over an AF_UNIX stream socket with a path specified
+ * by the @c --socket option. The protocol uses simple string commands and
+ * replies:
+ *
+ * - @c stop will shut the player down
+ * - @c query will send back the reply @c running
+ * - anything else is ignored
+ *
+ * Commands and response strings terminated by shutting down the connection or
+ * by a newline. No attempt is made to multiplex multiple clients so it is
+ * important that the command be sent as soon as the connection is made - it is
+ * assumed that both parties to the protocol are entirely cooperating with one
+ * another.
+ */
+static void *control_thread(void attribute((unused)) *arg) {
+ struct sockaddr_un sa;
+ int sfd, cfd;
+ char *line;
+ socklen_t salen;
+ FILE *fp;
+
+ assert(control_socket);
+ unlink(control_socket);
+ memset(&sa, 0, sizeof sa);
+ sa.sun_family = AF_UNIX;
+ strcpy(sa.sun_path, control_socket);
+ sfd = xsocket(PF_UNIX, SOCK_STREAM, 0);
+ if(bind(sfd, (const struct sockaddr *)&sa, sizeof sa) < 0)
+ fatal(errno, "error binding to %s", control_socket);
+ if(listen(sfd, 128) < 0)
+ fatal(errno, "error calling listen on %s", control_socket);
+ info("listening on %s", control_socket);
+ for(;;) {
+ salen = sizeof sa;
+ cfd = accept(sfd, (struct sockaddr *)&sa, &salen);
+ if(cfd < 0) {
+ switch(errno) {
+ case EINTR:
+ case EAGAIN:
+ break;
+ default:
+ fatal(errno, "error calling accept on %s", control_socket);
+ }
+ }
+ if(!(fp = fdopen(cfd, "r+"))) {
+ error(errno, "error calling fdopen for %s connection", control_socket);
+ close(cfd);
+ continue;
+ }
+ if(!inputline(control_socket, fp, &line, '\n')) {
+ if(!strcmp(line, "stop")) {
+ info("stopped via %s", control_socket);
+ exit(0); /* terminate immediately */
+ }
+ if(!strcmp(line, "query"))
+ fprintf(fp, "running");
+ xfree(line);
+ }
+ if(fclose(fp) < 0)
+ error(errno, "error closing %s connection", control_socket);
+ }
+}
+
/** @brief Drop the first packet
*
* Assumes that @ref lock is held.
*/
static void play_rtp(void) {
pthread_t ltid;
+ int err;
/* We receive and convert audio data in a background thread */
- pthread_create(<id, 0, listen_thread, 0);
+ if((err = pthread_create(<id, 0, listen_thread, 0)))
+ fatal(err, "pthread_create listen_thread");
/* We have a second thread to add received packets to the queue */
- pthread_create(<id, 0, queue_thread, 0);
+ if((err = pthread_create(<id, 0, queue_thread, 0)))
+ fatal(err, "pthread_create queue_thread");
/* The rest of the work is backend-specific */
backend();
}
" --max, -x FRAMES Buffer maximum size\n"
" --rcvbuf, -R BYTES Socket receive buffer size\n"
" --multicast, -M GROUP Join multicast group\n"
+ " --config, -C PATH Set configuration file\n"
#if HAVE_ALSA_ASOUNDLIB_H
" --alsa, -a Use ALSA to play audio\n"
#endif
-#if HAVE_SYS_SOUNDCARD_H
+#if HAVE_SYS_SOUNDCARD_H || EMPEG_HOST
" --oss, -o Use OSS to play audio\n"
#endif
#if HAVE_COREAUDIO_AUDIOHARDWARE_H
}
int main(int argc, char **argv) {
- int n;
+ int n, err;
struct addrinfo *res;
struct stringlist sl;
char *sockname;
char *multicast_group = 0;
struct ip_mreq mreq;
struct ipv6_mreq mreq6;
+ disorder_client *c;
+ char *address, *port;
static const struct addrinfo prefs = {
AI_PASSIVE,
mem_init();
if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
- while((n = getopt_long(argc, argv, "hVdD:m:b:x:L:R:M:aoc", options, 0)) >= 0) {
+ while((n = getopt_long(argc, argv, "hVdD:m:b:x:L:R:M:aocC:", options, 0)) >= 0) {
switch(n) {
case 'h': help();
case 'V': version();
#if HAVE_ALSA_ASOUNDLIB_H
case 'a': backend = playrtp_alsa; break;
#endif
-#if HAVE_SYS_SOUNDCARD_H
+#if HAVE_SYS_SOUNDCARD_H || EMPEG_HOST
case 'o': backend = playrtp_oss; break;
#endif
#if HAVE_COREAUDIO_AUDIOHARDWARE_H
case 'c': backend = playrtp_coreaudio; break;
#endif
+ case 'C': configfile = optarg; break;
+ case 's': control_socket = optarg; break;
default: fatal(0, "invalid option");
}
}
+ if(config_read(0)) fatal(0, "cannot read configuration");
if(!maxbuffer)
maxbuffer = 4 * readahead;
argc -= optind;
argv += optind;
- if(argc < 1 || argc > 2)
- fatal(0, "usage: disorder-playrtp [OPTIONS] ADDRESS [PORT]");
- sl.n = argc;
- sl.s = argv;
+ switch(argc) {
+ case 0:
+ case 1:
+ if(!(c = disorder_new(1))) exit(EXIT_FAILURE);
+ if(disorder_connect(c)) exit(EXIT_FAILURE);
+ if(disorder_rtp_address(c, &address, &port)) exit(EXIT_FAILURE);
+ sl.n = 1;
+ sl.s = &port;
+ /* set multicast_group if address is a multicast address */
+ break;
+ case 2:
+ sl.n = argc;
+ sl.s = argv;
+ break;
+ default:
+ fatal(0, "usage: disorder-playrtp [OPTIONS] [ADDRESS [PORT]]");
+ }
/* Listen for inbound audio data */
if(!(res = get_address(&sl, &prefs, &sockname)))
exit(1);
+ info("listening on %s", sockname);
if((rtpfd = socket(res->ai_family,
res->ai_socktype,
res->ai_protocol)) < 0)
info("default socket receive buffer %d", rcvbuf);
if(logfp)
info("WARNING: -L option can impact performance");
+ if(control_socket) {
+ pthread_t tid;
+
+ if((err = pthread_create(&tid, 0, control_thread, 0)))
+ fatal(err, "pthread_create control_thread");
+ }
play_rtp();
return 0;
}