r3544 - trunk/libmsip/source

[mikma at minisip.org]

Author: mikma
Date: 2007-12-02 12:10:40 +0100 (Sun, 02 Dec 2007)
New Revision: 3544

Modified:
   trunk/libmsip/source/SipDialogConfig.cxx
Log:
Fix bug introduced in r3523 causing the pre-set Route set to contain an
invalid SipUri in sip identities which aren't using an outbound proxy.


Modified: trunk/libmsip/source/SipDialogConfig.cxx
===================================================================
--- trunk/libmsip/source/SipDialogConfig.cxx	2007-12-01 18:52:45 UTC (rev 3543)
+++ trunk/libmsip/source/SipDialogConfig.cxx	2007-12-02 11:10:40 UTC (rev 3544)
@@ -268,15 +268,17 @@
 		proxyUri.setPort( proxyPort );
 	}
 
-	if( transport ){
-		proxyUri.setProtocolId( transport->getUriScheme() );
-		proxyUri.setTransport( transport->getProtocol() );
-	}
+	if( proxyUri.isValid() ){
+		if( transport ){
+			proxyUri.setProtocolId( transport->getUriScheme() );
+			proxyUri.setTransport( transport->getProtocol() );
+		}
 
-	proxyUri.setParameter( "lr", "true" );
-	proxyUri.makeValid( true );
+		proxyUri.setParameter( "lr", "true" );
+		proxyUri.makeValid( true );
 
-	routeSet.push_back( proxyUri );
+		routeSet.push_back( proxyUri );
+	}
 
 	return ret;
 }