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
eae2c461
Commit
eae2c461
authored
Aug 18, 2017
by
nicolas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(Cli): error case: join-conference-as without proxy config
parent
1d2dbfb7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
11 deletions
+16
-11
Cli.cpp
src/app/cli/Cli.cpp
+16
-11
No files found.
src/app/cli/Cli.cpp
View file @
eae2c461
...
@@ -60,18 +60,22 @@ static void cliJoinConference (QHash<QString, QString> &args) {
...
@@ -60,18 +60,22 @@ static void cliJoinConference (QHash<QString, QString> &args) {
static
void
cliJoinConferenceAs
(
QHash
<
QString
,
QString
>
&
args
)
{
static
void
cliJoinConferenceAs
(
QHash
<
QString
,
QString
>
&
args
)
{
const
QString
fromSipAddress
=
args
.
take
(
"guest-sip-address"
);
const
QString
fromSipAddress
=
args
.
take
(
"guest-sip-address"
);
const
QString
toSipAddress
=
args
.
take
(
"sip-address"
);
const
QString
toSipAddress
=
args
.
take
(
"sip-address"
);
CoreManager
*
coreManager
=
CoreManager
::
getInstance
();
CoreManager
*
coreManager
=
CoreManager
::
getInstance
();
shared_ptr
<
linphone
::
Core
>
core
=
coreManager
->
getCore
();
shared_ptr
<
linphone
::
ProxyConfig
>
proxyConfig
=
coreManager
->
getCore
()
->
getDefaultProxyConfig
();
{
if
(
!
proxyConfig
)
{
shared_ptr
<
linphone
::
Address
>
currentSipAddress
=
core
->
getDefaultProxyConfig
()
->
getIdentityAddress
()
->
clone
();
qWarning
()
<<
QStringLiteral
(
"You have no proxy config."
);
currentSipAddress
->
clean
();
return
;
if
(
fromSipAddress
!=
::
Utils
::
coreStringToAppString
(
currentSipAddress
->
asStringUriOnly
()))
{
}
qWarning
()
<<
QStringLiteral
(
"Guest sip address `%1` doesn't match with default proxy config."
)
.
arg
(
fromSipAddress
);
const
shared_ptr
<
const
linphone
::
Address
>
currentSipAddress
=
proxyConfig
->
getIdentityAddress
();
return
;
const
shared_ptr
<
const
linphone
::
Address
>
askedSipAddress
=
linphone
::
Factory
::
get
()
->
createAddress
(
}
::
Utils
::
appStringToCoreString
(
fromSipAddress
)
);
if
(
!
currentSipAddress
->
weakEqual
(
askedSipAddress
))
{
qWarning
()
<<
QStringLiteral
(
"Guest sip address `%1` doesn't match with default proxy config."
)
.
arg
(
fromSipAddress
);
return
;
}
}
args
[
"method"
]
=
QStringLiteral
(
"join-conference"
);
args
[
"method"
]
=
QStringLiteral
(
"join-conference"
);
...
@@ -124,7 +128,8 @@ static void cliInitiateConference (QHash<QString, QString> &args) {
...
@@ -124,7 +128,8 @@ static void cliInitiateConference (QHash<QString, QString> &args) {
qWarning
()
<<
QStringLiteral
(
"Unable to join created conference: `%1`."
).
arg
(
id
);
qWarning
()
<<
QStringLiteral
(
"Unable to join created conference: `%1`."
).
arg
(
id
);
return
;
return
;
}
}
App
*
app
=
App
::
getInstance
();
app
->
smartShowWindow
(
app
->
getCallsWindow
());
// TODO: Set the view to the "waiting call view".
// TODO: Set the view to the "waiting call view".
}
}
...
...
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