- mDNS advertisement for all local Sources is implemented by mdns_server.[cpp,hpp] and based on Linux Avahi. - RTSP server implementation supports DESCRIBE method to return SDP of local Sources and supports persistent connection but doesn't provide service updates via UPDATE method. - Modified RTSP client to browse for _ravenna_session subtype of _rtsp._tcp services only. - Modified SAP and mDNS discovery to avoid returning local Sources advertised by the daemon. - Added "rtsp_port" and "node_id" config parameters. - rtsp_port is a read/write parameter that contains the port of the RTSP server. - node_id is a read only parameter that contains the unique daemon identifier used in mDNS and SAP sources announcements. - Modified session manager to check that every Source and Sink created by the user has a unique name. - Modified WebUI to visualize node_id and to visualize and edit rtsp_port parameters in Config tab. - Extended regression test to verify proper behaviour of mDNS/RTSP sources advertisement and discovery. - Modified REST API to browse remote sources to allow browsing of SAP, mDNS and all sources via HTTP GET /api/browse/sources/[all|mdns|sap]. - Amended daemon documentation.
82 lines
2.4 KiB
C++
82 lines
2.4 KiB
C++
//
|
|
// mdns_server.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 _MDNS_SERVER_HPP_
|
|
#define _MDNS_SERVER_HPP_
|
|
|
|
#ifdef _USE_AVAHI_
|
|
#include <avahi-client/client.h>
|
|
#include <avahi-client/publish.h>
|
|
#include <avahi-common/error.h>
|
|
#include <avahi-common/malloc.h>
|
|
#include <avahi-common/thread-watch.h>
|
|
#endif
|
|
|
|
#include <atomic>
|
|
#include <boost/bimap.hpp>
|
|
#include <mutex>
|
|
#include <thread>
|
|
|
|
#include "config.hpp"
|
|
#include "utils.hpp"
|
|
|
|
class MDNSServer {
|
|
public:
|
|
MDNSServer(std::shared_ptr<Config> config) : config_(config){};
|
|
MDNSServer() = delete;
|
|
MDNSServer(const MDNSServer&) = delete;
|
|
MDNSServer& operator=(const MDNSServer&) = delete;
|
|
virtual ~MDNSServer() { terminate(); };
|
|
|
|
virtual bool init();
|
|
virtual bool terminate();
|
|
|
|
bool add_service(const std::string& name, const std::string& sdp);
|
|
bool remove_service(const std::string& name);
|
|
|
|
protected:
|
|
std::atomic_bool running_{false};
|
|
std::shared_ptr<Config> config_;
|
|
std::string node_id_{get_node_id()};
|
|
|
|
#ifdef _USE_AVAHI_
|
|
using entry_group_bimap_t =
|
|
boost::bimap<std::string /* name */, AvahiEntryGroup*>;
|
|
|
|
entry_group_bimap_t groups_;
|
|
|
|
/* 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};
|
|
|
|
static void entry_group_callback(AvahiEntryGroup* g,
|
|
AvahiEntryGroupState state,
|
|
void* userdata);
|
|
static void client_callback(AvahiClient* c,
|
|
AvahiClientState state,
|
|
void* userdata);
|
|
|
|
bool create_services(AvahiClient* client);
|
|
#endif
|
|
};
|
|
|
|
#endif
|