Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
49b9893b
Commit
49b9893b
authored
Sep 19, 2011
by
Rafaël Carré
Browse files
Fix account registration on start
parent
e789603e
Changes
2
Hide whitespace changes
Inline
Side-by-side
daemon/src/sip/sipvoiplink.cpp
View file @
49b9893b
...
@@ -284,19 +284,17 @@ void SIPVoIPLink::sendRegister (Account *a)
...
@@ -284,19 +284,17 @@ void SIPVoIPLink::sendRegister (Account *a)
pjsip_transport_dec_ref
(
account
->
transport
);
pjsip_transport_dec_ref
(
account
->
transport
);
createSipTransport
(
account
);
createSipTransport
(
account
);
if
(
account
->
transport
)
return
;
// Could not create new transport, this transport may already exists
account
->
transport
=
transportMap_
[
account
->
getLocalPort
()];
if
(
account
->
transport
)
{
pjsip_transport_add_ref
(
account
->
transport
);
}
else
{
account
->
transport
=
_localUDPTransport
;
account
->
setLocalPort
(
_localUDPTransport
->
local_name
.
port
);
}
ost
::
MutexLock
m
(
mutexSIP_
);
if
(
!
account
->
transport
)
{
// Could not create new transport, this transport may already exists
account
->
transport
=
transportMap_
[
account
->
getLocalPort
()];
if
(
account
->
transport
)
{
pjsip_transport_add_ref
(
account
->
transport
);
}
else
{
account
->
transport
=
_localUDPTransport
;
account
->
setLocalPort
(
_localUDPTransport
->
local_name
.
port
);
}
}
account
->
setRegister
(
true
);
account
->
setRegister
(
true
);
account
->
setRegistrationState
(
Trying
);
account
->
setRegistrationState
(
Trying
);
...
...
daemon/src/sip/sipvoiplink.h
View file @
49b9893b
...
@@ -350,11 +350,6 @@ class SIPVoIPLink : public VoIPLink
...
@@ -350,11 +350,6 @@ class SIPVoIPLink : public VoIPLink
*/
*/
EventThread
*
evThread_
;
EventThread
*
evThread_
;
/**
* Global mutex for the sip voiplink
*/
ost
::
Mutex
mutexSIP_
;
friend
class
SIPTest
;
friend
class
SIPTest
;
};
};
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment