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
67c28501
Commit
67c28501
authored
12 years ago
by
zimio
Browse files
Options
Downloads
Patches
Plain Diff
only send hash if contact supports it
parent
5bec8c7a
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/jingle.py
+0
-5
0 additions, 5 deletions
src/common/jingle.py
src/common/jingle_ft.py
+1
-1
1 addition, 1 deletion
src/common/jingle_ft.py
with
1 addition
and
6 deletions
src/common/jingle.py
+
0
−
5
View file @
67c28501
...
...
@@ -80,12 +80,10 @@ class ConnectionJingle(object):
# get data
jid
=
helpers
.
get_full_jid_from_iq
(
stanza
)
id_
=
stanza
.
getID
()
if
(
jid
,
id_
)
in
self
.
__iq_responses
.
keys
():
self
.
__iq_responses
[(
jid
,
id_
)].
on_stanza
(
stanza
)
del
self
.
__iq_responses
[(
jid
,
id_
)]
raise
xmpp
.
NodeProcessed
jingle
=
stanza
.
getTag
(
'
jingle
'
)
# a jingle element is not necessary in iq-result stanza
# don't check for that
...
...
@@ -97,14 +95,12 @@ class ConnectionJingle(object):
if
id_
in
sesn
.
iq_ids
:
sesn
.
on_stanza
(
stanza
)
return
# do we need to create a new jingle object
if
sid
not
in
self
.
_sessions
:
#TODO: tie-breaking and other things...
newjingle
=
JingleSession
(
con
=
self
,
weinitiate
=
False
,
jid
=
jid
,
iq_id
=
id_
,
sid
=
sid
)
self
.
_sessions
[
sid
]
=
newjingle
# we already have such session in dispatcher...
self
.
_sessions
[
sid
].
collect_iq_id
(
id_
)
self
.
_sessions
[
sid
].
on_stanza
(
stanza
)
...
...
@@ -112,7 +108,6 @@ class ConnectionJingle(object):
if
sid
in
self
.
_sessions
and
\
self
.
_sessions
[
sid
].
state
==
JingleStates
.
ended
:
self
.
delete_jingle_session
(
sid
)
raise
xmpp
.
NodeProcessed
def
start_audio
(
self
,
jid
):
...
...
This diff is collapsed.
Click to expand it.
src/common/jingle_ft.py
+
1
−
1
View file @
67c28501
...
...
@@ -166,7 +166,7 @@ class JingleFileTransfer(JingleContent):
self
.
file_props
.
streamhosts
=
self
.
transport
.
remote_candidates
# Calculate file hash in a new thread
# if we haven't sent the hash already.
if
self
.
file_props
.
hash_
is
None
:
if
self
.
file_props
.
hash_
is
None
and
self
.
file_props
.
algo
:
self
.
hashThread
=
threading
.
Thread
(
target
=
self
.
__send_hash
)
self
.
hashThread
.
start
()
for
host
in
self
.
file_props
.
streamhosts
:
...
...
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