mirror of
https://github.com/badaix/snapcast.git
synced 2025-07-22 19:07:38 +02:00
add clang-format file
reformat code
This commit is contained in:
badaix
parent
b733f646ea
commit
b20add3815
105 changed files with 7773 additions and 7723 deletions
|
|
@ -1,6 +1,6 @@
|
|||
/***
|
||||
This file is part of snapcast
|
||||
Copyright (C) 2014-2018 Johannes Pohl
|
||||
Copyright (C) 2014-2019 Johannes Pohl
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -19,141 +19,143 @@
|
|||
#include <cstdlib>
|
||||
#include <thread>
|
||||
|
||||
#include "publishBonjour.h"
|
||||
#include "aixlog.hpp"
|
||||
#include "publishBonjour.h"
|
||||
|
||||
typedef union { unsigned char b[2]; unsigned short NotAnInteger; } Opaque16;
|
||||
typedef union {
|
||||
unsigned char b[2];
|
||||
unsigned short NotAnInteger;
|
||||
} Opaque16;
|
||||
|
||||
|
||||
PublishBonjour::PublishBonjour(const std::string& serviceName) : PublishmDNS(serviceName), active_(false)
|
||||
{
|
||||
/// dns-sd -R Snapcast _snapcast._tcp local 1704
|
||||
/// dns-sd -R Snapcast _snapcast-jsonrpc._tcp local 1705
|
||||
/// dns-sd -R Snapcast _snapcast._tcp local 1704
|
||||
/// dns-sd -R Snapcast _snapcast-jsonrpc._tcp local 1705
|
||||
}
|
||||
|
||||
|
||||
PublishBonjour::~PublishBonjour()
|
||||
{
|
||||
active_ = false;
|
||||
pollThread_.join();
|
||||
for (auto client: clients)
|
||||
{
|
||||
if (client)
|
||||
DNSServiceRefDeallocate(client);
|
||||
}
|
||||
active_ = false;
|
||||
pollThread_.join();
|
||||
for (auto client : clients)
|
||||
{
|
||||
if (client)
|
||||
DNSServiceRefDeallocate(client);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
void PublishBonjour::worker()
|
||||
{
|
||||
// int dns_sd_fd = client ? DNSServiceRefSockFD(client) : -1;
|
||||
// 1. Set up the fd_set as usual here.
|
||||
// This example client has no file descriptors of its own,
|
||||
// but a real application would call FD_SET to add them to the set here
|
||||
fd_set readfds;
|
||||
FD_ZERO(&readfds);
|
||||
// int dns_sd_fd = client ? DNSServiceRefSockFD(client) : -1;
|
||||
// 1. Set up the fd_set as usual here.
|
||||
// This example client has no file descriptors of its own,
|
||||
// but a real application would call FD_SET to add them to the set here
|
||||
fd_set readfds;
|
||||
FD_ZERO(&readfds);
|
||||
|
||||
std::vector<int> dns_sd_fds;
|
||||
int nfds = -1;
|
||||
for (size_t n=0; n<clients.size(); ++n)
|
||||
{
|
||||
int dns_sd_fd = DNSServiceRefSockFD(clients[n]);
|
||||
dns_sd_fds.push_back(dns_sd_fd);
|
||||
if (nfds < dns_sd_fd)
|
||||
nfds = dns_sd_fd;
|
||||
// 2. Add the fd for our client(s) to the fd_set
|
||||
FD_SET(dns_sd_fd, &readfds);
|
||||
}
|
||||
++nfds;
|
||||
std::vector<int> dns_sd_fds;
|
||||
int nfds = -1;
|
||||
for (size_t n = 0; n < clients.size(); ++n)
|
||||
{
|
||||
int dns_sd_fd = DNSServiceRefSockFD(clients[n]);
|
||||
dns_sd_fds.push_back(dns_sd_fd);
|
||||
if (nfds < dns_sd_fd)
|
||||
nfds = dns_sd_fd;
|
||||
// 2. Add the fd for our client(s) to the fd_set
|
||||
FD_SET(dns_sd_fd, &readfds);
|
||||
}
|
||||
++nfds;
|
||||
|
||||
// 3. Set up the timeout.
|
||||
struct timeval tv;
|
||||
tv.tv_sec = 0;
|
||||
tv.tv_usec = 100*1000;
|
||||
// 3. Set up the timeout.
|
||||
struct timeval tv;
|
||||
tv.tv_sec = 0;
|
||||
tv.tv_usec = 100 * 1000;
|
||||
|
||||
active_ = true;
|
||||
while (active_)
|
||||
{
|
||||
FD_ZERO(&readfds);
|
||||
for (size_t n=0; n<dns_sd_fds.size(); ++n)
|
||||
FD_SET(dns_sd_fds[n], &readfds);
|
||||
active_ = true;
|
||||
while (active_)
|
||||
{
|
||||
FD_ZERO(&readfds);
|
||||
for (size_t n = 0; n < dns_sd_fds.size(); ++n)
|
||||
FD_SET(dns_sd_fds[n], &readfds);
|
||||
|
||||
int result = select(nfds, &readfds, (fd_set*)NULL, (fd_set*)NULL, &tv);
|
||||
if (result > 0)
|
||||
{
|
||||
int result = select(nfds, &readfds, (fd_set*)NULL, (fd_set*)NULL, &tv);
|
||||
if (result > 0)
|
||||
{
|
||||
|
||||
for (size_t n=0; n<dns_sd_fds.size(); ++n)
|
||||
{
|
||||
if (clients[n] && FD_ISSET(dns_sd_fds[n], &readfds))
|
||||
{
|
||||
DNSServiceErrorType err = DNSServiceProcessResult(clients[n]);
|
||||
if (err)
|
||||
{
|
||||
LOG(ERROR) << "DNSServiceProcessResult returned " << err << "\n";
|
||||
active_ = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// else if (result == 0)
|
||||
// myTimerCallBack();
|
||||
else if (result < 0)
|
||||
{
|
||||
LOG(ERROR) << "select() returned " << result << " errno " << errno << " " << strerror(errno) << "\n";
|
||||
if (errno != EINTR)
|
||||
active_ = false;
|
||||
}
|
||||
}
|
||||
for (size_t n = 0; n < dns_sd_fds.size(); ++n)
|
||||
{
|
||||
if (clients[n] && FD_ISSET(dns_sd_fds[n], &readfds))
|
||||
{
|
||||
DNSServiceErrorType err = DNSServiceProcessResult(clients[n]);
|
||||
if (err)
|
||||
{
|
||||
LOG(ERROR) << "DNSServiceProcessResult returned " << err << "\n";
|
||||
active_ = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// else if (result == 0)
|
||||
// myTimerCallBack();
|
||||
else if (result < 0)
|
||||
{
|
||||
LOG(ERROR) << "select() returned " << result << " errno " << errno << " " << strerror(errno) << "\n";
|
||||
if (errno != EINTR)
|
||||
active_ = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void DNSSD_API reg_reply(DNSServiceRef sdref, const DNSServiceFlags flags, DNSServiceErrorType errorCode, const char *name, const char *regtype, const char *domain, void *context)
|
||||
static void DNSSD_API reg_reply(DNSServiceRef sdref, const DNSServiceFlags flags, DNSServiceErrorType errorCode, const char* name, const char* regtype,
|
||||
const char* domain, void* context)
|
||||
{
|
||||
(void)sdref; // Unused
|
||||
(void)flags; // Unused
|
||||
(void)sdref; // Unused
|
||||
(void)flags; // Unused
|
||||
|
||||
PublishBonjour* publishBonjour = (PublishBonjour*)context;
|
||||
(void)publishBonjour; // unused
|
||||
PublishBonjour* publishBonjour = (PublishBonjour*)context;
|
||||
(void)publishBonjour; // unused
|
||||
|
||||
LOG(INFO) << "Got a reply for service " << name << "." << regtype << domain << "\n";
|
||||
LOG(INFO) << "Got a reply for service " << name << "." << regtype << domain << "\n";
|
||||
|
||||
if (errorCode == kDNSServiceErr_NoError)
|
||||
{
|
||||
if (flags & kDNSServiceFlagsAdd)
|
||||
LOG(INFO) << "Name now registered and active\n";
|
||||
else
|
||||
LOG(INFO) << "Name registration removed\n";
|
||||
}
|
||||
else if (errorCode == kDNSServiceErr_NameConflict)
|
||||
{
|
||||
/// TODO: Error handling
|
||||
LOG(INFO) << "Name in use, please choose another\n";
|
||||
exit(-1);
|
||||
}
|
||||
else
|
||||
LOG(INFO) << "Error " << errorCode << "\n";
|
||||
if (errorCode == kDNSServiceErr_NoError)
|
||||
{
|
||||
if (flags & kDNSServiceFlagsAdd)
|
||||
LOG(INFO) << "Name now registered and active\n";
|
||||
else
|
||||
LOG(INFO) << "Name registration removed\n";
|
||||
}
|
||||
else if (errorCode == kDNSServiceErr_NameConflict)
|
||||
{
|
||||
/// TODO: Error handling
|
||||
LOG(INFO) << "Name in use, please choose another\n";
|
||||
exit(-1);
|
||||
}
|
||||
else
|
||||
LOG(INFO) << "Error " << errorCode << "\n";
|
||||
|
||||
if (!(flags & kDNSServiceFlagsMoreComing))
|
||||
fflush(stdout);
|
||||
if (!(flags & kDNSServiceFlagsMoreComing))
|
||||
fflush(stdout);
|
||||
}
|
||||
|
||||
|
||||
void PublishBonjour::publish(const std::vector<mDNSService>& services)
|
||||
{
|
||||
for (auto service: services)
|
||||
{
|
||||
DNSServiceFlags flags = 0;
|
||||
Opaque16 registerPort = { { static_cast<unsigned char>(service.port_ >> 8), static_cast<unsigned char>(service.port_ & 0xFF) } };
|
||||
DNSServiceRef client = NULL;
|
||||
// DNSServiceRegister(&client, flags, kDNSServiceInterfaceIndexAny, serviceName_.c_str(), service.name_.c_str(), NULL, NULL, registerPort.NotAnInteger, service.txt_.size(), service.txt_.empty()?NULL:service.txt_.c_str(), reg_reply, this);
|
||||
DNSServiceRegister(&client, flags, kDNSServiceInterfaceIndexAny, serviceName_.c_str(), service.name_.c_str(), NULL, NULL, registerPort.NotAnInteger, 0, NULL, reg_reply, this);
|
||||
clients.push_back(client);
|
||||
}
|
||||
for (auto service : services)
|
||||
{
|
||||
DNSServiceFlags flags = 0;
|
||||
Opaque16 registerPort = {{static_cast<unsigned char>(service.port_ >> 8), static_cast<unsigned char>(service.port_ & 0xFF)}};
|
||||
DNSServiceRef client = NULL;
|
||||
// DNSServiceRegister(&client, flags, kDNSServiceInterfaceIndexAny, serviceName_.c_str(), service.name_.c_str(), NULL, NULL,
|
||||
//registerPort.NotAnInteger, service.txt_.size(), service.txt_.empty()?NULL:service.txt_.c_str(), reg_reply, this);
|
||||
DNSServiceRegister(&client, flags, kDNSServiceInterfaceIndexAny, serviceName_.c_str(), service.name_.c_str(), NULL, NULL, registerPort.NotAnInteger, 0,
|
||||
NULL, reg_reply, this);
|
||||
clients.push_back(client);
|
||||
}
|
||||
|
||||
pollThread_ = std::thread(&PublishBonjour::worker, this);
|
||||
pollThread_ = std::thread(&PublishBonjour::worker, this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue