r3338 - trunk/libminisip/source/subsystem_signaling/sip

[erik at minisip.org]

Author: erik
Date: 2007-06-27 13:47:20 +0200 (Wed, 27 Jun 2007)
New Revision: 3338

Modified:
   trunk/libminisip/source/subsystem_signaling/sip/DefaultDialogHandler.cxx
Log:

 * MSRP support was assumed in the default dialog. Also, the code to
   determine if it is a file transfer or a audio/video call is missing 
   ( if (true) )



Modified: trunk/libminisip/source/subsystem_signaling/sip/DefaultDialogHandler.cxx
===================================================================
--- trunk/libminisip/source/subsystem_signaling/sip/DefaultDialogHandler.cxx	2007-06-27 11:19:44 UTC (rev 3337)
+++ trunk/libminisip/source/subsystem_signaling/sip/DefaultDialogHandler.cxx	2007-06-27 11:47:20 UTC (rev 3338)
@@ -47,8 +47,6 @@
 #include<libminisip/signaling/sip/SipDialogConfVoip.h>
 #include<libminisip/signaling/sip/SipDialogPresenceClient.h>
 #include<libminisip/signaling/sip/SipDialogPresenceServer.h>
-#include"SipDialogFileTransferClient.h"
-#include"SipDialogFileTransferServer.h"
 #include<libminisip/signaling/conference/ConfMessageRouter.h>
 
 #ifdef _WIN32_WCE
@@ -60,6 +58,12 @@
 #	include<libminisip/signaling/p2t/SipDialogP2Tuser.h>
 #endif
 
+#ifdef MSRP_SUPPORT
+#include"SipDialogFileTransferClient.h"
+#include"SipDialogFileTransferServer.h"
+#endif
+
+
 #include<libminisip/media/MediaHandler.h>
 
 
@@ -227,6 +231,7 @@
 			sipStack->enqueueCommand(cmd, HIGH_PRIO_QUEUE );
 			mdbg("signaling/sip") << cmd << endl;
 		}else{
+#ifdef MSRP_SUPPORT
 			//...extract something you need for the test...
 			if  (/*invite contains file transfer session*/ true){
 
@@ -237,7 +242,9 @@
 				sipStack->addDialog( ftransf );
 				SipSMCommand cmd(pkt, SipSMCommand::transaction_layer, SipSMCommand::dialog_layer);
 				sipStack->enqueueCommand(cmd, HIGH_PRIO_QUEUE );
-			}else{
+			}else
+#endif
+			{
 				MRef<SipIdentity *> id = lookupTarget(inv->getUri());
 
 				// get a session from the mediaHandler
@@ -342,7 +349,7 @@
 		return true;
 	}
 
-
+#ifdef MSRP_SUPPORT
 	if (cmdstr.getOp() == "start_filetransfer"){
 		cerr << "DefaultDialogHandler: Creating SipDialogFileTransferClient for start_filetransfer_client command"<< endl;
 		
@@ -359,6 +366,7 @@
 
 		return true;
 	}
+#endif
 
 	
 	if (cmdstr.getOp() == SipCommandString::start_presence_server){