mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-03 09:01:50 -05:00
Automatic discovery of airtunes devices via Bonjour/Avahi.
This also does some minor reordering in the Makefile.am Refs #69 git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/coling@2519 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Colin Guthrie
parent
d997420791
commit
729bbaf884
2 changed files with 395 additions and 6 deletions
|
|
@ -1127,7 +1127,8 @@ endif
|
|||
if HAVE_AVAHI
|
||||
modlibexec_LTLIBRARIES += \
|
||||
module-zeroconf-publish.la \
|
||||
module-zeroconf-discover.la
|
||||
module-zeroconf-discover.la \
|
||||
module-raop-discover.la
|
||||
endif
|
||||
|
||||
if HAVE_LIRC
|
||||
|
|
@ -1207,7 +1208,6 @@ SYMDEF_FILES = \
|
|||
modules/module-esound-compat-spawnfd-symdef.h \
|
||||
modules/module-esound-compat-spawnpid-symdef.h \
|
||||
modules/module-match-symdef.h \
|
||||
modules/module-raop-sink-symdef.h \
|
||||
modules/module-tunnel-sink-symdef.h \
|
||||
modules/module-tunnel-source-symdef.h \
|
||||
modules/module-null-sink-symdef.h \
|
||||
|
|
@ -1242,6 +1242,8 @@ SYMDEF_FILES = \
|
|||
modules/bluetooth/module-bluetooth-proximity-symdef.h \
|
||||
modules/bluetooth/module-bluetooth-discover-symdef.h \
|
||||
modules/bluetooth/module-bluetooth-device-symdef.h \
|
||||
modules/module-raop-sink-symdef.h \
|
||||
modules/module-raop-discover-symdef.h \
|
||||
modules/gconf/module-gconf-symdef.h \
|
||||
modules/module-position-event-sounds-symdef.h \
|
||||
modules/module-console-kit-symdef.h
|
||||
|
|
@ -1376,10 +1378,6 @@ module_match_la_SOURCES = modules/module-match.c
|
|||
module_match_la_LDFLAGS = -module -avoid-version
|
||||
module_match_la_LIBADD = $(AM_LIBADD) libpulsecore.la
|
||||
|
||||
module_raop_sink_la_SOURCES = modules/module-raop-sink.c
|
||||
module_raop_sink_la_LDFLAGS = -module -avoid-version
|
||||
module_raop_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la librtp.la
|
||||
|
||||
module_tunnel_sink_la_SOURCES = modules/module-tunnel.c
|
||||
module_tunnel_sink_la_CFLAGS = -DTUNNEL_SINK=1 $(AM_CFLAGS)
|
||||
module_tunnel_sink_la_LDFLAGS = -module -avoid-version
|
||||
|
|
@ -1608,6 +1606,17 @@ module_bluetooth_device_la_LDFLAGS = -module -avoid-version
|
|||
module_bluetooth_device_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore.la libdbus-util.la libbluetooth-ipc.la libbluetooth-sbc.la libsocket-util.la
|
||||
module_bluetooth_device_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
|
||||
|
||||
# Apple Airtunes/RAOP
|
||||
module_raop_sink_la_SOURCES = modules/module-raop-sink.c
|
||||
module_raop_sink_la_LDFLAGS = -module -avoid-version
|
||||
module_raop_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la libiochannel.la librtp.la
|
||||
|
||||
module_raop_discover_la_SOURCES = modules/module-raop-discover.c
|
||||
module_raop_discover_la_LDFLAGS = -module -avoid-version
|
||||
module_raop_discover_la_LIBADD = $(AM_LIBADD) $(AVAHI_LIBS) libavahi-wrap.la libpulsecore.la
|
||||
module_raop_discover_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS)
|
||||
|
||||
|
||||
###################################
|
||||
# Some minor stuff #
|
||||
###################################
|
||||
|
|
|
|||
380
src/modules/module-raop-discover.c
Normal file
380
src/modules/module-raop-discover.c
Normal file
|
|
@ -0,0 +1,380 @@
|
|||
/* $Id$ */
|
||||
|
||||
/***
|
||||
This file is part of PulseAudio.
|
||||
|
||||
Copyright 2008 Colin Guthrie
|
||||
|
||||
PulseAudio is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU Lesser General Public License as
|
||||
published by the Free Software Foundation; either version 2 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
PulseAudio is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with PulseAudio; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
||||
USA.
|
||||
***/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <avahi-client/client.h>
|
||||
#include <avahi-client/lookup.h>
|
||||
#include <avahi-common/alternative.h>
|
||||
#include <avahi-common/error.h>
|
||||
#include <avahi-common/domain.h>
|
||||
#include <avahi-common/malloc.h>
|
||||
|
||||
#include <pulse/xmalloc.h>
|
||||
#include <pulse/util.h>
|
||||
|
||||
#include <pulsecore/sink.h>
|
||||
#include <pulsecore/source.h>
|
||||
#include <pulsecore/native-common.h>
|
||||
#include <pulsecore/core-util.h>
|
||||
#include <pulsecore/log.h>
|
||||
#include <pulsecore/core-subscribe.h>
|
||||
#include <pulsecore/hashmap.h>
|
||||
#include <pulsecore/modargs.h>
|
||||
#include <pulsecore/namereg.h>
|
||||
#include <pulsecore/avahi-wrap.h>
|
||||
|
||||
#include "module-raop-discover-symdef.h"
|
||||
|
||||
PA_MODULE_AUTHOR("Colin Guthrie");
|
||||
PA_MODULE_DESCRIPTION("mDNS/DNS-SD Service Discovery of Airtunes");
|
||||
PA_MODULE_VERSION(PACKAGE_VERSION);
|
||||
PA_MODULE_LOAD_ONCE(TRUE);
|
||||
|
||||
#define SERVICE_TYPE_SINK "_raop._tcp"
|
||||
|
||||
static const char* const valid_modargs[] = {
|
||||
NULL
|
||||
};
|
||||
|
||||
struct tunnel {
|
||||
AvahiIfIndex interface;
|
||||
AvahiProtocol protocol;
|
||||
char *name, *type, *domain;
|
||||
uint32_t module_index;
|
||||
};
|
||||
|
||||
struct userdata {
|
||||
pa_core *core;
|
||||
pa_module *module;
|
||||
AvahiPoll *avahi_poll;
|
||||
AvahiClient *client;
|
||||
AvahiServiceBrowser *sink_browser;
|
||||
|
||||
pa_hashmap *tunnels;
|
||||
};
|
||||
|
||||
static unsigned tunnel_hash(const void *p) {
|
||||
const struct tunnel *t = p;
|
||||
|
||||
return
|
||||
(unsigned) t->interface +
|
||||
(unsigned) t->protocol +
|
||||
pa_idxset_string_hash_func(t->name) +
|
||||
pa_idxset_string_hash_func(t->type) +
|
||||
pa_idxset_string_hash_func(t->domain);
|
||||
}
|
||||
|
||||
static int tunnel_compare(const void *a, const void *b) {
|
||||
const struct tunnel *ta = a, *tb = b;
|
||||
int r;
|
||||
|
||||
if (ta->interface != tb->interface)
|
||||
return 1;
|
||||
if (ta->protocol != tb->protocol)
|
||||
return 1;
|
||||
if ((r = strcmp(ta->name, tb->name)))
|
||||
return r;
|
||||
if ((r = strcmp(ta->type, tb->type)))
|
||||
return r;
|
||||
if ((r = strcmp(ta->domain, tb->domain)))
|
||||
return r;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct tunnel *tunnel_new(
|
||||
AvahiIfIndex interface, AvahiProtocol protocol,
|
||||
const char *name, const char *type, const char *domain) {
|
||||
|
||||
struct tunnel *t;
|
||||
t = pa_xnew(struct tunnel, 1);
|
||||
t->interface = interface;
|
||||
t->protocol = protocol;
|
||||
t->name = pa_xstrdup(name);
|
||||
t->type = pa_xstrdup(type);
|
||||
t->domain = pa_xstrdup(domain);
|
||||
t->module_index = PA_IDXSET_INVALID;
|
||||
return t;
|
||||
}
|
||||
|
||||
static void tunnel_free(struct tunnel *t) {
|
||||
pa_assert(t);
|
||||
pa_xfree(t->name);
|
||||
pa_xfree(t->type);
|
||||
pa_xfree(t->domain);
|
||||
pa_xfree(t);
|
||||
}
|
||||
|
||||
static void resolver_cb(
|
||||
AvahiServiceResolver *r,
|
||||
AvahiIfIndex interface, AvahiProtocol protocol,
|
||||
AvahiResolverEvent event,
|
||||
const char *name, const char *type, const char *domain,
|
||||
const char *host_name, const AvahiAddress *a, uint16_t port,
|
||||
AvahiStringList *txt,
|
||||
AvahiLookupResultFlags flags,
|
||||
void *userdata) {
|
||||
|
||||
struct userdata *u = userdata;
|
||||
struct tunnel *tnl;
|
||||
|
||||
pa_assert(u);
|
||||
|
||||
tnl = tunnel_new(interface, protocol, name, type, domain);
|
||||
|
||||
if (event != AVAHI_RESOLVER_FOUND)
|
||||
pa_log("Resolving of '%s' failed: %s", name, avahi_strerror(avahi_client_errno(u->client)));
|
||||
else {
|
||||
char *device = NULL, *dname, *args;
|
||||
char at[AVAHI_ADDRESS_STR_MAX];
|
||||
AvahiStringList *l;
|
||||
pa_module *m;
|
||||
|
||||
for (l = txt; l; l = l->next) {
|
||||
char *key, *value;
|
||||
pa_assert_se(avahi_string_list_get_pair(l, &key, &value, NULL) == 0);
|
||||
|
||||
pa_log_debug("Found key: '%s' with value: '%s'", key, value);
|
||||
if (strcmp(key, "device") == 0) {
|
||||
pa_xfree(device);
|
||||
device = value;
|
||||
value = NULL;
|
||||
}
|
||||
avahi_free(key);
|
||||
avahi_free(value);
|
||||
}
|
||||
|
||||
if (device)
|
||||
dname = pa_sprintf_malloc("airtunes.%s.%s", host_name, device);
|
||||
else
|
||||
dname = pa_sprintf_malloc("airtunes.%s", host_name);
|
||||
|
||||
if (!pa_namereg_is_valid_name(dname)) {
|
||||
pa_log("Cannot construct valid device name from credentials of service '%s'.", dname);
|
||||
avahi_free(device);
|
||||
pa_xfree(dname);
|
||||
goto finish;
|
||||
}
|
||||
|
||||
/*
|
||||
TODO: allow this syntax of server name in things....
|
||||
args = pa_sprintf_malloc("server=[%s]:%u "
|
||||
"sink_name=%s",
|
||||
avahi_address_snprint(at, sizeof(at), a), port,
|
||||
dname);*/
|
||||
args = pa_sprintf_malloc("server=%s "
|
||||
"sink_name=%s",
|
||||
avahi_address_snprint(at, sizeof(at), a),
|
||||
dname);
|
||||
|
||||
pa_log_debug("Loading module-raop-sink with arguments '%s'", args);
|
||||
|
||||
if ((m = pa_module_load(u->core, "module-raop-sink", args))) {
|
||||
tnl->module_index = m->index;
|
||||
pa_hashmap_put(u->tunnels, tnl, tnl);
|
||||
tnl = NULL;
|
||||
}
|
||||
|
||||
pa_xfree(dname);
|
||||
pa_xfree(args);
|
||||
avahi_free(device);
|
||||
}
|
||||
|
||||
finish:
|
||||
|
||||
avahi_service_resolver_free(r);
|
||||
|
||||
if (tnl)
|
||||
tunnel_free(tnl);
|
||||
}
|
||||
|
||||
static void browser_cb(
|
||||
AvahiServiceBrowser *b,
|
||||
AvahiIfIndex interface, AvahiProtocol protocol,
|
||||
AvahiBrowserEvent event,
|
||||
const char *name, const char *type, const char *domain,
|
||||
AvahiLookupResultFlags flags,
|
||||
void *userdata) {
|
||||
|
||||
struct userdata *u = userdata;
|
||||
struct tunnel *t;
|
||||
|
||||
pa_assert(u);
|
||||
|
||||
if (flags & AVAHI_LOOKUP_RESULT_LOCAL)
|
||||
return;
|
||||
|
||||
t = tunnel_new(interface, protocol, name, type, domain);
|
||||
|
||||
if (event == AVAHI_BROWSER_NEW) {
|
||||
|
||||
if (!pa_hashmap_get(u->tunnels, t))
|
||||
if (!(avahi_service_resolver_new(u->client, interface, protocol, name, type, domain, AVAHI_PROTO_UNSPEC, 0, resolver_cb, u)))
|
||||
pa_log("avahi_service_resolver_new() failed: %s", avahi_strerror(avahi_client_errno(u->client)));
|
||||
|
||||
/* We ignore the returned resolver object here, since the we don't
|
||||
* need to attach any special data to it, and we can still destory
|
||||
* it from the callback */
|
||||
|
||||
} else if (event == AVAHI_BROWSER_REMOVE) {
|
||||
struct tunnel *t2;
|
||||
|
||||
if ((t2 = pa_hashmap_get(u->tunnels, t))) {
|
||||
pa_module_unload_by_index(u->core, t2->module_index);
|
||||
pa_hashmap_remove(u->tunnels, t2);
|
||||
tunnel_free(t2);
|
||||
}
|
||||
}
|
||||
|
||||
tunnel_free(t);
|
||||
}
|
||||
|
||||
static void client_callback(AvahiClient *c, AvahiClientState state, void *userdata) {
|
||||
struct userdata *u = userdata;
|
||||
|
||||
pa_assert(c);
|
||||
pa_assert(u);
|
||||
|
||||
u->client = c;
|
||||
|
||||
switch (state) {
|
||||
case AVAHI_CLIENT_S_REGISTERING:
|
||||
case AVAHI_CLIENT_S_RUNNING:
|
||||
case AVAHI_CLIENT_S_COLLISION:
|
||||
|
||||
if (!u->sink_browser) {
|
||||
|
||||
if (!(u->sink_browser = avahi_service_browser_new(
|
||||
c,
|
||||
AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC,
|
||||
SERVICE_TYPE_SINK,
|
||||
NULL,
|
||||
0,
|
||||
browser_cb, u))) {
|
||||
|
||||
pa_log("avahi_service_browser_new() failed: %s", avahi_strerror(avahi_client_errno(c)));
|
||||
pa_module_unload_request(u->module);
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case AVAHI_CLIENT_FAILURE:
|
||||
if (avahi_client_errno(c) == AVAHI_ERR_DISCONNECTED) {
|
||||
int error;
|
||||
|
||||
pa_log_debug("Avahi daemon disconnected.");
|
||||
|
||||
if (!(u->client = avahi_client_new(u->avahi_poll, AVAHI_CLIENT_NO_FAIL, client_callback, u, &error))) {
|
||||
pa_log("avahi_client_new() failed: %s", avahi_strerror(error));
|
||||
pa_module_unload_request(u->module);
|
||||
}
|
||||
}
|
||||
|
||||
/* Fall through */
|
||||
|
||||
case AVAHI_CLIENT_CONNECTING:
|
||||
|
||||
if (u->sink_browser) {
|
||||
avahi_service_browser_free(u->sink_browser);
|
||||
u->sink_browser = NULL;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
default: ;
|
||||
}
|
||||
}
|
||||
|
||||
int pa__init(pa_module*m) {
|
||||
|
||||
struct userdata *u;
|
||||
pa_modargs *ma = NULL;
|
||||
int error;
|
||||
|
||||
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
|
||||
pa_log("Failed to parse module arguments.");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
m->userdata = u = pa_xnew(struct userdata, 1);
|
||||
u->core = m->core;
|
||||
u->module = m;
|
||||
u->sink_browser = NULL;
|
||||
|
||||
u->tunnels = pa_hashmap_new(tunnel_hash, tunnel_compare);
|
||||
|
||||
u->avahi_poll = pa_avahi_poll_new(m->core->mainloop);
|
||||
|
||||
if (!(u->client = avahi_client_new(u->avahi_poll, AVAHI_CLIENT_NO_FAIL, client_callback, u, &error))) {
|
||||
pa_log("pa_avahi_client_new() failed: %s", avahi_strerror(error));
|
||||
goto fail;
|
||||
}
|
||||
|
||||
pa_modargs_free(ma);
|
||||
|
||||
return 0;
|
||||
|
||||
fail:
|
||||
pa__done(m);
|
||||
|
||||
if (ma)
|
||||
pa_modargs_free(ma);
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
void pa__done(pa_module*m) {
|
||||
struct userdata*u;
|
||||
pa_assert(m);
|
||||
|
||||
if (!(u = m->userdata))
|
||||
return;
|
||||
|
||||
if (u->client)
|
||||
avahi_client_free(u->client);
|
||||
|
||||
if (u->avahi_poll)
|
||||
pa_avahi_poll_free(u->avahi_poll);
|
||||
|
||||
if (u->tunnels) {
|
||||
struct tunnel *t;
|
||||
|
||||
while ((t = pa_hashmap_steal_first(u->tunnels))) {
|
||||
pa_module_unload_by_index(u->core, t->module_index);
|
||||
tunnel_free(t);
|
||||
}
|
||||
|
||||
pa_hashmap_free(u->tunnels, NULL, NULL);
|
||||
}
|
||||
|
||||
pa_xfree(u);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue