Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gajim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Weblate
gajim
Commits
cc198ec3
Commit
cc198ec3
authored
12 years ago
by
zimio
Browse files
Options
Downloads
Patches
Plain Diff
Also cancel the jingle session when initiator for IBB transfer cancellation
parent
5b97ef27
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/common/file_props.py
+1
-0
1 addition, 0 deletions
src/common/file_props.py
src/common/protocol/bytestream.py
+8
-0
8 additions, 0 deletions
src/common/protocol/bytestream.py
with
9 additions
and
0 deletions
src/common/file_props.py
+
1
−
0
View file @
cc198ec3
...
...
@@ -135,6 +135,7 @@ class FileProp(object):
self
.
hash_
=
None
self
.
fd
=
None
self
.
startexmpp
=
None
# Type of the session, if it is 'jingle' or 'si'
self
.
session_type
=
None
self
.
request_id
=
None
self
.
proxyhosts
=
None
...
...
This diff is collapsed.
Click to expand it.
src/common/protocol/bytestream.py
+
8
−
0
View file @
cc198ec3
...
...
@@ -811,6 +811,14 @@ class ConnectionIBBytestream(ConnectionBytestream):
file_props
.
direction
[
1
:],
'
set
'
,
payload
=
[
nbxmpp
.
Node
(
nbxmpp
.
NS_IBB
+
'
close
'
,
{
'
sid
'
:
file_props
.
sid
})]))
if
file_props
.
session_type
==
'
jingle
'
:
peerjid
=
\
file_props
.
receiver
if
file_props
.
type_
==
'
s
'
else
file_props
.
sender
session
=
self
.
get_jingle_session
(
peerjid
,
file_props
.
sid
,
'
file
'
)
# According to the xep, the initiator also cancels the jingle session
# if there are no more files to send using IBB
if
session
.
weinitiate
:
session
.
cancel_session
()
def
OpenStream
(
self
,
sid
,
to
,
fp
,
blocksize
=
4096
):
...
...
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