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
de784a63
Commit
de784a63
authored
12 years ago
by
Emmanuel Lepage
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of
git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone
parents
cd5866bf
a5feba6a
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
daemon/src/sip/siptransport.cpp
+8
-9
8 additions, 9 deletions
daemon/src/sip/siptransport.cpp
with
8 additions
and
9 deletions
daemon/src/sip/siptransport.cpp
+
8
−
9
View file @
de784a63
...
...
@@ -338,25 +338,24 @@ void SipTransport::createSipTransport(SIPAccount &account)
account
.
transport_
=
createUdpTransport
(
account
.
getLocalInterface
(),
account
.
getLocalPort
());
}
}
else
{
account
.
transport_
=
createUdpTransport
(
account
.
getLocalInterface
(),
account
.
getLocalPort
());
}
if
(
!
account
.
transport_
)
{
// if this transport already exists, reuse it
std
::
string
key
(
transportMapKey
(
account
.
getLocalInterface
(),
account
.
getLocalPort
()));
DEBUG
(
"Looking into previously created transport map for"
" %s"
,
key
.
c_str
());
// Could not create new transport, this transport may already exists
std
::
map
<
std
::
string
,
pjsip_transport
*>::
iterator
iter
=
transportMap_
.
find
(
key
);
if
(
iter
!=
transportMap_
.
end
())
{
account
.
transport_
=
iter
->
second
;
pjsip_transport_add_ref
(
account
.
transport_
);
}
else
if
(
account
.
isTlsEnabled
())
{
}
else
account
.
transport_
=
createUdpTransport
(
account
.
getLocalInterface
(),
account
.
getLocalPort
());
}
if
(
!
account
.
transport_
)
{
if
(
account
.
isTlsEnabled
())
throw
std
::
runtime_error
(
"Could not create TLS connection"
);
}
else
{
else
throw
std
::
runtime_error
(
"Could not create new UDP transport"
);
}
}
}
pjsip_transport
*
SipTransport
::
createUdpTransport
(
const
std
::
string
&
interface
,
unsigned
int
port
)
...
...
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