r2710 - in trunk/libmsip: include/libmsip source/dialogs

[mikma at minisip.org]

Author: mikma
Date: 2006-08-19 00:12:09 +0200 (Sat, 19 Aug 2006)
New Revision: 2710

Modified:
   trunk/libmsip/include/libmsip/SipDialogRegister.h
   trunk/libmsip/source/dialogs/SipDialogRegister.cxx
Log:
Rename SipDialogRegister::send_auth to SipDialogRegister::send_register and remove unused send_noauth alias

Modified: trunk/libmsip/include/libmsip/SipDialogRegister.h
===================================================================
--- trunk/libmsip/include/libmsip/SipDialogRegister.h	2006-08-18 10:52:56 UTC (rev 2709)
+++ trunk/libmsip/include/libmsip/SipDialogRegister.h	2006-08-18 22:12:09 UTC (rev 2710)
@@ -53,8 +53,7 @@
 		bool getGuiFeedback(){return guiFeedback;}
 		void setGuiFeedback(bool fb){guiFeedback=fb;}
 
-		void send_noauth(std::string branch);
-		void send_auth(std::string branch);
+		void send_register(std::string branch);
 	private:
 		bool a0_start_tryingnoauth_register( const SipSMCommand &command);
 		bool a1_tryingnoauth_registred_2xx( const SipSMCommand &command);

Modified: trunk/libmsip/source/dialogs/SipDialogRegister.cxx
===================================================================
--- trunk/libmsip/source/dialogs/SipDialogRegister.cxx	2006-08-18 10:52:56 UTC (rev 2709)
+++ trunk/libmsip/source/dialogs/SipDialogRegister.cxx	2006-08-18 22:12:09 UTC (rev 2710)
@@ -55,7 +55,7 @@
         +-------------+                            a10 GUI(failed)
                    |  +-----------------------------+---------------------------------+
 cmdstr:proxy_regist|  |      401&&haspass    +------+--------+                        |
-  a0 send_noauth   |  |      a2 send_auth    | S3            |---------------------+  |
+  a0 send_register |  |      a2 send_register| S3            |---------------------+  |
                    |  | +------------------->| Trying_stored |                     |  |
                    V  | |            1xx   +-|               |-+                   |  |
             +-------------+          a15 - +>+---------------+ | 401               |  |
@@ -63,7 +63,7 @@
         +-->|Trying_noauth| a3 ask_dialog    +---------------+ |                   |  |
         |   |             |----------------->| S4            |<+                   |  |
         |   +-------------+                  | Ask password  |---+ cmdstr:setpass  |  |
-        |          |  |  ^                   |               |   | a5 send_auth    |  |
+        |          |  |  ^                   |               |   | a5 send_regist..|  |
         |          |  +--+                   +---------------+<--+                 |  |
         |   2xx OK |    1xx                    | |      ^  |cancel +----------+    |  |
         |   a1 -   |    a14 -                  | +------+  +------>| S5       |<---)--+
@@ -72,7 +72,7 @@
         |   |  S2         |<-------------------+                   +----------+    |
         +---|  Registred  |                                              |         |
  register   |             |<---------------------------------------------^---------+
- send_noauth+-------------+                   2xx                        V     a13: notransactions
+ send_reg.. +-------------+                   2xx                        V     a13: notransactions
         |       |                             a8                   +----------+
         --------+                                                  |          |
              a12 cmdstr:register <proxy>                           |terminated|
@@ -124,7 +124,7 @@
 		dispatcher->getLayerTransaction()->addTransaction(trans);
 		registerTransactionToDialog(trans);
 */
-		send_noauth(/*trans->getBranch()*/"");
+		send_register(/*trans->getBranch()*/"");
 		
 		CommandString cmdstr( dialogState.callId, SipCommandString::register_sent);
 		cmdstr["identityId"] = getDialogConfig()->inherited->sipIdentity->getId();
@@ -203,7 +203,7 @@
 		MRef<SipResponse*> resp( (SipResponse *)*command.getCommandPacket());
 
 		updateAuthentications( *resp );
-		send_auth(/*trans->getBranch()*/"");
+		send_register(/*trans->getBranch()*/"");
 		//TODO: inform GUI
 
 		return true;
@@ -286,7 +286,7 @@
 		registerTransactionToDialog(trans);
 */
 
-		send_auth(/*trans->getBranch()*/"");
+		send_register(/*trans->getBranch()*/"");
 		return true;
 	}else{
 		return false;
@@ -478,7 +478,7 @@
 		dispatcher->getLayerTransaction()->addTransaction(trans);
 		registerTransactionToDialog(trans);
 */
-		send_noauth(/*trans->getBranch()*/"");
+		send_register(/*trans->getBranch()*/"");
 		
 		CommandString cmdstr(dialogState.callId, SipCommandString::register_sent);
 		cmdstr["identityId"] = getDialogConfig()->inherited->sipIdentity->getId();
@@ -708,7 +708,7 @@
 	return ret;
 }
 
-void SipDialogRegister::send_noauth(string branch){
+void SipDialogRegister::send_register(string branch){
 	
 //	mdbg << "SipDialogRegister: domain is "<< proxy_domain<< end;
 	//MRef<SipRegister*> reg= new SipRegister(
@@ -731,6 +731,3 @@
 	dispatcher->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
 }
 
-void SipDialogRegister::send_auth(string branch){
-	send_noauth( branch );
-}