Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
306c1877
Commit
306c1877
authored
Aug 16, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(Cli): better code to convert from base 64 (uri command)
parent
833be4c6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
16 deletions
+5
-16
Cli.cpp
src/app/cli/Cli.cpp
+5
-15
Cli.hpp
src/app/cli/Cli.hpp
+0
-1
No files found.
src/app/cli/Cli.cpp
View file @
306c1877
...
...
@@ -149,24 +149,14 @@ void Cli::Command::execute (QHash<QString, QString> &args) const {
}
}
void
Cli
::
Command
::
decode
(
QHash
<
QString
,
QString
>
&
args
)
const
{
QByteArray
qa
;
for
(
const
auto
&
argName
:
args
.
keys
())
{
if
(
argName
!=
QString
(
"sip-address"
))
{
qa
.
append
(
args
[
argName
]);
args
[
argName
]
=
QByteArray
::
fromBase64
(
qa
);
qa
.
clear
();
}
}
}
void
Cli
::
Command
::
executeUri
(
const
shared_ptr
<
linphone
::
Address
>
&
address
)
const
{
QHash
<
QString
,
QString
>
args
;
for
(
const
auto
&
argName
:
mArgsScheme
.
keys
())
args
[
argName
]
=
::
Utils
::
coreStringToAppString
(
address
->
getHeader
(
::
Utils
::
appStringToCoreString
(
argName
)));
for
(
const
auto
&
argName
:
mArgsScheme
.
keys
())
{
const
string
header
=
address
->
getHeader
(
::
Utils
::
appStringToCoreString
(
argName
));
args
[
argName
]
=
QByteArray
::
fromBase64
(
QByteArray
(
header
.
c_str
(),
header
.
length
()));
}
address
->
clean
();
args
[
"sip-address"
]
=
::
Utils
::
coreStringToAppString
(
address
->
asStringUriOnly
());
decode
(
args
);
execute
(
args
);
}
...
...
@@ -237,7 +227,7 @@ void Cli::executeCommand (const QString &command, CommandFormat *format) const {
return
;
}
//
TODO: c
heck if there is any header when the `method` header is missing.
//
TODO: C
heck if there is any header when the `method` header is missing.
const
QString
functionName
=
::
Utils
::
coreStringToAppString
(
address
->
getHeader
(
"method"
)).
isEmpty
()
?
QStringLiteral
(
"call"
)
:
::
Utils
::
coreStringToAppString
(
address
->
getHeader
(
"method"
));
...
...
src/app/cli/Cli.hpp
View file @
306c1877
...
...
@@ -63,7 +63,6 @@ class Cli : public QObject {
const
QHash
<
QString
,
Argument
>
&
argsScheme
);
void
decode
(
QHash
<
QString
,
QString
>
&
args
)
const
;
void
execute
(
QHash
<
QString
,
QString
>
&
args
)
const
;
void
executeUri
(
const
std
::
shared_ptr
<
linphone
::
Address
>
&
address
)
const
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment