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
0493997a
Commit
0493997a
authored
12 years ago
by
Yann Leboulanger
Browse files
Options
Downloads
Patches
Plain Diff
handle ft_send_local_ips option with jingle FT
parent
503c7dc5
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/jingle_transport.py
+7
-4
7 additions, 4 deletions
src/common/jingle_transport.py
with
7 additions
and
4 deletions
src/common/jingle_transport.py
+
7
−
4
View file @
0493997a
...
...
@@ -78,7 +78,7 @@ class JingleTransport(object):
Return the list of transport candidates from a transport stanza
"""
return
[]
def
set_connection
(
self
,
conn
):
self
.
connection
=
conn
if
not
self
.
sid
:
...
...
@@ -89,7 +89,7 @@ class JingleTransport(object):
def
set_our_jid
(
self
,
jid
):
self
.
ourjid
=
jid
def
set_sid
(
self
,
sid
):
self
.
sid
=
sid
...
...
@@ -168,6 +168,9 @@ class JingleTransportSocks5(JingleTransport):
self
.
candidates
.
append
(
cand
)
def
_add_local_ips_as_candidates
(
self
):
if
not
gajim
.
config
.
get_per
(
'
accounts
'
,
self
.
connection
.
name
,
'
ft_send_local_ips
'
):
return
if
not
self
.
connection
:
return
local_ip_cand
=
[]
...
...
@@ -259,7 +262,7 @@ class JingleTransportSocks5(JingleTransport):
self
.
file_props
.
session_sid
)
if
sesn
is
None
:
return
iq
=
xmpp
.
Iq
(
to
=
proxy
[
'
jid
'
],
frm
=
self
.
ourjid
,
typ
=
'
set
'
)
auth_id
=
"
au_
"
+
proxy
[
'
sid
'
]
iq
.
setID
(
auth_id
)
...
...
@@ -321,7 +324,7 @@ class JingleTransportIBB(JingleTransport):
transport
.
setAttr
(
'
block-size
'
,
self
.
block_sz
)
transport
.
setAttr
(
'
sid
'
,
self
.
sid
)
return
transport
try
:
import
farstream
except
Exception
:
...
...
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