From 6c4b6d2da45980a2575c4a122ddb59c971b97c5d Mon Sep 17 00:00:00 2001
From: Stefan Sayer <stefan.sayer@googlemail.com>
Date: Fri, 17 Nov 2006 16:17:27 +0000
Subject: [PATCH] added cseq to onSendRequest function of SessionEventHandler
 API

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@123 8eb893ce-cfd4-0310-b710-fb5ebe64c474
---
 core/AmSession.cpp                          | 10 ++++++----
 core/AmSession.h                            |  6 ++++--
 core/AmSipDialog.cpp                        |  2 +-
 core/AmSipDialog.h                          |  3 ++-
 core/plug-in/session_timer/SessionTimer.cpp |  3 ++-
 core/plug-in/session_timer/SessionTimer.h   |  3 ++-
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/core/AmSession.cpp b/core/AmSession.cpp
index 24211cc5..656dc950 100644
--- a/core/AmSession.cpp
+++ b/core/AmSession.cpp
@@ -72,7 +72,8 @@ bool AmSessionEventHandler::onSipReply(const AmSipReply& reply)
 bool AmSessionEventHandler::onSendRequest(const string& method, 
 					  const string& content_type,
 					  const string& body,
-					  string& hdrs)
+					  string& hdrs,
+					  unsigned int cseq)
 {
     return false;
 }
@@ -144,7 +145,8 @@ void AmSession::setCallgroup(const string& cg) {
 
 void AmSession::addHandler(AmSessionEventHandler* sess_evh)
 {
-    ev_handlers.push_back(sess_evh);
+	if (sess_evh != NULL)
+		ev_handlers.push_back(sess_evh);
 }
 
 void AmSession::setInput(AmAudio* in)
@@ -636,9 +638,9 @@ int AmSession::acceptAudio(const string& body,
 // }
 
 void AmSession::onSendRequest(const string& method, const string& content_type,
-			      const string& body, string& hdrs)
+			      const string& body, string& hdrs, unsigned int cseq)
 {
-    CALL_EVENT_H(onSendRequest,method,content_type,body,hdrs);
+    CALL_EVENT_H(onSendRequest,method,content_type,body,hdrs,cseq);
 }
 
 void AmSession::onSendReply(const AmSipRequest& req, unsigned int  code, 
diff --git a/core/AmSession.h b/core/AmSession.h
index 2ab96225..158d9f49 100644
--- a/core/AmSession.h
+++ b/core/AmSession.h
@@ -79,7 +79,8 @@ public:
     virtual bool onSendRequest(const string& method, 
 			       const string& content_type,
 			       const string& body,
-			       string& hdrs);
+			       string& hdrs,
+				   unsigned int cseq);
 
     virtual bool onSendReply(const AmSipRequest& req,
 			     unsigned int  code,
@@ -344,7 +345,8 @@ public:
     virtual void onSendRequest(const string& method,
 			       const string& content_type,
 			       const string& body,
-			       string& hdrs);
+			       string& hdrs,
+				   unsigned int cseq);
 
     virtual void onSendReply(const AmSipRequest& req,
 			     unsigned int  code,
diff --git a/core/AmSipDialog.cpp b/core/AmSipDialog.cpp
index 213ae16f..9c7dece5 100644
--- a/core/AmSipDialog.cpp
+++ b/core/AmSipDialog.cpp
@@ -422,7 +422,7 @@ int AmSipDialog::sendRequest(const string& method,
     string m_hdrs = hdrs;
 
     if(hdl)
-	hdl->onSendRequest(method,content_type,body,m_hdrs);
+	hdl->onSendRequest(method,content_type,body,m_hdrs,cseq);
 
     msg = ":t_uac_dlg:" + AmConfig::ReplySocketName + "\n"
 	+ method + "\n"
diff --git a/core/AmSipDialog.h b/core/AmSipDialog.h
index 5dc2ae27..97939502 100644
--- a/core/AmSipDialog.h
+++ b/core/AmSipDialog.h
@@ -43,7 +43,8 @@ public:
     virtual void onSendRequest(const string& method,
 			       const string& content_type,
 			       const string& body,
-			       string& hdrs)=0;
+			       string& hdrs,
+				   unsigned int cseq)=0;
 
     virtual void onSendReply(const AmSipRequest& req,
 			     unsigned int  code,
diff --git a/core/plug-in/session_timer/SessionTimer.cpp b/core/plug-in/session_timer/SessionTimer.cpp
index 4630656b..af7f8ddf 100644
--- a/core/plug-in/session_timer/SessionTimer.cpp
+++ b/core/plug-in/session_timer/SessionTimer.cpp
@@ -62,7 +62,8 @@ bool SessionTimer::onSipReply(const AmSipReply& reply)
 bool SessionTimer::onSendRequest(const string& method, 
 				 const string& content_type,
 				 const string& body,
-				 string& hdrs)
+				 string& hdrs,
+				 unsigned int cseq)
 {
 //   if (!session_timer_conf.getEnableSessionTimer())
 //     return "";
diff --git a/core/plug-in/session_timer/SessionTimer.h b/core/plug-in/session_timer/SessionTimer.h
index 1421786c..04b57bfb 100644
--- a/core/plug-in/session_timer/SessionTimer.h
+++ b/core/plug-in/session_timer/SessionTimer.h
@@ -76,7 +76,8 @@ public:
     virtual bool onSendRequest(const string& method, 
 			       const string& content_type,
 			       const string& body,
-			       string& hdrs);
+			       string& hdrs,
+				   unsigned int cseq);
 
     virtual bool onSendReply(const AmSipRequest& req,
 			     unsigned int  code,