Module: sems
Branch: master
Commit: c2607f4349604e4f6cd17273acfe2368a839b2ee
URL:    
http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=c2607f4349604e4f6cd17273acfe2368a839b2ee

Author: Stefan Sayer <[email protected]>
Committer: Stefan Sayer <[email protected]>
Date:   Thu Feb 10 05:17:40 2011 +0100

better debug log: status before and after process

---

 core/AmSession.cpp   |   13 ++++++++++---
 core/AmSession.h     |    2 +-
 core/AmSipDialog.cpp |    5 +++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/core/AmSession.cpp b/core/AmSession.cpp
index fd7964f..a149db9 100644
--- a/core/AmSession.cpp
+++ b/core/AmSession.cpp
@@ -56,7 +56,6 @@ AmMutex AmSession::session_num_mut;
 
 // AmSession methods
 
-
 AmSession::AmSession()
   : AmEventQueue(this),
     dlg(this),
@@ -428,6 +427,13 @@ bool AmSession::processEventsCatchExceptions() {
     this should be called until it returns false. */
 bool AmSession::processingCycle() {
 
+  DBG("%s/%s vv %c, %s, %s, %i UACTransPending\n",
+      dlg.callid.c_str(),getLocalTag().c_str(),
+      processing_status == SESSION_PROCESSING_EVENTS ? 'P':'W',
+      AmSipDialog::status2str[dlg.getStatus()],
+      sess_stopped.get()?"stopped":"running",
+      dlg.getUACTransPending());
+
   switch (processing_status) {
   case SESSION_PROCESSING_EVENTS: 
     {
@@ -440,8 +446,9 @@ bool AmSession::processingCycle() {
       int dlg_status = dlg.getStatus();
       bool s_stopped = sess_stopped.get();
       
-      DBG("%s/%s: %s, %s, %i UACTransPending\n",
-         dlg.callid.c_str(),getLocalTag().c_str(), 
+      DBG("%s/%s ^^ %c, %s, %s, %i UACTransPending\n",
+         dlg.callid.c_str(),getLocalTag().c_str(),
+         processing_status == SESSION_PROCESSING_EVENTS ? 'P':'W',
          AmSipDialog::status2str[dlg_status],
          s_stopped?"stopped":"running",
          dlg.getUACTransPending());
diff --git a/core/AmSession.h b/core/AmSession.h
index 90f00d1..0f30c69 100644
--- a/core/AmSession.h
+++ b/core/AmSession.h
@@ -101,7 +101,7 @@ private:
   bool m_dtmfDetectionEnabled;
 
   enum ProcessingStatus { 
-    SESSION_PROCESSING_EVENTS,
+    SESSION_PROCESSING_EVENTS = 0,
     SESSION_WAITING_DISCONNECTED,
     SESSION_ENDED_DISCONNECTED
   };
diff --git a/core/AmSipDialog.cpp b/core/AmSipDialog.cpp
index 4f0e9e2..59f6c9d 100644
--- a/core/AmSipDialog.cpp
+++ b/core/AmSipDialog.cpp
@@ -81,7 +81,7 @@ void AmSipDialog::setStatus(int new_status) {
 
 void AmSipDialog::updateStatus(const AmSipRequest& req)
 {
-  DBG("AmSipDialog::updateStatus(request)\n");
+  DBG("AmSipDialog::updateStatus(req = %s)\n", req.method.c_str());
 
   if ((req.method == "ACK") || (req.method == "CANCEL")) {
     if(hdl)
@@ -294,7 +294,8 @@ void AmSipDialog::updateStatus(const AmSipReply& reply)
         ((AmSipReply)reply).print().c_str());
     return;
   }
-  DBG("updateStatus(reply): transaction found!\n");
+  DBG("updateStatus(rep = %u %s): transaction found!\n",
+      reply.code, reply.reason.c_str());
 
   AmSipTransaction& t = t_it->second;
   int old_dlg_status = status;

_______________________________________________
Semsdev mailing list
[email protected]
http://lists.iptel.org/mailman/listinfo/semsdev

Reply via email to