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
9224b9c3
Commit
9224b9c3
authored
11 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
sip: properly read STUN address
Issue: #45416
parent
f97af644
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
daemon/src/sip/siptransport.cpp
+7
-7
7 additions, 7 deletions
daemon/src/sip/siptransport.cpp
with
7 additions
and
7 deletions
daemon/src/sip/siptransport.cpp
+
7
−
7
View file @
9224b9c3
...
...
@@ -436,11 +436,10 @@ SipTransport::findLocalAddressFromSTUN(pjsip_transport *transport,
// Update address and port with active transport
RETURN_IF_NULL
(
transport
,
"Transport is NULL in findLocalAddress, using local address %s:%d"
,
addr
.
c_str
(),
port
);
pj_sockaddr
_in
mapped_addr
;
pj_sockaddr
mapped_addr
;
pj_sock_t
sipSocket
=
pjsip_udp_transport_get_socket
(
transport
);
const
pjstun_setting
stunOpt
=
{
PJ_TRUE
,
*
stunServerName
,
stunPort
,
*
stunServerName
,
stunPort
};
const
pj_status_t
stunStatus
=
pjstun_get_mapped_addr2
(
&
cp_
.
factory
,
&
stunOpt
,
1
,
&
sipSocket
,
&
mapped_addr
);
const
pj_status_t
stunStatus
=
pjstun_get_mapped_addr2
(
&
cp_
.
factory
,
&
stunOpt
,
1
,
&
sipSocket
,
&
mapped_addr
.
ipv4
);
switch
(
stunStatus
)
{
case
PJLIB_UTIL_ESTUNNOTRESPOND
:
...
...
@@ -449,14 +448,15 @@ SipTransport::findLocalAddressFromSTUN(pjsip_transport *transport,
case
PJLIB_UTIL_ESTUNSYMMETRIC
:
ERROR
(
"Different mapped addresses are returned by servers."
);
return
;
case
PJ_SUCCESS
:
port
=
pj_sockaddr_get_port
(
&
mapped_addr
);
addr
=
ip_utils
::
addrToStr
(
mapped_addr
);
default:
break
;
}
port
=
pj_sockaddr_get_port
(
&
mapped_addr
);
WARN
(
"Using address %s:%d provided by STUN server %.*s"
,
addr
.
c_str
(),
port
,
stunServerName
->
slen
,
stunServerName
->
ptr
);
WARN
(
"Using address %s provided by STUN server %.*s"
,
ip_utils
::
addrToStr
(
mapped_addr
,
true
,
true
).
c_str
(),
stunServerName
->
slen
,
stunServerName
->
ptr
);
}
#undef RETURN_IF_NULL
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