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

[mikma at minisip.org]

Author: mikma
Date: 2006-11-12 16:32:30 +0100 (Sun, 12 Nov 2006)
New Revision: 2899

Modified:
   trunk/libminisip/include/libminisip/sip/SipDialogConfVoip.h
   trunk/libminisip/source/sip/SipDialogConfVoip.cxx
Log:
Update SipDialogConfVoip to new authentication framework.
Compiles but is otherwise untested.


Modified: trunk/libminisip/include/libminisip/sip/SipDialogConfVoip.h
===================================================================
--- trunk/libminisip/include/libminisip/sip/SipDialogConfVoip.h	2006-11-07 17:04:52 UTC (rev 2898)
+++ trunk/libminisip/include/libminisip/sip/SipDialogConfVoip.h	2006-11-12 15:32:30 UTC (rev 2899)
@@ -89,7 +89,6 @@
 		void setLastInvite(MRef<SipRequest*> i);
 		
 		void sendInvite(const std::string &branch);
-		void sendAuthInvite(const std::string &branch);
 		void sendBye(const std::string &branch, int);
 		void sendCancel(const std::string &branch);
 		void sendAck(const std::string &branch);

Modified: trunk/libminisip/source/sip/SipDialogConfVoip.cxx
===================================================================
--- trunk/libminisip/source/sip/SipDialogConfVoip.cxx	2006-11-07 17:04:52 UTC (rev 2898)
+++ trunk/libminisip/source/sip/SipDialogConfVoip.cxx	2006-11-12 15:32:30 UTC (rev 2899)
@@ -590,7 +590,8 @@
 		realm=resp->getAuthenticateProperty("realm");
 		nonce=resp->getAuthenticateProperty("nonce");
 
-		sendAuthInvite("");
+		updateAuthentications( resp );
+		sendInvite("");
 
 		return true;
 	}else{
@@ -1007,6 +1008,9 @@
 				getDialogConfig()->inherited->getTransport(),
 				sipStack) ;
 
+	addAuthorizations( inv );
+	addRoute( inv );
+
 	/* Get the session description from the Session */
 		
 //      There might be so that there are no SDP. Check!
@@ -1063,81 +1067,7 @@
 
 }
 
-void SipDialogConfVoip::sendAuthInvite(const string &branch){
-	//	merr << "ERROR: SipDialogVoip::sendAuthInvite() UNIMPLEMENTED"<< end;
-//	string call_id = getDialogConfig().callId;
-	//SipInvite * inv;
-	MRef<SipRequest*> inv;
-	string keyAgreementMessage;
 
-	//inv= new SipInvite(
-	inv = SipRequest::createSipMessageInvite(
-			branch,
-			dialogState.callId,
-			dialogState.remoteUri,
-			getDialogConfig()->sipIdentity->sipDomain,
-			getDialogConfig()->sipIdentity->getSipProxy()->sipProxyPort,
-			getDialogConfig()->inherited->externalContactIP,
-			getDialogConfig()->inherited->getLocalSipPort(phoneconf->useSTUN),
-			getDialogConfig()->sipIdentity->getSipUri(),
-			dialogState.seqNo,
-			getDialogConfig()->sipIdentity->getSipProxy()->sipProxyUsername,
-			nonce,
-			realm,
-			getDialogConfig()->sipIdentity->getSipProxy()->sipProxyPassword,
-			getDialogConfig()->inherited->getTransport(),
-			sipStack);
-
-	inv->getHeaderValueFrom()->setParameter("tag",dialogState.localTag);
-	if(type=="join")
-		modifyConfJoinInvite(inv);
-	else
-		modifyConfConnectInvite(inv);
-	
-//      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 sendInvite" << end;
-		return; 
-		}
-	}
-	
-	/* Add the latter to the INVITE message */ // If it exists
-	
-
-//-------------------------------------------------------------------------------------------------------------//
-	inv->setContent( *sdp );
-//-------------------------------------------------------------------------------------------------------------//
-
-
-
-
-
-//	/* 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);
-	sipStack->enqueueCommand(cmd, HIGH_PRIO_QUEUE );
-	setLastInvite(inv);
-
-}
-
-
 //#ifdef NEVERDEFINED_ERSADFS
 void SipDialogConfVoip::sendAck(const string &branch){
 /*	//	mdbg << "ERROR: SipDialogVoip::sendAck() UNIMPLEMENTED" << end;