From 19209c8d71f06a37dcbef3ea556244ed24408886 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Wed, 13 Apr 2022 14:17:41 +0200
Subject: [PATCH] Fix config-set for value with spaces. Add echo-calibration
command.
---
daemon/CMakeLists.txt | 2 ++
daemon/commands/config.cc | 11 ++++++--
daemon/commands/echo.cc | 58 +++++++++++++++++++++++++++++++++++++++
daemon/commands/echo.h | 32 +++++++++++++++++++++
daemon/commands/video.cc | 4 +--
daemon/daemon.cc | 2 ++
6 files changed, 105 insertions(+), 4 deletions(-)
create mode 100644 daemon/commands/echo.cc
create mode 100644 daemon/commands/echo.h
diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index 4450afecb2..f33b35c695 100644
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -65,6 +65,8 @@ set(DAEMON_SOURCE_FILES
commands/contact.h
commands/dtmf.cc
commands/dtmf.h
+ commands/echo.cc
+ commands/echo.h
commands/firewall-policy.cc
commands/firewall-policy.h
commands/help.cc
diff --git a/daemon/commands/config.cc b/daemon/commands/config.cc
index 811e857eda..9c51daf563 100644
--- a/daemon/commands/config.cc
+++ b/daemon/commands/config.cc
@@ -65,14 +65,21 @@ ConfigSetCommand::ConfigSetCommand() :
}
void ConfigSetCommand::exec(Daemon *app, const string& args) {
- string section,key,value;
+ string section,key,value,temp;
istringstream ist(args);
ist >> section >> key;
if (ist.fail()) {
app->sendResponse(Response("Missing section and/or key names."));
return;
}
- ist>>value;
+ bool first = true;
+ while(ist>>temp){
+ if(!first)
+ value += ' ';
+ else
+ first = false;
+ value += temp;
+ }
linphone_config_set_string(linphone_core_get_config(app->getCore()), section.c_str(), key.c_str(), value.size()>0 ? value.c_str() : NULL);
app->sendResponse(ConfigResponse(value.c_str()));
}
diff --git a/daemon/commands/echo.cc b/daemon/commands/echo.cc
new file mode 100644
index 0000000000..f3af1ae25c
--- /dev/null
+++ b/daemon/commands/echo.cc
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2010-2022 Belledonne Communications SARL.
+ *
+ * This file is part of Liblinphone.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "echo.h"
+
+using namespace std;
+
+
+
+void echoResultCbs(LinphoneCore *core, LinphoneEcCalibratorStatus status, int delay_ms){
+ Daemon *app = (Daemon*) linphone_core_get_user_data(core);
+ ostringstream ost;
+ switch(status){
+ case LinphoneEcCalibratorInProgress : ost << "Calibration in progress"; break;
+ case LinphoneEcCalibratorDone : ost << "Calibration Done"; break;
+ case LinphoneEcCalibratorFailed : ost << "Calibration failed"; break;
+ case LinphoneEcCalibratorDoneNoEcho : ost << "Calibration done but no echo"; break;
+ }
+ ost << ", delay: " << delay_ms << "ms";
+ app->sendResponse(Response(ost.str(), Response::Ok));
+}
+
+EchoCalibrationCommand::EchoCalibrationCommand() :
+ DaemonCommand("echo-calibration", "echo-calibration", "Make an echo calibration and return the result in ms.") {
+ addExample(make_unique<DaemonCommandExample>("echo-calibration",
+ "Status: Error\n"
+ "Reason: Calibration failed"));
+ addExample(make_unique<DaemonCommandExample>("echo-calibration",
+ "Status: Ok"));
+}
+
+void EchoCalibrationCommand::exec(Daemon *app, const string& args) {
+ LinphoneCore *lc = app->getCore();
+ //LinphoneCoreCbs * cbs = linphone_factory_create_core_cbs(linphone_factory_get());
+ LinphoneCoreCbs *cbs=linphone_core_get_current_callbacks(lc);
+ linphone_core_enable_echo_cancellation(lc, TRUE);
+ linphone_core_cbs_set_ec_calibration_result(cbs, echoResultCbs);
+ if(linphone_core_start_echo_canceller_calibration(lc)) {
+ app->sendResponse(Response("Calibration failed", Response::Error));
+ }else
+ app->sendResponse(Response("Calibrating...", Response::Ok));
+}
diff --git a/daemon/commands/echo.h b/daemon/commands/echo.h
new file mode 100644
index 0000000000..6d433d3c1f
--- /dev/null
+++ b/daemon/commands/echo.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2010-2022 Belledonne Communications SARL.
+ *
+ * This file is part of Liblinphone.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LINPHONE_DAEMON_COMMAND_ECHO_H_
+#define LINPHONE_DAEMON_COMMAND_ECHO_H_
+
+#include "daemon.h"
+
+class EchoCalibrationCommand: public DaemonCommand {
+public:
+ EchoCalibrationCommand();
+
+ void exec(Daemon *app, const std::string &args) override;
+};
+
+#endif
diff --git a/daemon/commands/video.cc b/daemon/commands/video.cc
index e0a4d1f8e8..0f662fdbd7 100644
--- a/daemon/commands/video.cc
+++ b/daemon/commands/video.cc
@@ -326,7 +326,7 @@ Video::Preview::Preview():
"Enabled"));
addExample(make_unique<DaemonCommandExample>("videopreview off",
"Status: Ok\n\n"
- "Desabled"));
+ "Disabled"));
}
void Video::Preview::exec(Daemon* app, const string& args)
@@ -338,7 +338,7 @@ void Video::Preview::exec(Daemon* app, const string& args)
app->sendResponse(Response("Enabled", Response::Ok));
}else if(args == "off"){
linphone_core_enable_video_preview(app->getCore(), FALSE);
- app->sendResponse(Response("Desabled", Response::Ok));
+ app->sendResponse(Response("Disabled", Response::Ok));
}else {
app->sendResponse(Response("Bad command. Use on/off.", Response::Error));
}
diff --git a/daemon/daemon.cc b/daemon/daemon.cc
index adc3c31621..f4bd1dbff6 100644
--- a/daemon/daemon.cc
+++ b/daemon/daemon.cc
@@ -63,6 +63,7 @@
#include "commands/conference.h"
#include "commands/contact.h"
#include "commands/dtmf.h"
+#include "commands/echo.h"
#include "commands/firewall-policy.h"
#include "commands/help.h"
#include "commands/ipv6.h"
@@ -508,6 +509,7 @@ void Daemon::initCommands() {
mCommands.push_back(new IncallPlayerPauseCommand());
mCommands.push_back(new IncallPlayerResumeCommand());
mCommands.push_back(new MessageCommand());
+ mCommands.push_back(new EchoCalibrationCommand());
mCommands.sort(compareCommands);
}
--
GitLab