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
03f6c1e1
Commit
03f6c1e1
authored
5 years ago
by
Sébastien Blin
Committed by
Adrien Béraud
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
file transfer: fix cancel
Change-Id: If13deebef78da9864522969c595beb5fc6a095de Gitlab:
#141
parent
7043f9d3
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/peer_connection.cpp
+1
-8
1 addition, 8 deletions
src/peer_connection.cpp
src/peer_connection.h
+0
-1
0 additions, 1 deletion
src/peer_connection.h
src/security/tls_session.cpp
+2
-3
2 additions, 3 deletions
src/security/tls_session.cpp
with
3 additions
and
12 deletions
src/peer_connection.cpp
+
1
−
8
View file @
03f6c1e1
...
...
@@ -493,14 +493,7 @@ TlsSocketEndpoint::TlsSocketEndpoint(AbstractSocketEndpoint& tr,
}
TlsSocketEndpoint
::~
TlsSocketEndpoint
()
{
shutdown
();
}
void
TlsSocketEndpoint
::
shutdown
()
{
pimpl_
->
tr
.
shutdown
();
}
TlsSocketEndpoint
::~
TlsSocketEndpoint
()
=
default
;
bool
TlsSocketEndpoint
::
isInitiator
()
const
...
...
This diff is collapsed.
Click to expand it.
src/peer_connection.h
+
0
−
1
View file @
03f6c1e1
...
...
@@ -187,7 +187,6 @@ public:
std
::
function
<
bool
(
const
dht
::
crypto
::
Certificate
&
)
>&&
cert_check
);
~
TlsSocketEndpoint
();
void
shutdown
()
override
;
bool
isReliable
()
const
override
{
return
true
;
}
bool
isInitiator
()
const
override
;
int
maxPayload
()
const
override
;
...
...
This diff is collapsed.
Click to expand it.
src/security/tls_session.cpp
+
2
−
3
View file @
03f6c1e1
...
...
@@ -735,9 +735,6 @@ TlsSession::TlsSessionImpl::cleanup()
state_
=
TlsSessionState
::
SHUTDOWN
;
// be sure to block any user operations
stateCondition_
.
notify_all
();
// This will stop current read of the ice_transport.cpp
transport_
.
shutdown
();
{
std
::
lock_guard
<
std
::
mutex
>
lk
(
sessionMutex_
);
if
(
session_
)
{
...
...
@@ -752,6 +749,8 @@ TlsSession::TlsSessionImpl::cleanup()
if
(
cookie_key_
.
data
)
gnutls_free
(
cookie_key_
.
data
);
transport_
.
shutdown
();
}
TlsSessionState
...
...
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