r3285 - in trunk/libmsip/source: . headers

[erik at minisip.org]

Author: erik
Date: 2007-05-22 15:31:29 +0200 (Tue, 22 May 2007)
New Revision: 3285

Modified:
   trunk/libmsip/source/SipDialogConfig.cxx
   trunk/libmsip/source/SipUri.cxx
   trunk/libmsip/source/headers/SipHeaderContact.cxx
Log:

 * Fix for r3284 where the port part of the contact uri was never added
 * Removed some commented out code.



Modified: trunk/libmsip/source/SipDialogConfig.cxx
===================================================================
--- trunk/libmsip/source/SipDialogConfig.cxx	2007-05-22 12:48:19 UTC (rev 3284)
+++ trunk/libmsip/source/SipDialogConfig.cxx	2007-05-22 13:31:29 UTC (rev 3285)
@@ -229,42 +229,6 @@
 	return ret;
 }
 
-
-
-#if 0
-void SipIdentity::setSipUri(string addr){
-	if (addr.substr(0,4)=="sip:")
-		addr = addr.substr(4);
-	if (addr.find("@")==string::npos){
-			#ifdef DEBUG_OUTPUT	
-			cerr << "WARNING: Incomplete sip address: "<< addr<<endl;
-			#endif
-		sipUsername = addr.substr(0, addr.find("@"));
-		sipDomain = "";
-	} else {
-		sipUsername = addr.substr(0, addr.find("@"));
-		sipDomain = addr.substr(addr.find("@")+1);
-	}
-
-#ifdef DEBUG_OUTPUT	
-	cerr << "SipIdentity::setSipUri: sipUsername=<"<< sipUsername << "> sipDomain=<" << sipDomain << ">"<< endl;
-#endif
-}
-
-string SipIdentity::getSipUri() {
-	string ret;
-	lock();
-	if( sipUsername != "" && sipDomain !="" ) {
-		ret = sipUsername + "@" + sipDomain;
-	} else {
-		//one of the two is empty, so do not add the @ ... 
-		ret = sipUsername + sipDomain;
-	}
-	unlock();
-	return ret;
-}
-#endif
-
 MRef<SipRegistrar *> SipIdentity::getSipRegistrar() {
 	return sipProxy;
 }

Modified: trunk/libmsip/source/SipUri.cxx
===================================================================
--- trunk/libmsip/source/SipUri.cxx	2007-05-22 12:48:19 UTC (rev 3284)
+++ trunk/libmsip/source/SipUri.cxx	2007-05-22 13:31:29 UTC (rev 3285)
@@ -152,7 +152,7 @@
 		setIp( ip_ );
 	}
 	
-	if( port_ != 0 ) setPort( port );
+	if( port_ != 0 ) setPort( port_ );
 	if( type != "" ) setUserType( type );
 	validUri = true;
 }

Modified: trunk/libmsip/source/headers/SipHeaderContact.cxx
===================================================================
--- trunk/libmsip/source/headers/SipHeaderContact.cxx	2007-05-22 12:48:19 UTC (rev 3284)
+++ trunk/libmsip/source/headers/SipHeaderContact.cxx	2007-05-22 13:31:29 UTC (rev 3285)
@@ -51,15 +51,6 @@
 
 const string sipHeaderValueContactTypeStr = "Contact";
 		
-/*
-SipHeaderValueContact::SipHeaderValueContact()
-	: SipHeaderValue(SIP_HEADER_TYPE_CONTACT,sipHeaderValueContactTypeStr)
-{
-	featuretag= "";
-	setExpires( DEFAULT_SIPPROXY_EXPIRES_VALUE_SECONDS ); //always set a default value for contact expiration
-}
-*/
-
 SipHeaderValueContact::SipHeaderValueContact(const string &build_from) 
 		: SipHeaderValue(SIP_HEADER_TYPE_CONTACT,sipHeaderValueContactTypeStr),uri(build_from)
 {