Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
f9cbabd4
Commit
f9cbabd4
authored
9 years ago
by
Guillaume Roguez
Browse files
Options
Downloads
Patches
Plain Diff
ringaccount: display as dgb ICE incoming data from dht
Issue: #78582 Change-Id: I67a11ca2aec47669c23183fdbc97bf26ad00a7ee
parent
fce9cd0d
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/ringdht/ringaccount.cpp
+4
-2
4 additions, 2 deletions
src/ringdht/ringaccount.cpp
with
4 additions
and
2 deletions
src/ringdht/ringaccount.cpp
+
4
−
2
View file @
f9cbabd4
...
@@ -211,7 +211,8 @@ RingAccount::newOutgoingCall(const std::string& toUrl)
...
@@ -211,7 +211,8 @@ RingAccount::newOutgoingCall(const std::string& toUrl)
[
=
]
(
dht
::
IceCandidates
&&
msg
)
{
[
=
]
(
dht
::
IceCandidates
&&
msg
)
{
if
(
msg
.
id
!=
replyvid
)
if
(
msg
.
id
!=
replyvid
)
return
true
;
return
true
;
RING_WARN
(
"ICE request replied from DHT peer %s"
,
toH
.
toString
().
c_str
());
RING_WARN
(
"ICE request replied from DHT peer %s
\n
%s"
,
toH
.
toString
().
c_str
(),
std
::
string
(
msg
.
ice_data
.
cbegin
(),
msg
.
ice_data
.
cend
()).
c_str
());
if
(
auto
call
=
weak_call
.
lock
())
if
(
auto
call
=
weak_call
.
lock
())
call
->
setState
(
Call
::
ConnectionState
::
PROGRESSING
);
call
->
setState
(
Call
::
ConnectionState
::
PROGRESSING
);
ice
->
start
(
msg
.
ice_data
);
ice
->
start
(
msg
.
ice_data
);
...
@@ -837,7 +838,8 @@ void RingAccount::incomingCall(dht::IceCandidates&& msg)
...
@@ -837,7 +838,8 @@ void RingAccount::incomingCall(dht::IceCandidates&& msg)
{
{
auto
from
=
msg
.
from
.
toString
();
auto
from
=
msg
.
from
.
toString
();
auto
reply_vid
=
msg
.
id
+
1
;
auto
reply_vid
=
msg
.
id
+
1
;
RING_WARN
(
"Received incoming DHT call request from %s"
,
from
.
c_str
());
RING_WARN
(
"ICE incoming from DHT peer %s
\n
%s"
,
from
.
c_str
(),
std
::
string
(
msg
.
ice_data
.
cbegin
(),
msg
.
ice_data
.
cend
()).
c_str
());
auto
call
=
Manager
::
instance
().
callFactory
.
newCall
<
SIPCall
,
RingAccount
>
(
*
this
,
Manager
::
instance
().
getNewCallID
(),
Call
::
CallType
::
INCOMING
);
auto
call
=
Manager
::
instance
().
callFactory
.
newCall
<
SIPCall
,
RingAccount
>
(
*
this
,
Manager
::
instance
().
getNewCallID
(),
Call
::
CallType
::
INCOMING
);
auto
ice
=
Manager
::
instance
().
getIceTransportFactory
().
createTransport
(
auto
ice
=
Manager
::
instance
().
getIceTransportFactory
().
createTransport
(
(
"sip:"
+
call
->
getCallId
()).
c_str
(),
ICE_COMPONENTS
,
false
,
getIceOptions
());
(
"sip:"
+
call
->
getCallId
()).
c_str
(),
ICE_COMPONENTS
,
false
,
getIceOptions
());
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment