mirror of
https://github.com/badaix/snapcast.git
synced 2025-05-12 08:36:43 +02:00
added Avahi Zeroconf
This commit is contained in:
parent
af7f230e97
commit
e8ffa1f243
10 changed files with 302 additions and 133 deletions
|
@ -1,9 +1,9 @@
|
||||||
VERSION = 0.1
|
VERSION = 0.1
|
||||||
CC = /usr/bin/g++
|
CC = /usr/bin/g++
|
||||||
CFLAGS = -std=gnu++0x -static-libgcc -static-libstdc++ -Wall -Wno-unused-function -O3 -D_REENTRANT -DVERSION=\"$(VERSION)\" -I..
|
CFLAGS = -std=gnu++0x -static-libgcc -static-libstdc++ -Wall -Wno-unused-function -O3 -D_REENTRANT -DVERSION=\"$(VERSION)\" -I..
|
||||||
LDFLAGS = -lrt -lpthread -lboost_system -lboost_program_options -lasound -logg -lvorbis -lvorbisenc -lFLAC
|
LDFLAGS = -lrt -lpthread -lboost_system -lboost_program_options -lasound -logg -lvorbis -lvorbisenc -lFLAC -lavahi-client -lavahi-common
|
||||||
|
|
||||||
OBJ = snapClient.o stream.o alsaPlayer.o clientConnection.o timeProvider.o oggDecoder.o pcmDecoder.o flacDecoder.o controller.o ../message/pcmChunk.o ../common/log.o ../message/sampleFormat.o
|
OBJ = snapClient.o stream.o alsaPlayer.o clientConnection.o timeProvider.o oggDecoder.o pcmDecoder.o flacDecoder.o controller.o browseAvahi.o ../message/pcmChunk.o ../common/log.o ../message/sampleFormat.o
|
||||||
BIN = snapclient
|
BIN = snapclient
|
||||||
|
|
||||||
all: client
|
all: client
|
||||||
|
|
|
@ -17,25 +17,33 @@
|
||||||
USA.
|
USA.
|
||||||
***/
|
***/
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#include "browseAvahi.h"
|
||||||
#include <config.h>
|
#include <unistd.h>
|
||||||
#endif
|
#include <iostream>
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <assert.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <time.h>
|
|
||||||
|
|
||||||
#include <avahi-client/client.h>
|
|
||||||
#include <avahi-client/lookup.h>
|
|
||||||
|
|
||||||
#include <avahi-common/simple-watch.h>
|
|
||||||
#include <avahi-common/malloc.h>
|
|
||||||
#include <avahi-common/error.h>
|
|
||||||
|
|
||||||
static AvahiSimplePoll *simple_poll = NULL;
|
static AvahiSimplePoll *simple_poll = NULL;
|
||||||
|
|
||||||
static void resolve_callback(
|
|
||||||
|
BrowseAvahi::BrowseAvahi() : client_(NULL), sb_(NULL)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
BrowseAvahi::~BrowseAvahi()
|
||||||
|
{
|
||||||
|
if (sb_)
|
||||||
|
avahi_service_browser_free(sb_);
|
||||||
|
|
||||||
|
if (client_)
|
||||||
|
avahi_client_free(client_);
|
||||||
|
|
||||||
|
if (simple_poll)
|
||||||
|
avahi_simple_poll_free(simple_poll);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void BrowseAvahi::resolve_callback(
|
||||||
AvahiServiceResolver *r,
|
AvahiServiceResolver *r,
|
||||||
AVAHI_GCC_UNUSED AvahiIfIndex interface,
|
AVAHI_GCC_UNUSED AvahiIfIndex interface,
|
||||||
AVAHI_GCC_UNUSED AvahiProtocol protocol,
|
AVAHI_GCC_UNUSED AvahiProtocol protocol,
|
||||||
|
@ -50,6 +58,7 @@ static void resolve_callback(
|
||||||
AvahiLookupResultFlags flags,
|
AvahiLookupResultFlags flags,
|
||||||
AVAHI_GCC_UNUSED void* userdata) {
|
AVAHI_GCC_UNUSED void* userdata) {
|
||||||
|
|
||||||
|
BrowseAvahi* browseAvahi = static_cast<BrowseAvahi*>(userdata);
|
||||||
assert(r);
|
assert(r);
|
||||||
|
|
||||||
/* Called whenever a service has been resolved successfully or timed out */
|
/* Called whenever a service has been resolved successfully or timed out */
|
||||||
|
@ -65,6 +74,12 @@ static void resolve_callback(
|
||||||
fprintf(stderr, "Service '%s' of type '%s' in domain '%s':\n", name, type, domain);
|
fprintf(stderr, "Service '%s' of type '%s' in domain '%s':\n", name, type, domain);
|
||||||
|
|
||||||
avahi_address_snprint(a, sizeof(a), address);
|
avahi_address_snprint(a, sizeof(a), address);
|
||||||
|
browseAvahi->result_.host_ = host_name;
|
||||||
|
browseAvahi->result_.ip_ = a;
|
||||||
|
browseAvahi->result_.port_ = port;
|
||||||
|
browseAvahi->result_.proto_ = protocol;
|
||||||
|
browseAvahi->result_.valid_ = true;
|
||||||
|
|
||||||
t = avahi_string_list_to_string(txt);
|
t = avahi_string_list_to_string(txt);
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"\t%s:%u (%s)\n"
|
"\t%s:%u (%s)\n"
|
||||||
|
@ -93,7 +108,8 @@ static void resolve_callback(
|
||||||
avahi_service_resolver_free(r);
|
avahi_service_resolver_free(r);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void browse_callback(
|
|
||||||
|
void BrowseAvahi::browse_callback(
|
||||||
AvahiServiceBrowser *b,
|
AvahiServiceBrowser *b,
|
||||||
AvahiIfIndex interface,
|
AvahiIfIndex interface,
|
||||||
AvahiProtocol protocol,
|
AvahiProtocol protocol,
|
||||||
|
@ -104,7 +120,8 @@ static void browse_callback(
|
||||||
AVAHI_GCC_UNUSED AvahiLookupResultFlags flags,
|
AVAHI_GCC_UNUSED AvahiLookupResultFlags flags,
|
||||||
void* userdata) {
|
void* userdata) {
|
||||||
|
|
||||||
AvahiClient *c = (AvahiClient*)userdata;
|
// AvahiClient* client = (AvahiClient*)userdata;
|
||||||
|
BrowseAvahi* browseAvahi = static_cast<BrowseAvahi*>(userdata);
|
||||||
assert(b);
|
assert(b);
|
||||||
|
|
||||||
/* Called whenever a new services becomes available on the LAN or is removed from the LAN */
|
/* Called whenever a new services becomes available on the LAN or is removed from the LAN */
|
||||||
|
@ -124,8 +141,8 @@ static void browse_callback(
|
||||||
the callback function is called the server will free
|
the callback function is called the server will free
|
||||||
the resolver for us. */
|
the resolver for us. */
|
||||||
|
|
||||||
if (!(avahi_service_resolver_new(c, interface, protocol, name, type, domain, AVAHI_PROTO_UNSPEC, (AvahiLookupFlags)0, resolve_callback, c)))
|
if (!(avahi_service_resolver_new(browseAvahi->client_, interface, protocol, name, type, domain, AVAHI_PROTO_UNSPEC, (AvahiLookupFlags)0, resolve_callback, userdata)))
|
||||||
fprintf(stderr, "Failed to resolve service '%s': %s\n", name, avahi_strerror(avahi_client_errno(c)));
|
fprintf(stderr, "Failed to resolve service '%s': %s\n", name, avahi_strerror(avahi_client_errno(browseAvahi->client_)));
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -140,10 +157,12 @@ static void browse_callback(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UNUSED void * userdata) {
|
|
||||||
|
void BrowseAvahi::client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UNUSED void * userdata) {
|
||||||
assert(c);
|
assert(c);
|
||||||
|
|
||||||
/* Called whenever the client or server state changes */
|
/* Called whenever the client or server state changes */
|
||||||
|
// BrowseAvahi* browseAvahi = static_cast<BrowseAvahi*>(userdata);
|
||||||
|
|
||||||
if (state == AVAHI_CLIENT_FAILURE) {
|
if (state == AVAHI_CLIENT_FAILURE) {
|
||||||
fprintf(stderr, "Server connection failure: %s\n", avahi_strerror(avahi_client_errno(c)));
|
fprintf(stderr, "Server connection failure: %s\n", avahi_strerror(avahi_client_errno(c)));
|
||||||
|
@ -151,11 +170,10 @@ static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UN
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char*argv[]) {
|
|
||||||
AvahiClient *client = NULL;
|
bool BrowseAvahi::browse(const std::string& serviceName, int proto, AvahiResult& result, int timeout)
|
||||||
AvahiServiceBrowser *sb = NULL;
|
{
|
||||||
int error;
|
int error;
|
||||||
int ret = 1;
|
|
||||||
|
|
||||||
/* Allocate main loop object */
|
/* Allocate main loop object */
|
||||||
if (!(simple_poll = avahi_simple_poll_new())) {
|
if (!(simple_poll = avahi_simple_poll_new())) {
|
||||||
|
@ -164,38 +182,51 @@ int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char*argv[]) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocate a new client */
|
/* Allocate a new client */
|
||||||
client = avahi_client_new(avahi_simple_poll_get(simple_poll), (AvahiClientFlags)0, client_callback, NULL, &error);
|
client_ = avahi_client_new(avahi_simple_poll_get(simple_poll), (AvahiClientFlags)0, client_callback, this, &error);
|
||||||
|
|
||||||
/* Check wether creating the client object succeeded */
|
/* Check wether creating the client object succeeded */
|
||||||
if (!client) {
|
if (!client_) {
|
||||||
fprintf(stderr, "Failed to create client: %s\n", avahi_strerror(error));
|
fprintf(stderr, "Failed to create client: %s\n", avahi_strerror(error));
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Create the service browser */
|
/* Create the service browser */
|
||||||
if (!(sb = avahi_service_browser_new(client, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_snapcast._tcp", NULL, (AvahiLookupFlags)0, browse_callback, client))) {
|
if (!(sb_ = avahi_service_browser_new(client_, AVAHI_IF_UNSPEC, proto, serviceName.c_str(), NULL, (AvahiLookupFlags)0, browse_callback, this))) {
|
||||||
fprintf(stderr, "Failed to create service browser: %s\n", avahi_strerror(avahi_client_errno(client)));
|
fprintf(stderr, "Failed to create service browser: %s\n", avahi_strerror(avahi_client_errno(client_)));
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Run the main loop */
|
result_.valid_ = false;
|
||||||
avahi_simple_poll_loop(simple_poll);
|
while (timeout > 0)
|
||||||
|
{
|
||||||
ret = 0;
|
avahi_simple_poll_iterate(simple_poll, 100);
|
||||||
|
timeout -= 100;
|
||||||
|
if (result_.valid_)
|
||||||
|
{
|
||||||
|
result = result_;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fail:
|
fail:
|
||||||
|
return false;
|
||||||
/* Cleanup things */
|
|
||||||
if (sb)
|
|
||||||
avahi_service_browser_free(sb);
|
|
||||||
|
|
||||||
if (client)
|
|
||||||
avahi_client_free(client);
|
|
||||||
|
|
||||||
if (simple_poll)
|
|
||||||
avahi_simple_poll_free(simple_poll);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char*argv[])
|
||||||
|
{
|
||||||
|
std::string ip;
|
||||||
|
size_t port;
|
||||||
|
BrowseAvahi browseAvahi;
|
||||||
|
if (browseAvahi.browse("_snapcast._tcp", AVAHI_PROTO_INET, ip, port, 5000))
|
||||||
|
std::cout << ip << ":" << port << "\n";
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
63
client/browseAvahi.h
Normal file
63
client/browseAvahi.h
Normal file
|
@ -0,0 +1,63 @@
|
||||||
|
/***
|
||||||
|
This file is part of avahi.
|
||||||
|
|
||||||
|
avahi 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.1 of the
|
||||||
|
License, or (at your option) any later version.
|
||||||
|
|
||||||
|
avahi 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 Lesser General
|
||||||
|
Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public
|
||||||
|
License along with avahi; if not, write to the Free Software
|
||||||
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
||||||
|
USA.
|
||||||
|
***/
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <assert.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <time.h>
|
||||||
|
|
||||||
|
#include <avahi-client/client.h>
|
||||||
|
#include <avahi-client/lookup.h>
|
||||||
|
|
||||||
|
#include <avahi-common/simple-watch.h>
|
||||||
|
#include <avahi-common/malloc.h>
|
||||||
|
#include <avahi-common/error.h>
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
#include <thread>
|
||||||
|
#include <atomic>
|
||||||
|
|
||||||
|
|
||||||
|
struct AvahiResult
|
||||||
|
{
|
||||||
|
int proto_;
|
||||||
|
std::string ip_;
|
||||||
|
std::string host_;
|
||||||
|
size_t port_;
|
||||||
|
bool valid_;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
class BrowseAvahi
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
BrowseAvahi();
|
||||||
|
~BrowseAvahi();
|
||||||
|
bool browse(const std::string& serviceName, int proto, AvahiResult& result, int timeout);
|
||||||
|
|
||||||
|
private:
|
||||||
|
static void resolve_callback(AvahiServiceResolver *r, AVAHI_GCC_UNUSED AvahiIfIndex interface, AVAHI_GCC_UNUSED AvahiProtocol protocol, AvahiResolverEvent event, const char *name, const char *type, const char *domain, const char *host_name, const AvahiAddress *address, uint16_t port, AvahiStringList *txt, AvahiLookupResultFlags flags, AVAHI_GCC_UNUSED void* userdata);
|
||||||
|
static void browse_callback(AvahiServiceBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, const char *name, const char *type, const char *domain, AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, void* userdata);
|
||||||
|
static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UNUSED void * userdata);
|
||||||
|
AvahiClient* client_;
|
||||||
|
AvahiResult result_;
|
||||||
|
AvahiServiceBrowser* sb_;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
#include "common/signalHandler.h"
|
#include "common/signalHandler.h"
|
||||||
#include "controller.h"
|
#include "controller.h"
|
||||||
#include "alsaPlayer.h"
|
#include "alsaPlayer.h"
|
||||||
|
#include "browseAvahi.h"
|
||||||
|
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
@ -61,7 +62,7 @@ int main (int argc, char *argv[])
|
||||||
("help,h", "produce help message")
|
("help,h", "produce help message")
|
||||||
("version,v", "show version number")
|
("version,v", "show version number")
|
||||||
("list,l", po::bool_switch(&listPcmDevices)->default_value(false), "list pcm devices")
|
("list,l", po::bool_switch(&listPcmDevices)->default_value(false), "list pcm devices")
|
||||||
("ip,i", po::value<string>(&ip)->default_value("localhost"), "server IP")
|
("ip,i", po::value<string>(&ip), "server IP")
|
||||||
("port,p", po::value<size_t>(&port)->default_value(98765), "server port")
|
("port,p", po::value<size_t>(&port)->default_value(98765), "server port")
|
||||||
("soundcard,s", po::value<string>(&soundcard)->default_value("default"), "index or name of the soundcard")
|
("soundcard,s", po::value<string>(&soundcard)->default_value("default"), "index or name of the soundcard")
|
||||||
("daemon,d", po::bool_switch(&runAsDaemon)->default_value(false), "daemonize")
|
("daemon,d", po::bool_switch(&runAsDaemon)->default_value(false), "daemonize")
|
||||||
|
@ -119,14 +120,30 @@ int main (int argc, char *argv[])
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!vm.count("ip"))
|
||||||
|
{
|
||||||
|
BrowseAvahi browseAvahi;
|
||||||
|
AvahiResult avahiResult;
|
||||||
|
while (!g_terminated)
|
||||||
|
{
|
||||||
|
if (browseAvahi.browse("_snapcast._tcp", AVAHI_PROTO_INET, avahiResult, 5000))
|
||||||
|
{
|
||||||
|
ip = avahiResult.ip_;
|
||||||
|
port = avahiResult.port_;
|
||||||
|
std::cout << ip << ":" << port << "\n";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Controller controller;
|
Controller controller;
|
||||||
|
if (!g_terminated)
|
||||||
|
{
|
||||||
controller.start(pcmDevice, ip, port, latency);
|
controller.start(pcmDevice, ip, port, latency);
|
||||||
|
|
||||||
while(!g_terminated)
|
while(!g_terminated)
|
||||||
usleep(100*1000);
|
usleep(100*1000);
|
||||||
|
|
||||||
controller.stop();
|
controller.stop();
|
||||||
|
}
|
||||||
daemonShutdown();
|
daemonShutdown();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
21
common/avahiService.h
Normal file
21
common/avahiService.h
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
#ifndef AVAHI_SERVICE_H
|
||||||
|
#define AVAHI_SERVICE_H
|
||||||
|
|
||||||
|
#include <avahi-common/address.h>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
struct AvahiService
|
||||||
|
{
|
||||||
|
AvahiService(const std::string& name, size_t port, int proto = AVAHI_PROTO_UNSPEC) : name_(name), port_(port), proto_(proto)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string name_;
|
||||||
|
size_t port_;
|
||||||
|
int proto_;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -21,9 +21,8 @@
|
||||||
PATH=/sbin:/usr/sbin:/bin:/usr/bin:/
|
PATH=/sbin:/usr/sbin:/bin:/usr/bin:/
|
||||||
DESC="Snapclient"
|
DESC="Snapclient"
|
||||||
NAME=snapclient
|
NAME=snapclient
|
||||||
SERVERIP=_SERVER_HOST_
|
|
||||||
DAEMON=/usr/sbin/$NAME
|
DAEMON=/usr/sbin/$NAME
|
||||||
DAEMON_ARGS="-d -i $SERVERIP"
|
DAEMON_ARGS="-d"
|
||||||
PIDFILE=/var/run/$NAME.pid
|
PIDFILE=/var/run/$NAME.pid
|
||||||
SCRIPTNAME=/etc/init.d/$NAME
|
SCRIPTNAME=/etc/init.d/$NAME
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
VERSION = 0.1
|
VERSION = 0.1
|
||||||
CC = /usr/bin/g++
|
CC = /usr/bin/g++
|
||||||
CFLAGS = -std=gnu++0x -Wall -Wno-unused-function -O3 -D_REENTRANT -DVERSION=\"$(VERSION)\" -I..
|
CFLAGS = -std=gnu++0x -Wall -Wno-unused-function -O3 -D_REENTRANT -DVERSION=\"$(VERSION)\" -I..
|
||||||
LDFLAGS = -lrt -lpthread -lboost_system -lboost_program_options -lvorbis -lvorbisenc -logg -lFLAC
|
LDFLAGS = -lrt -lpthread -lboost_system -lboost_program_options -lvorbis -lvorbisenc -logg -lFLAC -lavahi-client -lavahi-common
|
||||||
|
|
||||||
OBJ = snapServer.o controlServer.o flacEncoder.o pcmEncoder.o oggEncoder.o serverSession.o ../common/log.o ../message/pcmChunk.o ../message/sampleFormat.o
|
OBJ = snapServer.o controlServer.o flacEncoder.o pcmEncoder.o oggEncoder.o serverSession.o publishAvahi.o ../common/log.o ../message/pcmChunk.o ../message/sampleFormat.o
|
||||||
BIN = snapserver
|
BIN = snapserver
|
||||||
|
|
||||||
all: server
|
all: server
|
||||||
|
|
|
@ -17,12 +17,10 @@
|
||||||
USA.
|
USA.
|
||||||
***/
|
***/
|
||||||
|
|
||||||
#include "publishAvahi.h"
|
|
||||||
|
|
||||||
#include <time.h>
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
#include <avahi-client/client.h>
|
#include <avahi-client/client.h>
|
||||||
#include <avahi-client/publish.h>
|
#include <avahi-client/publish.h>
|
||||||
|
@ -33,16 +31,66 @@
|
||||||
#include <avahi-common/error.h>
|
#include <avahi-common/error.h>
|
||||||
#include <avahi-common/timeval.h>
|
#include <avahi-common/timeval.h>
|
||||||
|
|
||||||
#include <boost/bind.hpp>
|
#include "publishAvahi.h"
|
||||||
|
|
||||||
|
|
||||||
PublishAvahi::PublishAvahi() : group(NULL), simple_poll(NULL), name(NULL)
|
static AvahiEntryGroup *group;
|
||||||
|
static AvahiSimplePoll *simple_poll;
|
||||||
|
static char* name;
|
||||||
|
|
||||||
|
PublishAvahi::PublishAvahi(const std::string& serviceName) : client(NULL), serviceName_(serviceName)
|
||||||
{
|
{
|
||||||
|
group = NULL;
|
||||||
|
simple_poll = NULL;
|
||||||
|
name = avahi_strdup(serviceName_.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void PublishAvahi::publish(const std::vector<AvahiService>& services)
|
||||||
|
{
|
||||||
|
this->services = services;
|
||||||
|
|
||||||
|
AvahiClient *client = NULL;
|
||||||
|
int error;
|
||||||
|
|
||||||
|
/* Allocate main loop object */
|
||||||
|
if (!(simple_poll = avahi_simple_poll_new()))
|
||||||
|
{
|
||||||
|
fprintf(stderr, "Failed to create simple poll object.\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Allocate a new client */
|
||||||
|
client = avahi_client_new(avahi_simple_poll_get(simple_poll), AVAHI_CLIENT_IGNORE_USER_CONFIG, client_callback, this, &error);
|
||||||
|
|
||||||
|
/* Check wether creating the client object succeeded */
|
||||||
|
if (!client)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "Failed to create client: %s\n", avahi_strerror(error));
|
||||||
|
}
|
||||||
|
|
||||||
|
active_ = true;
|
||||||
|
pollThread_ = std::thread(&PublishAvahi::worker, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void PublishAvahi::worker()
|
||||||
|
{
|
||||||
|
while (active_ && (avahi_simple_poll_iterate(simple_poll, 100) == 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
PublishAvahi::~PublishAvahi()
|
PublishAvahi::~PublishAvahi()
|
||||||
{
|
{
|
||||||
|
active_ = false;
|
||||||
|
pollThread_.join();
|
||||||
|
|
||||||
|
if (client)
|
||||||
|
avahi_client_free(client);
|
||||||
|
|
||||||
|
if (simple_poll)
|
||||||
|
avahi_simple_poll_free(simple_poll);
|
||||||
|
|
||||||
|
avahi_free(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -70,7 +118,7 @@ void PublishAvahi::entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState
|
||||||
fprintf(stderr, "Service name collision, renaming service to '%s'\n", name);
|
fprintf(stderr, "Service name collision, renaming service to '%s'\n", name);
|
||||||
|
|
||||||
/* And recreate the services */
|
/* And recreate the services */
|
||||||
create_services(avahi_entry_group_get_client(g));
|
static_cast<PublishAvahi*>(userdata)->create_services(avahi_entry_group_get_client(g));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -98,7 +146,7 @@ void PublishAvahi::create_services(AvahiClient *c) {
|
||||||
|
|
||||||
if (!group)
|
if (!group)
|
||||||
{
|
{
|
||||||
if (!(group = avahi_entry_group_new(c, (void(*)(AvahiEntryGroup*, AvahiEntryGroupState, void*))std::bind(&PublishAvahi::entry_group_callback, this), NULL))) {
|
if (!(group = avahi_entry_group_new(c, entry_group_callback, NULL))) {
|
||||||
fprintf(stderr, "avahi_entry_group_new() failed: %s\n", avahi_strerror(avahi_client_errno(c)));
|
fprintf(stderr, "avahi_entry_group_new() failed: %s\n", avahi_strerror(avahi_client_errno(c)));
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
@ -128,7 +176,10 @@ void PublishAvahi::create_services(AvahiClient *c) {
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
/* Add the same service for BSD LPR */
|
/* Add the same service for BSD LPR */
|
||||||
if ((ret = avahi_entry_group_add_service(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, AvahiPublishFlags(0), name, "_snapcast._tcp", NULL, NULL, 515, NULL)) < 0) {
|
for (size_t n=0; n<services.size(); ++n)
|
||||||
|
{
|
||||||
|
if ((ret = avahi_entry_group_add_service(group, AVAHI_IF_UNSPEC, services[n].proto_, AvahiPublishFlags(0), name, services[n].name_.c_str(), NULL, NULL, services[n].port_, NULL)) < 0)
|
||||||
|
{
|
||||||
|
|
||||||
if (ret == AVAHI_ERR_COLLISION)
|
if (ret == AVAHI_ERR_COLLISION)
|
||||||
goto collision;
|
goto collision;
|
||||||
|
@ -136,6 +187,7 @@ void PublishAvahi::create_services(AvahiClient *c) {
|
||||||
fprintf(stderr, "Failed to add _snapcast._tcp service: %s\n", avahi_strerror(ret));
|
fprintf(stderr, "Failed to add _snapcast._tcp service: %s\n", avahi_strerror(ret));
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* Add an additional (hypothetic) subtype */
|
/* Add an additional (hypothetic) subtype */
|
||||||
/* if ((ret = avahi_entry_group_add_service_subtype(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, AvahiPublishFlags(0), name, "_printer._tcp", NULL, "_magic._sub._printer._tcp") < 0)) {
|
/* if ((ret = avahi_entry_group_add_service_subtype(group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, AvahiPublishFlags(0), name, "_printer._tcp", NULL, "_magic._sub._printer._tcp") < 0)) {
|
||||||
|
@ -171,6 +223,7 @@ fail:
|
||||||
avahi_simple_poll_quit(simple_poll);
|
avahi_simple_poll_quit(simple_poll);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void PublishAvahi::client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UNUSED void * userdata) {
|
void PublishAvahi::client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UNUSED void * userdata) {
|
||||||
assert(c);
|
assert(c);
|
||||||
|
|
||||||
|
@ -181,7 +234,7 @@ void PublishAvahi::client_callback(AvahiClient *c, AvahiClientState state, AVAHI
|
||||||
|
|
||||||
/* The server has startup successfully and registered its host
|
/* The server has startup successfully and registered its host
|
||||||
* name on the network, so it's time to create our services */
|
* name on the network, so it's time to create our services */
|
||||||
create_services(c);
|
static_cast<PublishAvahi*>(userdata)->create_services(c);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case AVAHI_CLIENT_FAILURE:
|
case AVAHI_CLIENT_FAILURE:
|
||||||
|
@ -214,58 +267,17 @@ void PublishAvahi::client_callback(AvahiClient *c, AvahiClientState state, AVAHI
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char*argv[]) {
|
int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char*argv[])
|
||||||
PublishAvahi publishAvahi;
|
{
|
||||||
|
PublishAvahi publishAvahi("SnapCast");
|
||||||
AvahiClient *client = NULL;
|
std::vector<AvahiService> services;
|
||||||
int error;
|
services.push_back(AvahiService("_snapcast._tcp", 123));
|
||||||
int ret = 1;
|
publishAvahi.publish(services);
|
||||||
struct timeval tv;
|
while (true)
|
||||||
|
usleep(100000);
|
||||||
/* Allocate main loop object */
|
return 0;
|
||||||
if (!(simple_poll = avahi_simple_poll_new())) {
|
|
||||||
fprintf(stderr, "Failed to create simple poll object.\n");
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
|
|
||||||
name = avahi_strdup("MegaPrinter");
|
|
||||||
|
|
||||||
/* Allocate a new client */
|
|
||||||
client = avahi_client_new(avahi_simple_poll_get(simple_poll), AVAHI_CLIENT_IGNORE_USER_CONFIG, client_callback, NULL, &error);
|
|
||||||
|
|
||||||
/* Check wether creating the client object succeeded */
|
|
||||||
if (!client) {
|
|
||||||
fprintf(stderr, "Failed to create client: %s\n", avahi_strerror(error));
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* After 10s do some weird modification to the service */
|
|
||||||
/* avahi_simple_poll_get(simple_poll)->timeout_new(
|
|
||||||
avahi_simple_poll_get(simple_poll),
|
|
||||||
avahi_elapse_time(&tv, 1000*10, 0),
|
|
||||||
modify_callback,
|
|
||||||
client);
|
|
||||||
*/
|
|
||||||
/* Run the main loop */
|
|
||||||
while (avahi_simple_poll_iterate(simple_poll, 100) == 0)
|
|
||||||
printf("1");
|
|
||||||
|
|
||||||
ret = 0;
|
|
||||||
|
|
||||||
fail:
|
|
||||||
|
|
||||||
/* Cleanup things */
|
|
||||||
|
|
||||||
if (client)
|
|
||||||
avahi_client_free(client);
|
|
||||||
|
|
||||||
if (simple_poll)
|
|
||||||
avahi_simple_poll_free(simple_poll);
|
|
||||||
|
|
||||||
avahi_free(name);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -10,21 +10,40 @@
|
||||||
#include <avahi-common/error.h>
|
#include <avahi-common/error.h>
|
||||||
#include <avahi-common/timeval.h>
|
#include <avahi-common/timeval.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
|
#include <thread>
|
||||||
|
#include <atomic>
|
||||||
|
|
||||||
|
|
||||||
|
struct AvahiService
|
||||||
|
{
|
||||||
|
AvahiService(const std::string& name, size_t port, int proto = AVAHI_PROTO_UNSPEC) : name_(name), port_(port), proto_(proto)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string name_;
|
||||||
|
size_t port_;
|
||||||
|
int proto_;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
class PublishAvahi
|
class PublishAvahi
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
PublishAvahi();
|
PublishAvahi(const std::string& serviceName);
|
||||||
~PublishAvahi();
|
~PublishAvahi();
|
||||||
|
void publish(const std::vector<AvahiService>& services);
|
||||||
|
std::vector<AvahiService> services;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state, AVAHI_GCC_UNUSED void *userdata);
|
static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state, AVAHI_GCC_UNUSED void *userdata);
|
||||||
|
static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UNUSED void * userdata);
|
||||||
void create_services(AvahiClient *c);
|
void create_services(AvahiClient *c);
|
||||||
void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UNUSED void * userdata);
|
AvahiClient* client;
|
||||||
|
std::string serviceName_;
|
||||||
AvahiEntryGroup *group;
|
std::thread pollThread_;
|
||||||
AvahiSimplePoll *simple_poll;
|
void worker();
|
||||||
char* name;
|
std::atomic<bool> active_;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
#include "oggEncoder.h"
|
#include "oggEncoder.h"
|
||||||
#include "flacEncoder.h"
|
#include "flacEncoder.h"
|
||||||
#include "controlServer.h"
|
#include "controlServer.h"
|
||||||
|
#include "publishAvahi.h"
|
||||||
|
|
||||||
|
|
||||||
bool g_terminated = false;
|
bool g_terminated = false;
|
||||||
|
@ -113,6 +114,12 @@ int main(int argc, char* argv[])
|
||||||
signal(SIGTERM, signal_handler);
|
signal(SIGTERM, signal_handler);
|
||||||
signal(SIGINT, signal_handler);
|
signal(SIGINT, signal_handler);
|
||||||
|
|
||||||
|
PublishAvahi publishAvahi("SnapCast");
|
||||||
|
std::vector<AvahiService> services;
|
||||||
|
services.push_back(AvahiService("_snapcast._tcp", port));
|
||||||
|
publishAvahi.publish(services);
|
||||||
|
|
||||||
|
|
||||||
while (!g_terminated)
|
while (!g_terminated)
|
||||||
{
|
{
|
||||||
int fd = open(fifoName.c_str(), O_RDONLY | O_NONBLOCK);
|
int fd = open(fifoName.c_str(), O_RDONLY | O_NONBLOCK);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue