From 49b9893bbe50780ddaf7d9b5500ef5e798f59072 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?=
<rafael.carre@savoirfairelinux.com>
Date: Mon, 19 Sep 2011 13:51:23 -0400
Subject: [PATCH] Fix account registration on start
---
daemon/src/sip/sipvoiplink.cpp | 22 ++++++++++------------
daemon/src/sip/sipvoiplink.h | 5 -----
2 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/daemon/src/sip/sipvoiplink.cpp b/daemon/src/sip/sipvoiplink.cpp
index a9a3b3d9f3..dd2d87fa77 100644
--- a/daemon/src/sip/sipvoiplink.cpp
+++ b/daemon/src/sip/sipvoiplink.cpp
@@ -284,19 +284,17 @@ void SIPVoIPLink::sendRegister (Account *a)
pjsip_transport_dec_ref(account->transport);
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->setRegistrationState (Trying);
diff --git a/daemon/src/sip/sipvoiplink.h b/daemon/src/sip/sipvoiplink.h
index 4b64720bd5..37aeba028f 100644
--- a/daemon/src/sip/sipvoiplink.h
+++ b/daemon/src/sip/sipvoiplink.h
@@ -350,11 +350,6 @@ class SIPVoIPLink : public VoIPLink
*/
EventThread *evThread_;
- /**
- * Global mutex for the sip voiplink
- */
- ost::Mutex mutexSIP_;
-
friend class SIPTest;
};
--
GitLab