Merge remote-tracking branch 'frafos/sayer/1.4-spce3.0'

apps/sbc/SBC.cpp

@@ -1339,7 +1339,7 @@ void SBCCalleeSession::onSipReply(const AmSipReply& reply, int old_dlg_status,
 
   // update call registry (unfortunately has to be done always -
   // not possible to determine if learned in this reply)
-  if (!dlg.remote_tag.empty()) {
+  if (!dlg.remote_tag.empty() && reply.code >= 200 && trans_method == SIP_METH_INVITE) {
     SBCCallRegistry::updateCall(other_id, dlg.remote_tag);
   }
 

apps/sbc/SBCCallRegistry.cpp

@@ -34,7 +34,7 @@ void SBCCallRegistry::addCall(const string& ltag, const SBCCallRegistryEntry& ot
   registry[ltag] = other_dlg;
   registry_mutex.unlock();
 
-  DBG("SBCCallRegistry: Added call '%s' - mapped to: '%s'\n", ltag.c_str(), other_dlg.ltag.c_str());
+  DBG("SBCCallRegistry: Added call '%s' - mapped to: '%s'/'%s'/'%s'\n", ltag.c_str(), other_dlg.ltag.c_str(), other_dlg.rtag.c_str(), other_dlg.callid.c_str());
 }
 
 void SBCCallRegistry::updateCall(const string& ltag, const string& other_rtag) {