r2722 - in trunk/libmsip/source: dialogs transactions

erik at minisip.org erik at minisip.org
Wed Aug 23 07:00:54 CEST 2006


Author: erik
Date: 2006-08-23 07:00:52 +0200 (Wed, 23 Aug 2006)
New Revision: 2722

Modified:
   trunk/libmsip/source/dialogs/SipDialog.cxx
   trunk/libmsip/source/dialogs/SipDialogManagement.cxx
   trunk/libmsip/source/dialogs/SipDialogRegister.cxx
   trunk/libmsip/source/transactions/SipTransactionInviteClient.cxx
   trunk/libmsip/source/transactions/SipTransactionInviteServer.cxx
   trunk/libmsip/source/transactions/SipTransactionNonInviteClient.cxx
   trunk/libmsip/source/transactions/SipTransactionNonInviteServer.cxx
Log:

 * Cleaning up: Removed commented out code.



Modified: trunk/libmsip/source/dialogs/SipDialog.cxx
===================================================================
--- trunk/libmsip/source/dialogs/SipDialog.cxx	2006-08-23 04:48:05 UTC (rev 2721)
+++ trunk/libmsip/source/dialogs/SipDialog.cxx	2006-08-23 05:00:52 UTC (rev 2722)
@@ -103,7 +103,7 @@
 			// transactions), and can be placed in the end of the queue. 
 			// It is placed in the high prio queue so that it is guaranteed 
 			// to be deleted even under high load.
-			dispatcher->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/); 
+			dispatcher->enqueueCommand(cmd, HIGH_PRIO_QUEUE); 
 		}
 	}
 }

Modified: trunk/libmsip/source/dialogs/SipDialogManagement.cxx
===================================================================
--- trunk/libmsip/source/dialogs/SipDialogManagement.cxx	2006-08-23 04:48:05 UTC (rev 2721)
+++ trunk/libmsip/source/dialogs/SipDialogManagement.cxx	2006-08-23 05:00:52 UTC (rev 2722)
@@ -67,7 +67,7 @@
 		SipSMCommand cmd( CommandString( "", SipCommandString::terminate_all_calls),
 			SipSMCommand::dispatcher,
 			SipSMCommand::dispatcher);
-		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
+		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 		ret = true;
 	} else {
 		ret = false;
@@ -117,7 +117,7 @@
 		SipSMCommand cmd( CommandString( "", SipCommandString::unregister_all_identities),
 			SipSMCommand::dispatcher,
 			SipSMCommand::dispatcher);
-		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
+		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 		ret = true;
 	} else {
 		ret = false;
@@ -136,7 +136,7 @@
 		SipSMCommand cmd( CommandString( "", SipCommandString::unregister_all_identities),
 			SipSMCommand::dispatcher,
 			SipSMCommand::dispatcher);
-		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
+		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 		ret = true;
 	} else {
 		ret = false;
@@ -299,7 +299,7 @@
 		SipSMCommand cmd( CommandString( "", SipCommandString::unregister_all_identities),
 			SipSMCommand::dispatcher,
 			SipSMCommand::dispatcher);
-		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
+		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 		ret = true;
 	} else {
 		ret = false;
@@ -710,7 +710,7 @@
 		SipSMCommand cmd( CommandString( (*it)->dialogState.callId, SipCommandString::hang_up),
 				SipSMCommand::dialog_layer,
 				SipSMCommand::dialog_layer);
-		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
+		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 		pendingHangUps++;
 		merr << "    - Hanging up " << (*it)->dialogState.remoteUri << end;
 	}
@@ -720,7 +720,7 @@
 		SipSMCommand cmd( CommandString( "", SipCommandString::terminate_all_calls_done),
 				SipSMCommand::dispatcher,
 				SipSMCommand::dispatcher);
-		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
+		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 	}
 	return true;
 }
@@ -732,7 +732,7 @@
 		SipSMCommand cmd( CommandString( "", SipCommandString::terminate_all_calls_done),
 				SipSMCommand::dispatcher,
 				SipSMCommand::dispatcher);
-		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
+		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 	}
 	return true;
 }
@@ -762,7 +762,7 @@
 		SipSMCommand cmd( cmdstr,
 				SipSMCommand::dialog_layer,
 				SipSMCommand::dialog_layer);
-		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
+		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 		pendingDeRegs++;
 		merr << "    De-registration request sent (username = " << 
 			(*it)->getDialogConfig()->inherited->sipIdentity->getSipUri() << ")" << end;
@@ -773,7 +773,7 @@
 		SipSMCommand cmd( CommandString( "", SipCommandString::unregister_all_identities_done),
 				SipSMCommand::dispatcher,
 				SipSMCommand::dispatcher);
-		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
+		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 	}
 	return true;
 }
@@ -804,7 +804,7 @@
 		SipSMCommand cmd( cmdstr,
 				SipSMCommand::dialog_layer,
 				SipSMCommand::dialog_layer);
-		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
+		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 		pendingDeRegs++;
 		merr << "    Registration request sent (username = " << 
 			(*it)->getDialogConfig()->inherited->sipIdentity->getSipUri() << ")" << end;
@@ -815,7 +815,7 @@
 		SipSMCommand cmd( CommandString( "", SipCommandString::unregister_all_identities_done),
 				SipSMCommand::dispatcher,
 				SipSMCommand::dispatcher);
-		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
+		sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 	}
 	return true;
 }
@@ -830,13 +830,13 @@
 			SipSMCommand cmd( CommandString( "", SipCommandString::unregister_all_identities_done),
 				SipSMCommand::dispatcher,
 				SipSMCommand::dispatcher);
-			sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
+			sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 		} else {
 			merr << "    REGISTER: all identities have been registered correctly!" << end;
 			SipSMCommand cmd( CommandString( "", SipCommandString::register_all_identities_done),
 				SipSMCommand::dispatcher,
 				SipSMCommand::dispatcher);
-			sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
+			sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 		}
 	}
 	return true;
@@ -865,6 +865,6 @@
 		CommandString( "", SipCommandString::sip_stack_shutdown_done),
 		SipSMCommand::dispatcher, 
 		SipSMCommand::dispatcher);
-	sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
+	sipStack->getDispatcher()->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 	return true;
 }

Modified: trunk/libmsip/source/dialogs/SipDialogRegister.cxx
===================================================================
--- trunk/libmsip/source/dialogs/SipDialogRegister.cxx	2006-08-23 04:48:05 UTC (rev 2721)
+++ trunk/libmsip/source/dialogs/SipDialogRegister.cxx	2006-08-23 05:00:52 UTC (rev 2722)
@@ -154,7 +154,7 @@
 		
 		//this is for the shutdown dialog 
 		SipSMCommand cmd( cmdstr, SipSMCommand::dialog_layer, SipSMCommand::dispatcher );
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/ ); 
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE ); 
 
 		//request a timeout to retx a proxy_register only if we are registered ... 
 		//otherwise we would just be unregistering every now and then ...
@@ -305,7 +305,7 @@
 		}		
 		//this is for the shutdown dialog 
 		SipSMCommand cmd( cmdstr, SipSMCommand::dialog_layer, SipSMCommand::dispatcher );
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/ ); 
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE ); 
 		
 		//requestTimeout(1000*60*14,SipCommandString::proxy_register);
 		//request a timeout to retx a proxy_register only if we are registered ... 
@@ -369,7 +369,7 @@
 		}
 		//this is for the shutdown dialog 
 		SipSMCommand cmd( cmdstr, SipSMCommand::dialog_layer, SipSMCommand::dispatcher );
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/ ); 
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE ); 
 		
 		//requestTimeout(1000*60*14,SipCommandString::proxy_register);
 		//request a timeout to retx a proxy_register only if we are registered ... 
@@ -483,7 +483,7 @@
 				SipSMCommand::dialog_layer,
 				SipSMCommand::dispatcher);
 		
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE );
 
 		return true;
 	}else{
@@ -707,6 +707,6 @@
 	addRoute( reg );
 
 	SipSMCommand cmd(*reg, SipSMCommand::dialog_layer, SipSMCommand::transaction_layer);
-	dispatcher->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
+	dispatcher->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 }
 

Modified: trunk/libmsip/source/transactions/SipTransactionInviteClient.cxx
===================================================================
--- trunk/libmsip/source/transactions/SipTransactionInviteClient.cxx	2006-08-23 04:48:05 UTC (rev 2721)
+++ trunk/libmsip/source/transactions/SipTransactionInviteClient.cxx	2006-08-23 05:00:52 UTC (rev 2722)
@@ -172,7 +172,7 @@
 				command.getCommandPacket(), 
 				SipSMCommand::transaction_layer, 
 				SipSMCommand::dialog_layer);
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE );
 		
 		MRef<SipResponse*> resp =(SipResponse *)*command.getCommandPacket();
 		
@@ -207,7 +207,7 @@
 		SipSMCommand cmd( command.getCommandPacket(), 
 				SipSMCommand::transaction_layer, 
 				SipSMCommand::dialog_layer);
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE );
 		
 		//assert(dialog);
 		//TODO/XXX/FIXME: Do this in the TU instead
@@ -243,13 +243,13 @@
 			SipSMCommand::dialog_layer
 			);
 
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE );
 
 		SipSMCommand cmdterminated(
 				CommandString( callId, SipCommandString::transaction_terminated),
 				SipSMCommand::transaction_layer,
 				SipSMCommand::dispatcher);
-		dispatcher->enqueueCommand( cmdterminated, HIGH_PRIO_QUEUE/*, PRIO_FIRST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmdterminated, HIGH_PRIO_QUEUE );
 
 		return true;
 	}else{
@@ -271,7 +271,7 @@
 		SipSMCommand cmd( command.getCommandPacket(), 
 				SipSMCommand::transaction_layer, 
 				SipSMCommand::dialog_layer);
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE );
 
 
 		//FIXME/XXX/TODO: Implement setDialogRouteSet in TU instead
@@ -287,7 +287,7 @@
 			CommandString( callId, SipCommandString::transaction_terminated),
 			SipSMCommand::transaction_layer,
 			SipSMCommand::dispatcher);
-		dispatcher->enqueueCommand( cmdterminated, HIGH_PRIO_QUEUE/*, PRIO_FIRST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmdterminated, HIGH_PRIO_QUEUE );
 
 		return true;
 	}else{
@@ -308,7 +308,7 @@
 
 		MRef<SipResponse*> resp = (SipResponse *)*command.getCommandPacket();
 
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE );
 		
 		//assert(dialog);
 		//TODO/XXX/FIXME: Do this in the TU instead
@@ -337,7 +337,7 @@
 		SipSMCommand cmd( command.getCommandPacket(), 
 				SipSMCommand::transaction_layer, 
 				SipSMCommand::dialog_layer);
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE );
 
 		//update dialogs route set ... needed to add route headers to the ACK we are going to send
 		//setDialogRouteSet( (SipResponse*)*command.getCommandPacket() ); 
@@ -349,7 +349,7 @@
 			CommandString( callId, SipCommandString::transaction_terminated),
 			SipSMCommand::transaction_layer,
 			SipSMCommand::dispatcher);
-		dispatcher->enqueueCommand( cmdterminated, HIGH_PRIO_QUEUE/*, PRIO_FIRST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmdterminated, HIGH_PRIO_QUEUE );
 	
 		return true;
 	}else{
@@ -376,7 +376,7 @@
 		SipSMCommand cmd( command.getCommandPacket(), 
 				SipSMCommand::transaction_layer, 
 				SipSMCommand::dialog_layer);
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE );
 		
 		//assert(dialog);
 		//IN TU instead TODO/XXX/FIXME
@@ -417,13 +417,13 @@
 		SipSMCommand cmd( CommandString( callId, SipCommandString::transport_error), 
 				SipSMCommand::transaction_layer, 
 				SipSMCommand::dialog_layer);
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE );
 
 		SipSMCommand cmdterminated(
 				CommandString( callId, SipCommandString::transaction_terminated),
 				SipSMCommand::transaction_layer,
 				SipSMCommand::dispatcher);
-		dispatcher->enqueueCommand( cmdterminated, HIGH_PRIO_QUEUE/*, PRIO_FIRST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmdterminated, HIGH_PRIO_QUEUE );
 		
 		return true;
 	}else{
@@ -441,7 +441,7 @@
 		    CommandString( callId, SipCommandString::transaction_terminated),
 		    SipSMCommand::transaction_layer,
 		    SipSMCommand::dispatcher);
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_FIRST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE );
 		return true;
 	}else{
 	    return false;

Modified: trunk/libmsip/source/transactions/SipTransactionInviteServer.cxx
===================================================================
--- trunk/libmsip/source/transactions/SipTransactionInviteServer.cxx	2006-08-23 04:48:05 UTC (rev 2721)
+++ trunk/libmsip/source/transactions/SipTransactionInviteServer.cxx	2006-08-23 05:00:52 UTC (rev 2722)
@@ -113,7 +113,7 @@
 		cmd.setSource(SipSMCommand::transaction_layer);
 		cmd.setDestination(SipSMCommand::dialog_layer);
 //		cmd.setSource(SipSMCommand::transaction);
-		dispatcher->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
+		dispatcher->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 		
 		//update dialogs route set ... needed to add route headers to the ACK we are going to send
 		
@@ -233,13 +233,13 @@
 		SipSMCommand cmd( CommandString(callId, SipCommandString::transport_error), 
 				SipSMCommand::transaction_layer, 
 				SipSMCommand::dialog_layer);
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE );
 
 		SipSMCommand cmdterminated(
 				CommandString( callId, SipCommandString::transaction_terminated),
 				SipSMCommand::transaction_layer,
 				SipSMCommand::dispatcher);
-		dispatcher->enqueueCommand( cmdterminated, HIGH_PRIO_QUEUE/*, PRIO_FIRST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmdterminated, HIGH_PRIO_QUEUE );
 		return true;
 	}else{
 		return false;
@@ -268,7 +268,7 @@
 				CommandString( callId, SipCommandString::transaction_terminated),
 				SipSMCommand::transaction_layer,
 				SipSMCommand::dispatcher);
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_FIRST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE );
 		return true;
 	}else{
 		return false;
@@ -364,13 +364,13 @@
 				SipSMCommand::transaction_layer, 
 				SipSMCommand::dialog_layer);
 
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE );
 
 		SipSMCommand cmdterminated(
 				CommandString( callId, SipCommandString::transaction_terminated),
 				SipSMCommand::transaction_layer,
 				SipSMCommand::dispatcher);
-		dispatcher->enqueueCommand( cmdterminated, HIGH_PRIO_QUEUE/*, PRIO_FIRST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmdterminated, HIGH_PRIO_QUEUE );
 
 		return true;
 	}else{
@@ -392,7 +392,7 @@
 				CommandString( callId, SipCommandString::transaction_terminated),
 				SipSMCommand::transaction_layer,
 				SipSMCommand::dispatcher);
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_FIRST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE );
 
 		return true;
 	}else{

Modified: trunk/libmsip/source/transactions/SipTransactionNonInviteClient.cxx
===================================================================
--- trunk/libmsip/source/transactions/SipTransactionNonInviteClient.cxx	2006-08-23 04:48:05 UTC (rev 2721)
+++ trunk/libmsip/source/transactions/SipTransactionNonInviteClient.cxx	2006-08-23 05:00:52 UTC (rev 2722)
@@ -100,7 +100,7 @@
 				command.getCommandPacket(), 
 				SipSMCommand::transaction_layer, 
 				SipSMCommand::dialog_layer );
-		dispatcher->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
+		dispatcher->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 		
 		return true;
 	}else{
@@ -120,13 +120,13 @@
 				CommandString( callId, SipCommandString::transport_error),
 				SipSMCommand::transaction_layer, 
 				SipSMCommand::dialog_layer);
-		dispatcher->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
+		dispatcher->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 
 		SipSMCommand cmdterminated(
 			CommandString( callId, SipCommandString::transaction_terminated),
 			SipSMCommand::transaction_layer,
 			SipSMCommand::dispatcher);
-		dispatcher->enqueueCommand( cmdterminated, HIGH_PRIO_QUEUE/*, PRIO_FIRST_IN_QUEUE */);
+		dispatcher->enqueueCommand( cmdterminated, HIGH_PRIO_QUEUE);
 		
 		
 		return true;
@@ -152,7 +152,7 @@
 		SipSMCommand cmd(pref, 
 				SipSMCommand::transaction_layer, 
 				SipSMCommand::dialog_layer);
-		dispatcher->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
+		dispatcher->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 
 		
 		return true;
@@ -192,7 +192,7 @@
 				SipSMCommand::dialog_layer);
 		cancelTimeout("timerE");
 
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE );
 		
 		return true;
 	}else{
@@ -218,13 +218,13 @@
 				SipSMCommand::transaction_layer, 
 				SipSMCommand::dialog_layer);
 
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE );
 
 		SipSMCommand cmdterminated(
 				CommandString( callId, SipCommandString::transaction_terminated),
 				SipSMCommand::transaction_layer,
 				SipSMCommand::dispatcher);
-		dispatcher->enqueueCommand( cmdterminated, HIGH_PRIO_QUEUE/*, PRIO_FIRST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmdterminated, HIGH_PRIO_QUEUE );
 
 		
 		return true;
@@ -245,7 +245,7 @@
 				command.getCommandPacket(), 
 				SipSMCommand::transaction_layer, 
 				SipSMCommand::dialog_layer);
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE );
 		
 		if( isUnreliable() ) 
 			requestTimeout(sipStack->getTimers()->getK(), "timerK");
@@ -292,7 +292,7 @@
 			CommandString( callId, SipCommandString::transaction_terminated),
 			SipSMCommand::transaction_layer,
 			SipSMCommand::dispatcher);
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_FIRST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE );
 		
 		return true;
 	}else{

Modified: trunk/libmsip/source/transactions/SipTransactionNonInviteServer.cxx
===================================================================
--- trunk/libmsip/source/transactions/SipTransactionNonInviteServer.cxx	2006-08-23 04:48:05 UTC (rev 2721)
+++ trunk/libmsip/source/transactions/SipTransactionNonInviteServer.cxx	2006-08-23 05:00:52 UTC (rev 2722)
@@ -62,7 +62,7 @@
 		cmd.setSource(SipSMCommand::transaction_layer);
 		cmd.setDestination(SipSMCommand::dialog_layer);
 		
-		dispatcher->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
+		dispatcher->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 		
 		return true;
 	}else{
@@ -170,13 +170,13 @@
 				SipSMCommand::transaction_layer, 
 				SipSMCommand::dialog_layer);
 
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE );
 		
 		SipSMCommand cmdterminated(
 			CommandString( callId, SipCommandString::transaction_terminated),
 			SipSMCommand::transaction_layer,
 			SipSMCommand::dispatcher);
-		dispatcher->enqueueCommand( cmdterminated, HIGH_PRIO_QUEUE/*, PRIO_FIRST_IN_QUEUE*/);
+		dispatcher->enqueueCommand( cmdterminated, HIGH_PRIO_QUEUE);
 		
 		
 		return true;
@@ -219,13 +219,13 @@
 				SipSMCommand::transaction_layer, 
 				SipSMCommand::dialog_layer);
 
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE */);
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE);
 		
 		SipSMCommand cmdterminated(
 			CommandString( callId, SipCommandString::transaction_terminated),
 			SipSMCommand::transaction_layer,
 			SipSMCommand::dispatcher);
-		dispatcher->enqueueCommand( cmdterminated, HIGH_PRIO_QUEUE/*, PRIO_FIRST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmdterminated, HIGH_PRIO_QUEUE );
 
 		
 		return true;
@@ -247,7 +247,7 @@
 			CommandString( callId, SipCommandString::transaction_terminated),
 			SipSMCommand::transaction_layer,
 			SipSMCommand::dispatcher);
-		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE/*, PRIO_FIRST_IN_QUEUE*/ );
+		dispatcher->enqueueCommand( cmd, HIGH_PRIO_QUEUE );
 
 		
 		return true;



More information about the Minisip-devel mailing list