From cadbcdeed835451a53ec78dc0716172e5b07e520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Tue, 6 Jan 2015 15:39:55 -0500
Subject: [PATCH] ringdht: log cleanup
Refs #63196
Change-Id: I8c856f7718c591cf3680e3cd6bc4896d041d0493
---
daemon/src/ringdht/ringaccount.cpp | 5 +----
daemon/src/sip/sipvoiplink.cpp | 4 +++-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/daemon/src/ringdht/ringaccount.cpp b/daemon/src/ringdht/ringaccount.cpp
index e405c0a4b7..cfc1e55e5b 100644
--- a/daemon/src/ringdht/ringaccount.cpp
+++ b/daemon/src/ringdht/ringaccount.cpp
@@ -629,10 +629,8 @@ void RingAccount::doRegister()
continue;
auto res = this_.treatedCalls_.insert(v->id);
this_.saveTreatedCalls();
- if (!res.second) {
- SFL_DBG("Ignoring already treated incomming call");
+ if (!res.second)
continue;
- }
auto from = v->owner.getId().toString();
auto from_vid = v->id;
auto reply_vid = from_vid+1;
@@ -670,7 +668,6 @@ void RingAccount::doRegister()
call->getIceTransport()->start(v->data);
call->setPeerNumber(from);
call->initRecFilename(from);
- SFL_WARN("Pushing pending call with peer %s", from.c_str());
this_.pendingCalls_.push_back(call);
return true;
} catch (const std::exception& e) {
diff --git a/daemon/src/sip/sipvoiplink.cpp b/daemon/src/sip/sipvoiplink.cpp
index 7bea74cee8..8ab28ca1ce 100644
--- a/daemon/src/sip/sipvoiplink.cpp
+++ b/daemon/src/sip/sipvoiplink.cpp
@@ -842,8 +842,10 @@ invite_session_state_changed_cb(pjsip_inv_session *inv, pjsip_event *ev)
return;
auto call_ptr = static_cast<SIPCall*>(inv->mod_data[mod_ua_.id]);
- if (!call_ptr)
+ if (!call_ptr) {
+ SFL_WARN("invite_session_state_changed_cb: can't find related call");
return;
+ }
auto call = std::static_pointer_cast<SIPCall>(call_ptr->shared_from_this());
if (ev and inv->state != PJSIP_INV_STATE_CONFIRMED) {
--
GitLab