5deb6c1927
Added to the WebUI the possibility to directly select a remote source SDP file for a Sink. New files: daemon/mdns_client.hpp,cpp -> mDNS client implementation using Avahi client library daemon/rtsp_client.hpp,cpp -> RTSP client implementation used to transfer SDP file daemon/utils.cpp -> used for common utility functions .clang-format -> added clang-format configuration file Modified files: daemon/CMakeList.txt -> added support for Avahi and option WITH_AVAHI=[yes/no] to compile the daemon with or without Avahi mDNS support daemon/config.hpp,cpp -> added configuration option mdns_enabled to enable or disable mDNS discovery at runtime daemon/json.cpp -> extended JSON config with mdns_enabled option daemon/browser.hpp,cpp -> added support for mDNS client to the browser daemon/session_manager.cpp -> added support for RTSP protocol to Source URL field and fixed issue with SDP file parsing webui/RemoteSources.js -> added visualization of mDNS remote sources webui/SinkEdit.js -> added the possibility to directly select a remote source SDP file for a Sink webui/SourceInfo.js -> added visualization of protocol source (SAP, mDNS or local) for a source ubuntu-packages.sh -> added libavahi-client-dev to the list of required packages build.sh -> added WITH_AVAHI=yes option when invoking CMake README.md -> added notes about mDNS support via Avahi daemon/README.md -> added notes about mDNS support via Avahi, support for RTSP protocol in source and new mdns_enabled config param Additional minor changes to remaining files.
100 lines
3.5 KiB
C++
100 lines
3.5 KiB
C++
//
|
|
// mdns_client.hpp
|
|
//
|
|
// Copyright (c) 2019 2020 Andrea Bondavalli. All rights reserved.
|
|
//
|
|
// 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
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// any later version.
|
|
//
|
|
// This program 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 General Public License
|
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
//
|
|
|
|
#ifndef _AVAHI_CLIENT_HPP_
|
|
#define _AVAHI_CLIENT_HPP_
|
|
|
|
#ifdef _USE_AVAHI_
|
|
#include <avahi-client/client.h>
|
|
#include <avahi-client/lookup.h>
|
|
#include <avahi-common/error.h>
|
|
#include <avahi-common/malloc.h>
|
|
#include <avahi-common/thread-watch.h>
|
|
#endif
|
|
|
|
#include <future>
|
|
#include <list>
|
|
#include <shared_mutex>
|
|
#include <thread>
|
|
|
|
#include "config.hpp"
|
|
#include "rtsp_client.hpp"
|
|
|
|
class MDNSClient {
|
|
public:
|
|
MDNSClient(){};
|
|
MDNSClient(const MDNSClient&) = delete;
|
|
MDNSClient& operator=(const MDNSClient&) = delete;
|
|
virtual ~MDNSClient() { terminate(); };
|
|
|
|
virtual bool init();
|
|
virtual bool terminate();
|
|
|
|
protected:
|
|
virtual void on_new_rtsp_source(const std::string& name,
|
|
const std::string& domain,
|
|
const RTSPSSource& source) = 0;
|
|
virtual void on_remove_rtsp_source(const std::string& name,
|
|
const std::string& domain) = 0;
|
|
|
|
void process_results();
|
|
std::list<std::future<void> > sources_res_;
|
|
std::mutex sources_res_mutex_;
|
|
|
|
std::atomic_bool running_{false};
|
|
|
|
#ifdef _USE_AVAHI_
|
|
/* order is important here */
|
|
std::unique_ptr<AvahiThreadedPoll, decltype(&avahi_threaded_poll_free)> poll_{
|
|
nullptr, &avahi_threaded_poll_free};
|
|
std::unique_ptr< ::AvahiClient, decltype(&avahi_client_free)> client_{
|
|
nullptr, &avahi_client_free};
|
|
std::unique_ptr<AvahiServiceBrowser, decltype(&avahi_service_browser_free)>
|
|
sb_{nullptr, &avahi_service_browser_free};
|
|
|
|
static void resolve_callback(AvahiServiceResolver* r,
|
|
AvahiIfIndex interface,
|
|
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,
|
|
void* userdata);
|
|
static void browse_callback(AvahiServiceBrowser* b,
|
|
AvahiIfIndex interface,
|
|
AvahiProtocol protocol,
|
|
AvahiBrowserEvent event,
|
|
const char* name,
|
|
const char* type,
|
|
const char* domain,
|
|
AvahiLookupResultFlags flags,
|
|
void* userdata);
|
|
static void client_callback(AvahiClient* c,
|
|
AvahiClientState state,
|
|
void* userdata);
|
|
#endif
|
|
};
|
|
|
|
#endif
|