mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-04-17 20:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cli command : call interpretUrl on sip-address param to add domain if not indicated in the command

Browse source
This commit is contained in:
Gaelle Braud 2026-03-23 14:35:17 +01:00
parent c1996aac57
commit e077320c97
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Linphone/model/cli/CliModel.cpp
View file

@ -281,7 +281,7 @@ void CliModel::Command::execute(QHash<QString, QString> &args, CliModel *parent)
void CliModel::Command::executeUri(QString address, QHash<QString, QString> args, CliModel *parent) { void CliModel::Command::executeUri(QString address, QHash<QString, QString> args, CliModel *parent) {
QUrl url(address); QUrl url(address);
QString query = url.query(); QString query = url.query();
lDebug() << QStringLiteral("CliModel : execute uri : %1").arg(query); lInfo() << QStringLiteral("CliModel : execute uri : %1").arg(query);
QStringList parameters = query.split('&'); QStringList parameters = query.split('&');
for (int i = 0; i < parameters.size(); ++i) { for (int i = 0; i < parameters.size(); ++i) {
@ -299,9 +299,19 @@ void CliModel::Command::executeUri(QString address, QHash<QString, QString> args
} }
} }
args["sip-address"] = address.left(address.indexOf('?')); QString sipAddress = address.left(address.indexOf('?'));
lDebug() << "CliModel: getting sip address " << args["sip-address"]; // We need to remove "sip:" in order to obtain an url with
parent->addProcess(ProcessCommand(*this, args, 0, parent)); // the domain as a suffix (interpretUrl will return the address as it is
// if starting by "sip:")
if (sipAddress.startsWith("sip:")) sipAddress.remove("sip:");
auto linphoneAddress = ToolModel::interpretUrl(sipAddress);
lInfo() << "CliModel: getting sip address " << (linphoneAddress ? linphoneAddress->asStringUriOnly() : "null !");
if (linphoneAddress) {
args["sip-address"] = Utils::coreStringToAppString(linphoneAddress->asStringUriOnly());
parent->addProcess(ProcessCommand(*this, args, 0, parent));
} else {
lWarning() << "CliModel: Could not get sip address from" << args["sip-address"] << "; not adding process";
}
} }
// pUrl can be `anytoken?p1=x&p2=y` or `p1=x&p2=y`. It will only use p1 and p2 // pUrl can be `anytoken?p1=x&p2=y` or `p1=x&p2=y`. It will only use p1 and p2
@ -327,7 +337,8 @@ void CliModel::Command::executeUrl(const QString &pUrl, CliModel *parent) {
} }
} }
} }
if (!authority.isEmpty()) args["sip-address"] = authority; if (!authority.isEmpty())
args["sip-address"] = Utils::coreStringToAppString(ToolModel::interpretUrl(authority)->asStringUriOnly());
parent->addProcess(ProcessCommand(*this, args, 0, parent)); parent->addProcess(ProcessCommand(*this, args, 0, parent));
} }