From a4c9cb1ced9af2549e0ebdeae96d00438d4fb030 Mon Sep 17 00:00:00 2001
From: Stefan Sayer <stefan.sayer@googlemail.com>
Date: Wed, 15 Jul 2009 14:13:28 +0000
Subject: [PATCH] port of r1470:    - also support compact form of Event header
 (o)    - strip header parameters before checking for subscription type    -
 support remote hangup before REFER succeeded

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1472 8eb893ce-cfd4-0310-b710-fb5ebe64c474
---
 apps/announce_transfer/AnnounceTransfer.cpp | 30 ++++++++++++++-------
 apps/announce_transfer/AnnounceTransfer.h   |  3 ++-
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/apps/announce_transfer/AnnounceTransfer.cpp b/apps/announce_transfer/AnnounceTransfer.cpp
index 9a2d552d..b868ec07 100644
--- a/apps/announce_transfer/AnnounceTransfer.cpp
+++ b/apps/announce_transfer/AnnounceTransfer.cpp
@@ -136,15 +136,18 @@ void AnnounceTransferDialog::onSipRequest(const AmSipRequest& req)
 {
   AmSession::onSipRequest(req);
 
-  if((status == Transfering) && 
+  if((status == Transfering || status == Hangup) && 
      (req.method == "NOTIFY")) {
     try {
 
-      if (getHeader(req.hdrs,"Event") != "refer") 
+      if (strip_header_params(getHeader(req.hdrs,"Event", "o")) != "refer") 
 	throw AmSession::Exception(481, "Subscription does not exist");
 
       if ((strip_header_params(req.content_type) != "message/sipfrag"))
 	throw AmSession::Exception(415, "Unsupported Media Type");
+
+      if (req.body.length()<8)
+	throw AmSession::Exception(400, "Short Body");
 			
       string sipfrag_sline = req.body.substr(8, req.body.find("\n") - 8);
       DBG("extracted start line from sipfrag '%s'\n", sipfrag_sline.c_str());
@@ -158,13 +161,16 @@ void AnnounceTransferDialog::onSipRequest(const AmSipRequest& req)
       }
 
       if ((code >= 200)&&(code < 300)) {
-	status = Hangup;
-	DBG("refer succeeded... stopSession\n");
-	dlg.bye();
+	if (status != Hangup) {
+	  status = Hangup;
+	  dlg.bye();
+	}
+	DBG("refer succeeded... stop session\n");
 	setStopped();
       } else if (code > 300) {
 	DBG("refer failed...\n");
-	dlg.bye();
+	if (status != Hangup) 
+	  dlg.bye();
 	setStopped();
       }
       dlg.reply(req, 200, "OK", "", "");
@@ -176,7 +182,7 @@ void AnnounceTransferDialog::onSipRequest(const AmSipRequest& req)
 }
 
 void AnnounceTransferDialog::onSipReply(const AmSipReply& rep) {
-  if (status==Transfering && 
+  if ((status==Transfering ||status==Hangup)  && 
       dlg.get_uac_trans_method(rep.cseq) == "REFER") {
     if (rep.code >= 300) {
       DBG("refer not accepted, stop session.\n");
@@ -190,8 +196,14 @@ void AnnounceTransferDialog::onSipReply(const AmSipReply& rep) {
 
 void AnnounceTransferDialog::onBye(const AmSipRequest& req)
 {
-  DBG("onBye: stopSession\n");
-  setStopped();
+  if (status == Transfering) {
+    // don't stop session, wait for remote side REFER status 
+    // (dialog stays open for the subscription created by REFER)
+    status = Hangup; 
+  } else {
+    DBG("onBye: stopSession\n");
+    setStopped();
+  }
 }
 
 void AnnounceTransferDialog::process(AmEvent* event)
diff --git a/apps/announce_transfer/AnnounceTransfer.h b/apps/announce_transfer/AnnounceTransfer.h
index 9b75756f..2f734f52 100644
--- a/apps/announce_transfer/AnnounceTransfer.h
+++ b/apps/announce_transfer/AnnounceTransfer.h
@@ -62,7 +62,8 @@ class AnnounceTransferDialog : public AmSession
   enum  { Disconnected = 0,
 	  Announcing,
 	  Transfering,
-	  Hangup } AnnounceStatus; 
+	  Hangup        // remote hangup 
+  } AnnounceStatus; 
 public:
   AnnounceTransferDialog(const string& filename);
   ~AnnounceTransferDialog();