r2711 - in trunk/libminisip: include/libminisip/sip source/sip

[mikma at minisip.org]

Author: mikma
Date: 2006-08-19 00:44:52 +0200 (Sat, 19 Aug 2006)
New Revision: 2711

Modified:
   trunk/libminisip/include/libminisip/sip/SipDialogVoipClient.h
   trunk/libminisip/source/sip/SipDialogVoipClient.cxx
Log:
Remove sendAuthInvite and add authorizations to INVITEs
in sendInvite instead.


Modified: trunk/libminisip/include/libminisip/sip/SipDialogVoipClient.h
===================================================================
--- trunk/libminisip/include/libminisip/sip/SipDialogVoipClient.h	2006-08-18 22:12:09 UTC (rev 2710)
+++ trunk/libminisip/include/libminisip/sip/SipDialogVoipClient.h	2006-08-18 22:44:52 UTC (rev 2711)
@@ -80,7 +80,6 @@
 		void sendInviteOk(const std::string &branch);
 		
 		void sendInvite(const std::string &branch);
-		void sendAuthInvite(const std::string &branch);
 
 		void sendAck();
 		void sendPrack(MRef<SipResponse*>);

Modified: trunk/libminisip/source/sip/SipDialogVoipClient.cxx
===================================================================
--- trunk/libminisip/source/sip/SipDialogVoipClient.cxx	2006-08-18 22:12:09 UTC (rev 2710)
+++ trunk/libminisip/source/sip/SipDialogVoipClient.cxx	2006-08-18 22:44:52 UTC (rev 2711)
@@ -420,7 +420,8 @@
 		//nonce = resp->getNonce();
 		nonce = resp->getAuthenticateProperty("nonce");
 
-		sendAuthInvite(""/*trans->getBranch()*/);
+		updateAuthentications( resp );
+		sendInvite(""/*trans->getBranch()*/);
 
 		return true;
 	}else{
@@ -756,6 +757,7 @@
 			getDialogConfig()->inherited->getTransport(),
 			sipStack ) ;
 
+	addAuthorizations( inv );
 	addRoute( inv );
 
 	/* Get the session description from the Session */
@@ -851,102 +853,6 @@
 	sendSipMessage( *prack );
 }
 
-void SipDialogVoipClient::sendAuthInvite(const string &branch){
-	//	merr << "ERROR: SipDialogVoipClient::sendAuthInvite() UNIMPLEMENTED"<< end;
-	MRef<SipRequest*> inv;
-	string keyAgreementMessage;
-
-	//merr << "SipDialogVoip::sendAuthInv : dialogstate.remoteUri=" << dialogState.remoteUri << end;
-
-	inv = SipRequest::createSipMessageInvite(
-		branch,
-		dialogState.callId,
-		dialogState.remoteUri,
-		getDialogConfig()->inherited->sipIdentity->sipDomain,
-		getDialogConfig()->inherited->sipIdentity->getSipProxy()->sipProxyPort,
-		getDialogConfig()->inherited->externalContactIP,
-		getDialogConfig()->inherited->getLocalSipPort(phoneconf->useSTUN),
-		getDialogConfig()->inherited->sipIdentity->getSipUri(),
-		dialogState.seqNo,
-		getDialogConfig()->inherited->sipIdentity->getSipProxy()->sipProxyUsername,
-		nonce,
-		realm,
-		getDialogConfig()->inherited->sipIdentity->getSipProxy()->sipProxyPassword,
-		getDialogConfig()->inherited->getTransport(),
-		sipStack);
-
-	addRoute( inv );
-
-	inv->getHeaderValueFrom()->setParameter("tag",dialogState.localTag);
-
-	//There might be so that there are no SDP. Check!
-	MRef<SdpPacket *> sdp;
-	if (mediaSession){
-#ifdef ENABLE_TS
-		ts.save("getSdpOffer");
-#endif
-		sdp = mediaSession->getSdpOffer();
-#ifdef ENABLE_TS
-		ts.save("getSdpOffer");
-#endif
-		if( !sdp ){
-		// FIXME: this most probably means that the
-		// creation of the MIKEY message failed, it 
-		// should not happen
-		merr << "Sdp was NULL in sendAuthInvite" << end;
-		return; 
-		}
-	}
-	
-	/* Add the latter to the INVITE message */ // If it exists
-	
-
-//-------------------------------------------------------------------------------------------------------------//
-#ifdef IPSEC_SUPPORT	
-	// Create a MIKEY message for IPSEC if stated in the config file.
-	MRef<SipMimeContent*> mikey;
-	if (getIpsecSession()->required()){
-		ts.save("getMikeyIpsecOffer");
-		mikey = ipsecSession->getMikeyIpsecOffer();
-		ts.save("getMikeyIpsecOffer");
-		if (!mikey){
-			merr << "Mikey was NULL" << end;
-			merr << "Still some errors with IPSEC" << end;
-			//return; 
-		}
-	}
-	else
-		mikey = NULL;
-	MRef<SipMimeContent*> multi;
-	if (mikey && mediaSession){
-		multi = new SipMimeContent("multipart/mixed");
-		multi->addPart(*mikey);
-		multi->addPart(*sdp);
-		inv->setContent( *multi);
-	}
-	if (mikey && !mediaSession)
-		inv->setContent( *mikey);
-	if (!mikey && mediaSession)
-		inv->setContent( *sdp );
-#else
-	
-	inv->setContent( *sdp );
-#endif
-//-------------------------------------------------------------------------------------------------------------//
-
-	//	/* Get the session description from the Session */
-	//	MRef<SdpPacket *> sdp = mediaSession->getSdpOffer();
-	//
-	//	/* Add the latter to the INVITE message */
-	//	inv->setContent( *sdp );
-	
-	MRef<SipMessage*> pref(*inv);
-	SipSMCommand cmd(pref, SipSMCommand::dialog_layer, SipSMCommand::transaction_layer);
-	dispatcher->enqueueCommand(cmd, HIGH_PRIO_QUEUE/*, PRIO_LAST_IN_QUEUE*/);
-	setLastInvite(inv);
-
-}
-
 void SipDialogVoipClient::sendInviteOk(const string &branch){
 	MRef<SipResponse*> ok= new SipResponse(branch, 200,"OK", MRef<SipMessage*>(*getLastInvite()));	
 	ok->getHeaderValueTo()->setParameter("tag",dialogState.localTag);