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
eta
gajim
Commits
ee05914b
Commit
ee05914b
authored
12 years ago
by
Yann Leboulanger
Browse files
Options
Downloads
Patches
Plain Diff
fix typo
remove "fast" support try to connect to streamhosts when we get them
parent
0493997a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/common/protocol/bytestream.py
+2
-8
2 additions, 8 deletions
src/common/protocol/bytestream.py
with
2 additions
and
8 deletions
src/common/protocol/bytestream.py
+
2
−
8
View file @
ee05914b
...
...
@@ -639,7 +639,6 @@ class ConnectionSocks5Bytestream(ConnectionBytestream):
streamhosts
.
append
(
host_dict
)
file_props
=
FilesProp
.
getFilePropBySid
(
sid
)
if
file_props
is
not
None
:
file_props
.
fast
=
streamhosts
if
file_props
.
type_
==
'
s
'
:
# FIXME: remove fast xmlns
# only psi do this
if
file_props
.
streamhosts
:
...
...
@@ -648,7 +647,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream):
file_props
.
streamhosts
=
streamhosts
gajim
.
socks5queue
.
connect_to_hosts
(
self
.
name
,
sid
,
self
.
send_success_connect_reply
,
None
)
raise
xmpp
.
NodeProcessed
raise
xmpp
.
NodeProcessed
else
:
log
.
warn
(
'
Gajim got streamhosts for unknown transfer. Ignoring it.
'
)
raise
xmpp
.
NodeProcessed
...
...
@@ -685,7 +684,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream):
except
Exception
:
# this bytestream result is not what we need
pass
id_
=
real_id
[
3
:]
file_props
=
FilesProp
.
getFileProp
(
con
.
name
,
id_
)
file_props
=
FilesProp
.
getFileProp
(
self
.
name
,
id_
)
if
file_props
is
None
:
raise
xmpp
.
NodeProcessed
if
streamhost
is
None
:
...
...
@@ -737,11 +736,6 @@ class ConnectionSocks5Bytestream(ConnectionBytestream):
self
.
remove_transfer
(
file_props
)
else
:
gajim
.
socks5queue
.
send_file
(
file_props
,
self
.
name
,
'
client
'
)
if
file_props
.
fast
:
fasts
=
file_props
.
fast
if
len
(
fasts
)
>
0
:
self
.
_connect_error
(
frm
,
fasts
[
0
][
'
id
'
],
file_props
.
sid
,
code
=
406
)
raise
xmpp
.
NodeProcessed
...
...
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