r2693 - in trunk/libmsip: include/libmsip source source/headers source/messages

[mikma at minisip.org]

Author: mikma
Date: 2006-07-09 12:50:02 +0200 (Sun, 09 Jul 2006)
New Revision: 2693

Modified:
   trunk/libmsip/include/libmsip/SipHeaderAuthorization.h
   trunk/libmsip/include/libmsip/SipHeaderProxyAuthorization.h
   trunk/libmsip/source/SipAuthenticationDigest.cxx
   trunk/libmsip/source/headers/SipHeaderAuthorization.cxx
   trunk/libmsip/source/headers/SipHeaderProxyAuthorization.cxx
   trunk/libmsip/source/messages/SipRequest.cxx
Log:
Add support for opaque auth parameter

Modified: trunk/libmsip/include/libmsip/SipHeaderAuthorization.h
===================================================================
--- trunk/libmsip/include/libmsip/SipHeaderAuthorization.h	2006-07-08 16:38:54 UTC (rev 2692)
+++ trunk/libmsip/include/libmsip/SipHeaderAuthorization.h	2006-07-09 10:50:02 UTC (rev 2693)
@@ -56,6 +56,7 @@
 				const std::string &username, 
 				const std::string &realm, 
 				const std::string &nonce, 
+				const std::string &opaque,
 				const SipUri &uri, 
 				const std::string &auth_id, 
 				const std::string &password,
@@ -65,6 +66,7 @@
 				const std::string &username, 
 				const std::string &realm, 
 				const std::string &nonce, 
+				const std::string &opaque,
 				const SipUri &uri, 
 				const std::string &auth_id, 
 				const std::string &password,
@@ -96,6 +98,9 @@
 		std::string getNonce();
 		void setNonce(const std::string &n);
 
+		std::string getOpaque();
+		void setOpaque(const std::string &n);
+
 		SipUri getUri();
 		void setUri(const SipUri &uri);
 
@@ -110,6 +115,7 @@
 		std::string username;
 		std::string realm;
 		std::string nonce;
+		std::string opaque;
 		SipUri uri;
 		std::string auth_id;
 		std::string password;

Modified: trunk/libmsip/include/libmsip/SipHeaderProxyAuthorization.h
===================================================================
--- trunk/libmsip/include/libmsip/SipHeaderProxyAuthorization.h	2006-07-08 16:38:54 UTC (rev 2692)
+++ trunk/libmsip/include/libmsip/SipHeaderProxyAuthorization.h	2006-07-09 10:50:02 UTC (rev 2693)
@@ -52,6 +52,7 @@
 				const std::string &username, 
 				const std::string &realm, 
 				const std::string &nonce, 
+				const std::string &opaque,
 				const SipUri &uri, 
 				const std::string &auth_id, 
 				const std::string &password,

Modified: trunk/libmsip/source/SipAuthenticationDigest.cxx
===================================================================
--- trunk/libmsip/source/SipAuthenticationDigest.cxx	2006-07-08 16:38:54 UTC (rev 2692)
+++ trunk/libmsip/source/SipAuthenticationDigest.cxx	2006-07-09 10:50:02 UTC (rev 2693)
@@ -90,6 +90,7 @@
 			"",
 			realm,
 			nonce,
+			opaque == nullStr ? "" : opaque,
 			uri,
 			username,
 			password,
@@ -102,6 +103,7 @@
 			"",
 			realm,
 			nonce,
+			opaque == nullStr ? "" : opaque,
 			uri,
 			username,
 			password,

Modified: trunk/libmsip/source/headers/SipHeaderAuthorization.cxx
===================================================================
--- trunk/libmsip/source/headers/SipHeaderAuthorization.cxx	2006-07-08 16:38:54 UTC (rev 2692)
+++ trunk/libmsip/source/headers/SipHeaderAuthorization.cxx	2006-07-09 10:50:02 UTC (rev 2693)
@@ -72,6 +72,7 @@
 		const string &username, 
 		const string &realm, 
 		const string &nonce, 
+		const string &opaque,
 		const SipUri &uri, 
 		const string &auth_id, 
 		const string &password,
@@ -81,6 +82,7 @@
 			username(username),
 			realm(realm),
 			nonce(nonce),
+			opaque(opaque),
 			uri(uri),
 			auth_id(auth_id),
 			password(password),
@@ -94,6 +96,7 @@
 		const string &username, 
 		const string &realm, 
 		const string &nonce, 
+		const string &opaque,
 		const SipUri &uri, 
 		const string &auth_id, 
 		const string &password,
@@ -105,6 +108,7 @@
 			username(username),
 			realm(realm),
 			nonce(nonce),
+			opaque(opaque),
 			uri(uri),
 			auth_id(auth_id),
 			password(password),
@@ -119,11 +123,17 @@
 
 string SipHeaderValueAuthorization::getString(){
 	uri.setUserType("");
-	return /*"Authorization: "+*/ auth_method+
+
+	string result = auth_method+
 		" algorithm=\"MD5\""+", username=\""+auth_id+
 		"\", realm=\""+realm+"\", nonce=\""+nonce+
 		"\", uri=\""+uri.getUserIpString()+"\", response=\""+
 		calcResponse()+"\"";
+
+	if( opaque != "" )
+		result += ", opaque=\"" + opaque + "\"";
+
+	return result;
 } 
 
 string SipHeaderValueAuthorization::md5ToString(unsigned char *md5){
@@ -192,6 +202,14 @@
 	this->nonce=n;
 }
 
+string SipHeaderValueAuthorization::getOpaque(){
+	return opaque;
+}
+
+void SipHeaderValueAuthorization::setOpaque(const string &n){
+	this->opaque=n;
+}
+
 string SipHeaderValueAuthorization::getRealm(){
 	return realm;
 }

Modified: trunk/libmsip/source/headers/SipHeaderProxyAuthorization.cxx
===================================================================
--- trunk/libmsip/source/headers/SipHeaderProxyAuthorization.cxx	2006-07-08 16:38:54 UTC (rev 2692)
+++ trunk/libmsip/source/headers/SipHeaderProxyAuthorization.cxx	2006-07-09 10:50:02 UTC (rev 2693)
@@ -58,6 +58,7 @@
 		const string &username, 
 		const string &realm, 
 		const string &nonce, 
+		const string &opaque, 
 		const SipUri &uri, 
 		const string &auth_id, 
 		const string &password,
@@ -67,6 +68,7 @@
 						username,
 						realm,
 						nonce,
+						opaque,
 						uri,
 						auth_id,
 						password,

Modified: trunk/libmsip/source/messages/SipRequest.cxx
===================================================================
--- trunk/libmsip/source/messages/SipRequest.cxx	2006-07-08 16:38:54 UTC (rev 2692)
+++ trunk/libmsip/source/messages/SipRequest.cxx	2006-07-09 10:50:02 UTC (rev 2693)
@@ -191,7 +191,7 @@
 	
 	if ( username.length()>0 || nonce.length()>0 || realm.length()>0 ){
 		req->addHeader(new SipHeader( 
-				new SipHeaderValueProxyAuthorization("INVITE",tel_no,realm, nonce, uri, username, password,"DIGEST") )
+				new SipHeaderValueProxyAuthorization("INVITE",tel_no,realm, nonce, "",uri, username, password,"DIGEST") )
 				);
 	}
 
@@ -306,6 +306,7 @@
 					from_tel_no, 
 					realm, 
 					nonce, 
+					"", 
 					uri, 
 					auth_id, 
 					password,