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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
0b686317
Commit
0b686317
authored
5 years ago
by
Sébastien Blin
Browse files
Options
Downloads
Patches
Plain Diff
file transfer: cancel current ICE operations to avoid to block the main loop
Change-Id: Ibcc12d0113431f4b432d2c5e1938abb4d4bc82e8
parent
80657de4
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/jamidht/p2p.cpp
+2
-0
2 additions, 0 deletions
src/jamidht/p2p.cpp
with
2 additions
and
0 deletions
src/jamidht/p2p.cpp
+
2
−
0
View file @
0b686317
...
...
@@ -488,11 +488,13 @@ private:
// In case of a timeout
JAMI_WARN
()
<<
"TLS connection timeout from peer "
<<
peer_
.
toString
()
<<
": "
<<
e
.
what
();
ice
->
cancelOperations
();
// This will stop current PeerChannel operations
cancel
();
return
;
}
catch
(...)
{
JAMI_WARN
()
<<
"TLS connection failure from peer "
<<
peer_
.
toString
();
ice
->
cancelOperations
();
// This will stop current PeerChannel operations
cancel
();
return
;
}
...
...
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