namedirectory: replace restbed by restinio

Depends-On: If43bab09e0d209aef1e92217d145a22f0cdab466 Change-Id: Ic8f55919f82c2e2ab088d4bc38814c99e1006062

namedirectory: replace restbed by restinio
2100815f · Adrien Béraud · Andreas Traczyk · 605a7e59 · 2100815f · 2100815f
Commit 2100815f authored 5 years ago by Adrien Béraud Committed by Andreas Traczyk 5 years ago
--- a/README
+++ b/README
@@ -47,7 +47,7 @@ Short description of content of source tree
 - src/ is the core of DRing.
 - bin/ contains applications main code.
 - bin/dbus, the D-Bus XML interfaces, and C++ bindings
- bin/restcpp, the C++ REST API implemented with Restbed
+- bin/restcpp, the C++ REST API implemented with Restinio
 About Savoir-faire Linux
 ------------------------
@@ -147,7 +147,6 @@ mkdir native
 cd native
 ../bootstrap
 make
-make .restbed
 2) Then compile the daemon
 cd ../../

--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -37,19 +37,3 @@ endif
 if RING_NODEJS
 SUBDIRS+=nodejs
 endif
-if RING_RESTCPP
-SUBDIRS+=restcpp
-sbin_PROGRAMS = restdring
-restdring_SOURCES = main.cpp
-restdring_CXXFLAGS= -g \
-                -I$(top_srcdir)/src \
-                -I$(top_srcdir)/src/dring \
-                -DREST_API \
-                -DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\"
-restdring_LDADD = restcpp/libclient_rest.la $(top_builddir)/src/libring.la
-endif
--- a/bin/restcpp/Makefile.am
+++ b/bin/restcpp/Makefile.am
-include $(top_srcdir)/globals.mk
-noinst_LTLIBRARIES = libclient_rest.la
-libclient_rest_la_SOURCES = \
-    restclient.cpp \
-    restclient.h \
-    restconfigurationmanager.cpp \
-    restconfigurationmanager.h \
-    restvideomanager.cpp \
-    restvideomanager.h
-libclient_rest_la_CXXFLAGS = \
-    -std=c++14 \
-    -g \
-    -Wall \
-    -Wextra \
-    -Wno-reorder \
-    -Wno-unused-variable \
-    -Wno-unused-parameter \
-    -pedantic \
-    -I$(top_srcdir)/src
-libclient_rest_la_LDFLAGS = \
-    -lpthread \
-    -lrestbed
--- a/bin/restcpp/restclient.cpp
+++ b/bin/restcpp/restclient.cpp
-/*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
- *
- *  Author: Simon Zeni <simon.zeni@savoirfairelinux.com>
- *
- *  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
- *  (at your option) 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, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- */
-#include "restclient.h"
-RestClient::RestClient(int port, int flags, bool persistent) :
-    service_()
-{
-    configurationManager_.reset(new RestConfigurationManager());
-    videoManager_.reset(new RestVideoManager());
-    if (initLib(flags) < 0)
-        throw std::runtime_error {"cannot initialize libring"};
-    // Fill the resources
-    initResources();
-    // Initiate the rest service
-    settings_ = std::make_shared<restbed::Settings>();
-    settings_->set_port(port);
-    settings_->set_default_header( "Connection", "close" );
-    JAMI_INFO("Restclient running on port [%d]", port);
-    // Make it run in a thread, because this is a blocking function
-    restbed = std::thread([this](){
-        service_.start(settings_);
-    });
-}
-RestClient::~RestClient()
-{
-    JAMI_INFO("destroying RestClient");
-    exit();
-}
-int
-RestClient::event_loop() noexcept
-{
-    // While the client is running, the events are polled every 10 milliseconds
-    JAMI_INFO("Restclient starting to poll events");
-    while(!pollNoMore_)
-    {
-        std::this_thread::sleep_for(std::chrono::milliseconds(50));
-    }
-    return 0;
-}
-int
-RestClient::exit() noexcept
-{
-    try {
-        // On exit, the client stop polling events
-        pollNoMore_ = true;
-        // The rest service is stopped
-        service_.stop();
-        // And the thread running the service is joined
-        restbed.join();
-        endLib();
-    } catch (const std::exception& err) {
-        std::cerr << "quitting: " << err.what() << std::endl;
-        return 1;
-    }
-    return 0;
-}
-int
-RestClient::initLib(int flags)
-{
-    using namespace std::placeholders;
-    using std::bind;
-    using DRing::exportable_callback;
-    using DRing::CallSignal;
-    using DRing::ConfigurationSignal;
-    using DRing::PresenceSignal;
-    using DRing::AudioSignal;
-    using SharedCallback = std::shared_ptr<DRing::CallbackWrapperBase>;
-    auto confM = configurationManager_.get();
-#ifdef ENABLE_VIDEO
-    using DRing::VideoSignal;
-#endif
-    // Configuration event handlers
-    auto registeredNameFoundCb = exportable_callback<ConfigurationSignal::RegisteredNameFound>([&]
-        (const std::string& account_id, int state, const std::string& address, const std::string& name){
-            auto remainingSessions = configurationManager_->getPendingNameResolutions(name);
-            for(auto session: remainingSessions){
-                const auto request = session->get_request();
-                std::string body = address;
-                const std::multimap<std::string, std::string> headers
-                {
-                    {"Content-Type", "text/html"},
-                    {"Content-Length", std::to_string(body.length())}
-                };
-                if(address.size() > 0)
-                    session->close(restbed::OK, body, headers);
-                else
-                    session->close(404);
-            }
-        });
-    // This is a short example of a callback using a lambda. In this case, this displays the incoming messages
-    const std::map<std::string, SharedCallback> configEvHandlers = {
-        exportable_callback<ConfigurationSignal::IncomingAccountMessage>([]
-            (const std::string& accountID, const std::string& from, const std::map<std::string, std::string>& payloads){
-                JAMI_INFO("accountID : %s", accountID.c_str());
-                JAMI_INFO("from : %s", from.c_str());
-                JAMI_INFO("payloads");
-                for(auto& it : payloads)
-                    JAMI_INFO("%s : %s", it.first.c_str(), it.second.c_str());
-            }),
-            registeredNameFoundCb,
-    };
-    if (!DRing::init(static_cast<DRing::InitFlag>(flags)))
-        return -1;
-    registerSignalHandlers(configEvHandlers);
-    // Dummy callbacks are registered for the other managers
-    registerSignalHandlers(std::map<std::string, std::shared_ptr<DRing::CallbackWrapperBase>>());
-    registerSignalHandlers(std::map<std::string, std::shared_ptr<DRing::CallbackWrapperBase>>());
-#ifdef ENABLE_VIDEO
-    registerSignalHandlers(std::map<std::string, std::shared_ptr<DRing::CallbackWrapperBase>>());
-#endif
-    if (!DRing::start())
-        return -1;
-    return 0;
-}
-void
-RestClient::endLib() noexcept
-{
-    DRing::fini();
-}
-void
-RestClient::initResources()
-{
-    // This is the function that initiates the resources.
-    // Each resources is defined by a route and a void function with a shared pointer to the session as argument
-    // In this case, here's an example of the default route. It will list all the managers available
-    auto default_res = std::make_shared<restbed::Resource>();
-    default_res->set_path("/");
-    default_res->set_method_handler("GET", [](const std::shared_ptr<restbed::Session> session){
-        JAMI_INFO("[%s] GET /", session->get_origin().c_str());
-        std::string body = "Available routes are : \r\n/configurationManager\r\n/videoManager\r\n";
-        const std::multimap<std::string, std::string> headers
-        {
-            {"Content-Type", "text/html"},
-            {"Content-Length", std::to_string(body.length())}
-        };
-    });
-    // And finally, we give the resource to the service to handle it
-    service_.publish(default_res);
-    // For the sake of convenience, each manager sends a vector of their resources
-    for(auto& it : configurationManager_->getResources())
-        service_.publish(it);
-    for(auto& it : videoManager_->getResources())
-        service_.publish(it);
-}
--- a/bin/restcpp/restclient.h
+++ b/bin/restcpp/restclient.h
-/*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
- *
- *  Author: Simon Zeni <simon.zeni@savoirfairelinux.com>
- *
- *  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
- *  (at your option) 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, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- */
-#pragma once
-#include <memory>
-#include <chrono>
-#include <map>
-#include <vector>
-#include <string>
-#include <iostream>
-#include <thread>
-#include <functional>
-#include <iterator>
-#include <restbed>
-#include "dring/dring.h"
-#include "dring/callmanager_interface.h"
-#include "dring/configurationmanager_interface.h"
-#include "dring/presencemanager_interface.h"
-#ifdef ENABLE_VIDEO
-#include "dring/videomanager_interface.h"
-#endif
-#include "logger.h"
-#include "restconfigurationmanager.h"
-#include "restvideomanager.h"
-class RestClient {
-    public:
-        RestClient(int port, int flags, bool persistent);
-        ~RestClient();
-        int event_loop() noexcept;
-        int exit() noexcept;
-    private:
-        int initLib(int flags);
-        void endLib() noexcept;
-        void initResources();
-        bool pollNoMore_ = false;
-        std::unique_ptr<RestConfigurationManager> configurationManager_;
-        std::unique_ptr<RestVideoManager> videoManager_;
-        // Restbed attributes
-        restbed::Service service_;
-        std::shared_ptr<restbed::Settings> settings_;
-        std::thread restbed;
-};
--- a/bin/restcpp/restconfigurationmanager.cpp
+++ b/bin/restcpp/restconfigurationmanager.cpp
--- a/bin/restcpp/restconfigurationmanager.h
+++ b/bin/restcpp/restconfigurationmanager.h
-/*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
- *
- *  Author: Simon Zeni <simon.zeni@savoirfairelinux.com>
- *
- *  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
- *  (at your option) 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, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- */
-#pragma once
-#include <vector>
-#include <map>
-#include <string>
-#include <regex>
-#include <restbed>
-#include <mutex>
-#if __GNUC__ >= 5 || (__GNUC__ >=4 && __GNUC_MINOR__ >= 6)
-/* This warning option only exists for gcc 4.6.0 and greater. */
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#endif
-#include "dring/dring.h"
-#include "dring/callmanager_interface.h"
-#include "dring/configurationmanager_interface.h"
-#include "dring/presencemanager_interface.h"
-#ifdef ENABLE_VIDEO
-#include "dring/videomanager_interface.h"
-#endif
-#include "logger.h"
-#include "im/message_engine.h"
-#pragma GCC diagnostic warning "-Wignored-qualifiers"
-#if __GNUC__ >= 5 || (__GNUC__ >=4 && __GNUC_MINOR__ >= 6)
-/* This warning option only exists for gcc 4.6.0 and greater. */
-#pragma GCC diagnostic warning "-Wunused-but-set-variable"
-#endif
-class RestConfigurationManager
-{
-    public:
-        RestConfigurationManager();
-        std::vector<std::shared_ptr<restbed::Resource>> getResources();
-        std::set<std::shared_ptr<restbed::Session>> getPendingNameResolutions(const std::string& name);
-    private:
-        // Attributes
-        std::vector<std::shared_ptr<restbed::Resource>> resources_;
-        std::multimap<std::string, std::shared_ptr<restbed::Session>> pendingNameResolutions;
-        std::mutex pendingNameResolutionMtx;
-        // Methods
-        std::map<std::string, std::string> parsePost(const std::string& post);
-        void populateResources();
-        void addPendingNameResolutions(const std::string& name, const std::shared_ptr<restbed::Session> session);
-        void defaultRoute(const std::shared_ptr<restbed::Session> session);
-        void getAccountDetails(const std::shared_ptr<restbed::Session> session);
-        void getVolatileAccountDetails(const std::shared_ptr<restbed::Session> session);
-        void setAccountDetails(const std::shared_ptr<restbed::Session> session);
-        void registerName(const std::shared_ptr<restbed::Session> session);
-        void lookupName(const std::shared_ptr<restbed::Session> session);
-        void setAccountActive(const std::shared_ptr<restbed::Session> session);
-        void getAccountTemplate(const std::shared_ptr<restbed::Session> session);
-        void addAccount(const std::shared_ptr<restbed::Session> session);
-        void removeAccount(const std::shared_ptr<restbed::Session> session);
-        void getAccountList(const std::shared_ptr<restbed::Session> session);
-        void sendRegister(const std::shared_ptr<restbed::Session> session);
-        void registerAllAccounts(const std::shared_ptr<restbed::Session> session);
-        void sendTextMessage(const std::shared_ptr<restbed::Session> session);
-        void getMessageStatus(const std::shared_ptr<restbed::Session> session);
-        void getTlsDefaultSettings(const std::shared_ptr<restbed::Session> session);
-        void getCodecList(const std::shared_ptr<restbed::Session> session);
-        void getSupportedTlsMethod(const std::shared_ptr<restbed::Session> session);
-        void getSupportedCiphers(const std::shared_ptr<restbed::Session> session);
-        void getCodecDetails(const std::shared_ptr<restbed::Session> session);
-        void setCodecDetails(const std::shared_ptr<restbed::Session> session);
-        void getActiveCodecList(const std::shared_ptr<restbed::Session> session);
-        void setActiveCodecList(const std::string& accountID, const std::vector<unsigned>& list); // /!\ not implemented
-        void getAudioPluginList(const std::shared_ptr<restbed::Session> session);
-        void setAudioPlugin(const std::shared_ptr<restbed::Session> session);
-        void getAudioOutputDeviceList(const std::shared_ptr<restbed::Session> session);
-        void setAudioOutputDevice(const std::shared_ptr<restbed::Session> session);
-        void setAudioInputDevice(const std::shared_ptr<restbed::Session> session);
-        void setAudioRingtoneDevice(const std::shared_ptr<restbed::Session> session);
-        void getAudioInputDeviceList(const std::shared_ptr<restbed::Session> session);
-        void getCurrentAudioDevicesIndex(const std::shared_ptr<restbed::Session> session);
-        void getAudioInputDeviceIndex(const std::shared_ptr<restbed::Session> session);
-        void getAudioOutputDeviceIndex(const std::shared_ptr<restbed::Session> session);
-        void getCurrentAudioOutputPlugin(const std::shared_ptr<restbed::Session> session);
-        void getNoiseSuppressState(const std::shared_ptr<restbed::Session> session);
-        void setNoiseSuppressState(const std::shared_ptr<restbed::Session> session);
-        void isAgcEnabled(const std::shared_ptr<restbed::Session> session);
-        void setAgcState(const std::shared_ptr<restbed::Session> session);
-        void muteDtmf(const std::shared_ptr<restbed::Session> session);
-        void isDtmfMuted(const std::shared_ptr<restbed::Session> session);
-        void isCaptureMuted(const std::shared_ptr<restbed::Session> session);
-        void muteCapture(const std::shared_ptr<restbed::Session> session);
-        void isPlaybackMuted(const std::shared_ptr<restbed::Session> session);
-        void mutePlayback(const std::shared_ptr<restbed::Session> session);
-        void isRingtoneMuted(const std::shared_ptr<restbed::Session> session);
-        void muteRingtone(const std::shared_ptr<restbed::Session> session);
-        void getAudioManager(const std::shared_ptr<restbed::Session> session);
-        void setAudioManager(const std::shared_ptr<restbed::Session> session);
-        void getSupportedAudioManagers(const std::shared_ptr<restbed::Session> session);
-        void getRecordPath(const std::shared_ptr<restbed::Session> session);
-        void setRecordPath(const std::shared_ptr<restbed::Session> session);
-        void getIsAlwaysRecording(const std::shared_ptr<restbed::Session> session);
-        void setIsAlwaysRecording(const std::shared_ptr<restbed::Session> session);
-        void setHistoryLimit(const std::shared_ptr<restbed::Session> session);
-        void getHistoryLimit(const std::shared_ptr<restbed::Session> session);
-        void setAccountsOrder(const std::shared_ptr<restbed::Session> session);
-        void getHookSettings(const std::shared_ptr<restbed::Session> session);
-        void setHookSettings(const std::shared_ptr<restbed::Session> session);
-        void getCredentials(const std::shared_ptr<restbed::Session> session);
-        void setCredentials(const std::shared_ptr<restbed::Session> session);
-        void getAddrFromInterfaceName(const std::shared_ptr<restbed::Session> session);
-        void getAllIpInterface(const std::shared_ptr<restbed::Session> session);
-        void getAllIpInterfaceByName(const std::shared_ptr<restbed::Session> session);
-        void getShortcuts(const std::shared_ptr<restbed::Session> session);
-        void setShortcuts(const std::shared_ptr<restbed::Session> session);
-        void setVolume(const std::string& device, const double& value);
-        void getVolume(const std::string& device);
-        void validateCertificate(const std::string& accountId, const std::string& certificate);
-        void validateCertificatePath(const std::string& accountId, const std::string& certificatePath, const std::string& privateKey, const std::string& privateKeyPass, const std::string& caList);
-        void getCertificateDetails(const std::string& certificate);
-        void getCertificateDetailsPath(const std::string& certificatePath, const std::string& privateKey, const std::string& privateKeyPass);
-        void getPinnedCertificates();
-        void pinCertificate(const std::vector<uint8_t>& certificate, const bool& local);
-        void unpinCertificate(const std::string& certId);
-        void pinCertificatePath(const std::string& path);
-        void unpinCertificatePath(const std::string& path);
-        void pinRemoteCertificate(const std::string& accountId, const std::string& certId);
-        void setCertificateStatus(const std::string& account, const std::string& certId, const std::string& status);
-        void getCertificatesByStatus(const std::string& account, const std::string& status);
-        void getTrustRequests(const std::shared_ptr<restbed::Session> session);
-        void acceptTrustRequest(const std::string& accountId, const std::string& from);
-        void discardTrustRequest(const std::string& accountId, const std::string& from);
-        void sendTrustRequest(const std::string& accountId, const std::string& to, const std::vector<uint8_t>& payload);
-        void exportAccounts(const std::vector<std::string>& accountIDs, const std::string& filepath, const std::string& password);
-        void importAccounts(const std::string& archivePath, const std::string& password);
-};
--- a/bin/restcpp/restvideomanager.cpp
+++ b/bin/restcpp/restvideomanager.cpp
-/*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
- *
- *  Author: Simon Zeni <simon.zeni@savoirfairelinux.com>
- *
- *  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
- *  (at your option) 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, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- */
-#include "restvideomanager.h"
-#include "client/videomanager.h"
-RestVideoManager::RestVideoManager() :
-    resources_()
-{
-    populateResources();
-}
-std::vector<std::shared_ptr<restbed::Resource>>
-RestVideoManager::getResources()
-{
-    return resources_;
-}
-// Private
-std::map<std::string, std::string>
-RestVideoManager::parsePost(const std::string& post)
-{
-    std::map<std::string, std::string> data;
-    auto split = [](const std::string& s, char delim){
-        std::vector<std::string> v;
-        auto i = 0;
-        auto pos = s.find(delim);
-        while (pos != std::string::npos)
-        {
-            v.push_back(s.substr(i, pos-i));
-            i = ++pos;
-            pos = s.find(delim, pos);
-            if (pos == std::string::npos)
-                v.push_back(s.substr(i, s.length()));
-        }
-        return v;
-    };
-    if(post.find_first_of('&') != std::string::npos)
-    {
-        std::vector<std::string> v = split(post, '&');
-        for(auto& it : v)
-        {
-            std::vector<std::string> tmp = split(it, '=');
-            data[tmp.front()] = tmp.back();
-        }
-    }
-    else
-    {
-        std::vector<std::string> tmp = split(post, '=');
-        data[tmp.front()] = tmp.back();
-    }
-    return data;
-}
-void
-RestVideoManager::populateResources()
-{
-    resources_.push_back(std::make_shared<restbed::Resource>());
-    resources_.back()->set_path("/videoManager");
-    resources_.back()->set_method_handler("GET",
-        std::bind(&RestVideoManager::defaultRoute, this, std::placeholders::_1));
-    resources_.push_back(std::make_shared<restbed::Resource>());
-    resources_.back()->set_path("/deviceList");
-    resources_.back()->set_method_handler("GET",
-        std::bind(&RestVideoManager::getDeviceList, this, std::placeholders::_1));
-}
-void
-RestVideoManager::defaultRoute(const std::shared_ptr<restbed::Session> session)
-{
-    JAMI_INFO("[%s] GET /videoManager", session->get_origin().c_str());
-    std::string body = "Available routes are : \r\n";
-    const std::multimap<std::string, std::string> headers
-    {
-        {"Content-Type", "text/html"},
-        {"Content-Length", std::to_string(body.length())}
-    };
-    session->close(restbed::OK, body, headers);
-}
-void RestVideoManager::getDeviceList(const std::shared_ptr<restbed::Session> session)
-{
-    JAMI_INFO("[%s] GET /deviceList", session->get_origin().c_str());
-    std::vector<std::string> list = DRing::getDeviceList();
-    std::string body = "";
-    for(auto& it : list)
-        body += it + "\r\n";
-    const std::multimap<std::string, std::string> headers
-    {
-        {"Content-Type", "text/html"},
-        {"Content-Length", std::to_string(body.length())}
-    };
-    session->close(restbed::OK, body, headers);
-}
-void RestVideoManager::getCapabilities(const std::shared_ptr<restbed::Session> session)
-{
-}
-void RestVideoManager::getSettings(const std::shared_ptr<restbed::Session> session)
-{
-}
-void RestVideoManager::applySettings(const std::shared_ptr<restbed::Session> session)
-{
-}
-void RestVideoManager::setDefaultDevice(const std::shared_ptr<restbed::Session> session)
-{
-}
-void RestVideoManager::getDefaultDevice(const std::shared_ptr<restbed::Session> session)
-{
-}
-void RestVideoManager::startCamera(const std::shared_ptr<restbed::Session> session)
-{
-}
-void RestVideoManager::stopCamera(const std::shared_ptr<restbed::Session> session)
-{
-}
-void RestVideoManager::switchInput(const std::shared_ptr<restbed::Session> session)
-{
-}
-void RestVideoManager::hasCameraStarted(const std::shared_ptr<restbed::Session> session)
-{
-}
--- a/bin/restcpp/restvideomanager.h
+++ b/bin/restcpp/restvideomanager.h
-/*
- *  Copyright (C) 2016-2019 Savoir-faire Linux Inc.
- *
- *  Author: Simon Zeni <simon.zeni@savoirfairelinux.com>
- *
- *  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
- *  (at your option) 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, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA.
- */
-#pragma once
-#include <vector>
-#include <map>
-#include <string>
-#include <restbed>
-#if __GNUC__ >= 5 || (__GNUC__ >=4 && __GNUC_MINOR__ >= 6)
-/* This warning option only exists for gcc 4.6.0 and greater. */
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#endif
-#include "dring/dring.h"
-#include "dring/callmanager_interface.h"
-#include "dring/configurationmanager_interface.h"
-#include "dring/presencemanager_interface.h"
-#ifdef ENABLE_VIDEO
-#include "dring/videomanager_interface.h"
-#endif
-#include "logger.h"
-#if __GNUC__ >= 5 || (__GNUC__ >=4 && __GNUC_MINOR__ >= 6)
-/* This warning option only exists for gcc 4.6.0 and greater. */
-#pragma GCC diagnostic warning "-Wunused-but-set-variable"
-#endif
-class RestVideoManager
-{
-    public:
-        RestVideoManager();
-        std::vector<std::shared_ptr<restbed::Resource>> getResources();
-    private:
-        // Attributes
-        std::vector<std::shared_ptr<restbed::Resource>> resources_;
-        // Methods
-        std::map<std::string, std::string> parsePost(const std::string& post);
-        void populateResources();
-        void defaultRoute(const std::shared_ptr<restbed::Session> session);
-        void getDeviceList(const std::shared_ptr<restbed::Session> session);
-        void getCapabilities(const std::shared_ptr<restbed::Session> session);
-        void getSettings(const std::shared_ptr<restbed::Session> session);
-        void applySettings(const std::shared_ptr<restbed::Session> session);
-        void setDefaultDevice(const std::shared_ptr<restbed::Session> session);
-        void getDefaultDevice(const std::shared_ptr<restbed::Session> session);
-        void startCamera(const std::shared_ptr<restbed::Session> session);
-        void stopCamera(const std::shared_ptr<restbed::Session> session);
-        void switchInput(const std::shared_ptr<restbed::Session> session);
-        void hasCameraStarted(const std::shared_ptr<restbed::Session> session);
-};
--- a/configure.ac
+++ b/configure.ac
@@ -431,19 +431,9 @@ AS_IF([test "x$with_nodejs" = "xyes"], [
  AM_CONDITIONAL(RING_NODEJS, false)
 );
-# Rest C++ with restbed
+AS_IF([test "x$enable_ringns" != "xno"], [
-AC_ARG_WITH([restcpp],
-    AS_HELP_STRING([--with-restcpp], [enable rest support with C++]))
-AC_ARG_ENABLE([restbed_old_api], AS_HELP_STRING([--enable-restbed-old-api], [Use the old restbed API]))
-AS_IF([test "x$enable_restbed_old_api" = "xyes"], [
-  AC_DEFINE([RESTBED_OLD_API], [1], [Defined if you use the old restbed API])
-])
-AS_IF([test "x$enable_ringns" != "xno" || test "x$with_restcpp" = "xyes"], [
-  AC_CHECK_LIB(restbed, exit,, AC_MSG_ERROR([Missing restbed files]))
  PKG_CHECK_MODULES(LIBCRYPTO, libcrypto,, AC_MSG_ERROR([Missing libcrypto development files]))
  PKG_CHECK_MODULES(LIBSSL, libssl,, AC_MSG_ERROR([Missing libssl development files]))
  LIBS="${LIBS} -lssl -lcrypto"
  AS_IF([test "${HAVE_WIN32}" = "1"],[
      LIBS="${LIBS} -lssleay32 -leay32"
@@ -451,15 +441,6 @@ AS_IF([test "x$enable_ringns" != "xno" || test "x$with_restcpp" = "xyes"], [
  ], []
 );
-AS_IF([test "x$with_restcpp" = "xyes"], [
-    AS_AC_EXPAND(SBINDIR, $sbindir)
-    AC_SUBST(SBINDIR)
-    AC_CONFIG_FILES([bin/restcpp/Makefile])
-    AM_CONDITIONAL(RING_RESTCPP, true)
-  ],
-  AM_CONDITIONAL(RING_RESTCPP, false)
-);
 dnl Check for libav
 PKG_CHECK_MODULES(LIBAVUTIL, libavutil >= 54.31.100,, AC_MSG_ERROR([Missing libavutil development files]))

--- a/contrib/src/asio/rules.mak
+++ b/contrib/src/asio/rules.mak
@@ -21,7 +21,7 @@
 ASIO_VERSION := asio-1-12-2
 ASIO_URL := https://github.com/chriskohlhoff/asio/archive/$(ASIO_VERSION).tar.gz
-# Pure dependency of restbed: do not add to PKGS.
+# Pure dependency of restinio: do not add to PKGS.
 $(TARBALLS)/asio-$(ASIO_VERSION).tar.gz:
 	$(call download,$(ASIO_URL))

--- a/contrib/src/fmt/SHA512SUMS
+++ b/contrib/src/fmt/SHA512SUMS
+9ef0f3d328681253c1e1776576d54d67dec49c19fd7fc422ae63c3610b01a3f05f6e83cdf5e913dfd09bac42e52fe35c38ebe1ea91f4207d226a32aaf69eb4a8  fmt-5.3.0.tar.gz
--- a/contrib/src/fmt/fetch_and_patch.bat
+++ b/contrib/src/fmt/fetch_and_patch.bat
+set BUILD=%SRC%..\build
+set FMT_VERSION=5.3.0
+set FMT_URL=https://github.com/fmtlib/fmt/archive/%FMT_VERSION%.tar.gz
+mkdir %BUILD%
+if %USE_CACHE%==1 (
+    copy %CACHE_DIR%\%FMT_VERSION%.tar.gz %cd%
+) else (
+    %WGET_CMD% %FMT_URL%
+)
+7z -y x %FMT_VERSION%.tar.gz && 7z -y x %FMT_VERSION%.tar -o%BUILD%
+del %FMT_VERSION%.tar && del %FMT_VERSION%.tar.gz && del %BUILD%\pax_global_header
+rename %BUILD%\fmt-%FMT_VERSION% fmt
+cd %BUILD%\fmt
+cd %SRC%
--- a/contrib/src/fmt/rules.mak
+++ b/contrib/src/fmt/rules.mak
+# FMT
+FMT_VERSION := 5.3.0
+FMT_URL := https://github.com/fmtlib/fmt/archive/$(FMT_VERSION).tar.gz
+PKGS += fmt
+ifeq ($(call need_pkg,'fmt'),)
+PKGS_FOUND += fmt
+endif
+# fmt 5.3.0 fix: https://github.com/fmtlib/fmt/issues/1267
+FMT_CMAKECONF = -DBUILD_SHARED_LIBS=Off -DFMT_USE_USER_DEFINED_LITERALS=0 \
+                CMAKE_INSTALL_LIBDIR=$(PREFIX)/lib
+$(TARBALLS)/fmt-$(FMT_VERSION).tar.gz:
+	$(call download,$(FMT_URL))
+.sum-fmt: fmt-$(FMT_VERSION).tar.gz
+fmt: fmt-$(FMT_VERSION).tar.gz
+	$(UNPACK)
+	$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR)
+	$(MOVE)
+.fmt: fmt toolchain.cmake .sum-fmt
+	cd $< && $(HOSTVARS) $(CMAKE) $(FMT_CMAKECONF) .
+	cd $< && $(MAKE) install
+	cd $< && mv $(PREFIX)/share/pkgconfig/fmt.pc $(PREFIX)/lib/pkgconfig/
+	touch $@
--- a/contrib/src/http_parser/SHA512SUMS
+++ b/contrib/src/http_parser/SHA512SUMS
+cbbeb606229488d0136b131e2270c361eeb1663fc302b5206822a4c48b7b398c04457f88d9f61528b565c318a8df526d44293df442c862b486fe3a0f45e45219  http_parser-2.9.3.tar.gz
--- a/contrib/src/http_parser/fetch_and_patch.bat
+++ b/contrib/src/http_parser/fetch_and_patch.bat
+set BUILD=%SRC%..\build
+set HTTP_PARSER_VERSION=2.9.3
+set HTTP_PARSER_URL=https://github.com/binarytrails/http_parser/archive/v%HTTP_PARSER_VERSION%.tar.gz
+mkdir %BUILD%
+if %USE_CACHE%==1 (
+    copy %CACHE_DIR%\%HTTP_PARSER_VERSION%.tar.gz %cd%
+) else (
+    %WGET_CMD% %HTTP_PARSER_URL%
+)
+7z -y x %HTTP_PARSER_VERSION%.tar.gz && 7z -y x %HTTP_PARSER_VERSION%.tar -o%BUILD%
+del %HTTP_PARSER_VERSION%.tar && del %HTTP_PARSER_VERSION%.tar.gz && del %BUILD%\pax_global_header
+rename %BUILD%\http_parser-%HTTP_PARSER_VERSION% http_parser
+cd %BUILD%\http_parser
+cd %SRC%
--- a/contrib/src/http_parser/rules.mak
+++ b/contrib/src/http_parser/rules.mak
+# HTTP_PARSER
+HTTP_PARSER_VERSION := 2.9.3
+HTTP_PARSER_URL := https://github.com/binarytrails/http_parser/archive/v$(HTTP_PARSER_VERSION).tar.gz
+PKGS += http_parser
+ifeq ($(call need_pkg,'http_parser'),)
+PKGS_FOUND += http_parser
+endif
+HTTP_PARSER_MAKECONF := PREFIX=$(PREFIX)
+$(TARBALLS)/http_parser-$(HTTP_PARSER_VERSION).tar.gz:
+	$(call download,$(HTTP_PARSER_URL))
+.sum-http_parser: http_parser-$(HTTP_PARSER_VERSION).tar.gz
+http_parser: http_parser-$(HTTP_PARSER_VERSION).tar.gz
+	$(UNPACK)
+	$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR)
+	$(MOVE)
+.http_parser: http_parser toolchain.cmake .sum-http_parser
+	cd $< && $(HOSTVARS) $(MAKE) $(HTTP_PARSER_MAKECONF) package
+	cd $< && cp -f http_parser.h $(PREFIX)/include && cp -f libhttp_parser.a $(PREFIX)/lib
+	touch $@
--- a/contrib/src/libressl/rules.mak
+++ b/contrib/src/libressl/rules.mak
@@ -29,7 +29,7 @@ ifeq ($(call need_pkg,"openssl >= 1.0.0" || call need_pkg,"libressl >= 1.0.0"),)
 PKGS_FOUND += libressl
 endif
-# Pure dependency of restbed: do not add to PKGS.
+# Pure dependency of restinio: do not add to PKGS.
 $(TARBALLS)/portable-$(LIBRESSL_VERSION).tar.gz:
 	$(call download,$(LIBRESSL_URL))

--- a/contrib/src/opendht/SHA512SUMS
+++ b/contrib/src/opendht/SHA512SUMS
-d0ab4aa376ecd4ac57af78a1491cd0f466021790ebea0e00032a503d61127f323cb37f04d94f2a35797dc52051407708f49ed99be558003acc102ff017dbdf29  opendht-1.10.1.tar.gz
+f7b2d051a2c75675ae217ff7cba32cdb12afa7e79371d595e3e0f96d56d52ddff1767190c51362dcda8d36438c5af3a7b9f1cffa2d76a5039bd60ffb9fcef33a  opendht-5068de7bc0ff4cb5dba20af4a97415d385949d3d.tar.gz
\ No newline at end of file
--- a/contrib/src/opendht/rules.mak
+++ b/contrib/src/opendht/rules.mak
 # OPENDHT
-OPENDHT_VERSION := 1.10.1
+OPENDHT_VERSION := 5068de7bc0ff4cb5dba20af4a97415d385949d3d
 OPENDHT_URL := https://github.com/savoirfairelinux/opendht/archive/$(OPENDHT_VERSION).tar.gz
 PKGS += opendht
@@ -14,8 +14,11 @@ endif
 ifneq ($(call need_pkg,"libargon2"),)
 DEPS_opendht += argon2
 endif
-ifneq ($(call need_pkg,"restbed"),)
+ifneq ($(call need_pkg,"libressl >= 1-12-2"),)
-DEPS_opendht += restbed
+DEPS_opendht += libressl	
+endif
+ifneq ($(call need_pkg,"restinio >= v.0.5.1"),)
+DEPS_opendht += restinio
 endif
 ifneq ($(call need_pkg,"jsoncpp"),)
 DEPS_opendht += jsoncpp
@@ -24,6 +27,9 @@ ifneq ($(call need_pkg,"gnutls >= 3.3.0"),)
 DEPS_opendht += gnutls
 endif
+# fmt 5.3.0 fix: https://github.com/fmtlib/fmt/issues/1267
+OPENDHT_CONF = FMT_USE_USER_DEFINED_LITERALS=0
 $(TARBALLS)/opendht-$(OPENDHT_VERSION).tar.gz:
 	$(call download,$(OPENDHT_URL))
@@ -36,6 +42,6 @@ opendht: opendht-$(OPENDHT_VERSION).tar.gz
 .opendht: opendht .sum-opendht
 	mkdir -p $</m4 && $(RECONF)
-	cd $< && $(HOSTVARS) ./configure --enable-static --disable-shared --disable-tools --disable-python --disable-doc --enable-proxy-server --enable-proxy-client --enable-push-notifications $(HOSTCONF)
+	cd $< && $(HOSTVARS) $(OPENDHT_CONF) ./configure --enable-static --disable-shared --disable-tools --disable-python --disable-doc --enable-proxy-server --enable-proxy-client --enable-push-notifications $(HOSTCONF)
 	cd $< && $(MAKE) install
 	touch $@