r2902 - in trunk: libminisip/source/ipprovider libminisip/source/sip libmsip/include/libmsip libmsip/source libmsip/source/dialogs minisip/minisip/gui/gtkgui minisip/minisip/gui/textui

mikma at minisip.org mikma at minisip.org
Sun Nov 12 19:22:41 CET 2006 

Author: mikma
Date: 2006-11-12 19:22:40 +0100 (Sun, 12 Nov 2006)
New Revision: 2902

Modified:
   trunk/libminisip/source/ipprovider/StunIpProvider.cxx
   trunk/libminisip/source/sip/DefaultDialogHandler.cxx
   trunk/libminisip/source/sip/Sip.cxx
   trunk/libminisip/source/sip/SipDialogConfVoip.cxx
   trunk/libminisip/source/sip/SipDialogPresenceServer.cxx
   trunk/libminisip/source/sip/SipDialogVoip.cxx
   trunk/libminisip/source/sip/SipDialogVoipClient.cxx
   trunk/libminisip/source/sip/SipDialogVoipServer.cxx
   trunk/libminisip/source/sip/SipDialogVoipServer100rel.cxx
   trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx
   trunk/libmsip/include/libmsip/SipDialogConfig.h
   trunk/libmsip/include/libmsip/SipDialogRegister.h
   trunk/libmsip/source/SipDialogConfig.cxx
   trunk/libmsip/source/dialogs/SipDialogManagement.cxx
   trunk/libmsip/source/dialogs/SipDialogRegister.cxx
   trunk/minisip/minisip/gui/gtkgui/AccountsList.cxx
   trunk/minisip/minisip/gui/gtkgui/AccountsStatusWidget.cxx
   trunk/minisip/minisip/gui/gtkgui/MainWindow.cxx
   trunk/minisip/minisip/gui/textui/MinisipTextUI.cxx
Log:
Replace sipUsername and sipDomain in SipIdentity with a SipUri.


Modified: trunk/libminisip/source/ipprovider/StunIpProvider.cxx
===================================================================
--- trunk/libminisip/source/ipprovider/StunIpProvider.cxx	2006-11-12 17:55:59 UTC (rev 2901)
+++ trunk/libminisip/source/ipprovider/StunIpProvider.cxx	2006-11-12 18:22:40 UTC (rev 2902)
@@ -56,10 +56,9 @@
         mdbg << "Try 1, autodetect"<< end;
 #endif
         if (phoneConf->findStunServerFromSipUri){
-                mdbg << "Using SIP uri: "<<phoneConf->defaultIdentity->getSipUri()<< end;
-                string useruri = phoneConf->defaultIdentity->getSipUri();
-                if (useruri.find("@")!=string::npos){
-                        string uridomain = useruri.substr(useruri.find("@")+1);
+		mdbg << "Using SIP uri: "<<phoneConf->defaultIdentity->getSipUri().getString()<< end;
+                const SipUri &useruri = phoneConf->defaultIdentity->getSipUri();
+		const string &uridomain = useruri.getIp();
                         mdbg << "domain=<"<<uridomain<<">"<< end;
                         if (uridomain.length()>0){
                                 uint16_t port;
@@ -70,7 +69,6 @@
                                         return proxy;
                                 }
 			}
-		}
 	}
 
 #ifdef DEBUG_OUTPUT

Modified: trunk/libminisip/source/sip/DefaultDialogHandler.cxx
===================================================================
--- trunk/libminisip/source/sip/DefaultDialogHandler.cxx	2006-11-12 17:55:59 UTC (rev 2901)
+++ trunk/libminisip/source/sip/DefaultDialogHandler.cxx	2006-11-12 18:22:40 UTC (rev 2902)
@@ -382,7 +382,7 @@
 		if( ! identity.isNull() ) {
 			;
 		} else if (phoneconf->pstnIdentity && (cmdstr.getDestinationId()=="pstn" 
-					|| (proxyDomainArg!="" && proxyDomainArg==phoneconf->pstnIdentity->sipDomain))){
+						|| (proxyDomainArg!="" && proxyDomainArg==phoneconf->pstnIdentity->getSipUri().getIp()))){
 			identity=phoneconf->pstnIdentity;
 		}
 		
@@ -875,8 +875,8 @@
 	posAt = toUri.find("@");
 	if( posAt == string::npos ) { //toUri does not have a domain ...
 		//get one, from the default identity
-		if( phoneconf->defaultIdentity->sipDomain != "" ) {
-			toUri += "@" + phoneconf->defaultIdentity->sipDomain;
+		if( phoneconf->defaultIdentity->getSipUri().getIp() != "" ) {
+			toUri += "@" + phoneconf->defaultIdentity->getSipUri().getIp();
 		} else {
 			#ifdef DEBUG_OUTPUT
 			cerr << "DefaultDialogHandler::sendIM - toUri without domain" << endl;

Modified: trunk/libminisip/source/sip/Sip.cxx
===================================================================
--- trunk/libminisip/source/sip/Sip.cxx	2006-11-12 17:55:59 UTC (rev 2901)
+++ trunk/libminisip/source/sip/Sip.cxx	2006-11-12 18:22:40 UTC (rev 2902)
@@ -177,7 +177,7 @@
 
 	if( !gotAtSign && id ){
 		id->lock();
-		user += "@" + id->sipDomain;
+		user += "@" + id->getSipUri().getIp();
 		id->unlock();
 	}
 
@@ -464,9 +464,9 @@
 	cerr << endl;
 	for (list<MRef<SipIdentity*> >::iterator i=phoneconfig->identities.begin() ; i!=phoneconfig->identities.end(); i++){
 		if ( (*i)->registerToProxy  ){
-			cerr << "Registering user "<< (*i)->getSipUri() << " to proxy " << (*i)->getSipProxy()->sipProxyAddressString<< ", requesting domain " << (*i)->sipDomain << endl;
+			cerr << "Registering user "<< (*i)->getSipUri().getString() << " to proxy " << (*i)->getSipProxy()->sipProxyAddressString<< ", requesting domain " << (*i)->getSipUri().getIp() << endl;
 			CommandString reg("",SipCommandString::proxy_register);
-			reg["proxy_domain"] = (*i)->sipDomain;
+			reg["proxy_domain"] = (*i)->getSipUri().getIp();
 			reg["identityId"] = (*i)->getId();
 			SipSMCommand sipcmd(reg, SipSMCommand::dialog_layer, SipSMCommand::dialog_layer);
 			sipstack->handleCommand(sipcmd);

Modified: trunk/libminisip/source/sip/SipDialogConfVoip.cxx
===================================================================
--- trunk/libminisip/source/sip/SipDialogConfVoip.cxx	2006-11-12 17:55:59 UTC (rev 2901)
+++ trunk/libminisip/source/sip/SipDialogConfVoip.cxx	2006-11-12 18:22:40 UTC (rev 2902)
@@ -499,7 +499,7 @@
 		
 		massert( !getLastInvite().isNull() );
 		sendInviteOk(getLastInvite()->getDestinationBranch() );
-		CommandString cmdstr2("", "myuri", getDialogConfig()->sipIdentity->getSipUri());
+		CommandString cmdstr2("", "myuri", getDialogConfig()->sipIdentity->getSipUri().getString());
 		
 		
 		cmdstr2.setParam3(confId);

Modified: trunk/libminisip/source/sip/SipDialogPresenceServer.cxx
===================================================================
--- trunk/libminisip/source/sip/SipDialogPresenceServer.cxx	2006-11-12 17:55:59 UTC (rev 2901)
+++ trunk/libminisip/source/sip/SipDialogPresenceServer.cxx	2006-11-12 18:22:40 UTC (rev 2902)
@@ -307,8 +307,8 @@
 
 	notify->getHeaderValueFrom()->setParameter("tag",dialogState.localTag);
 
-	notify->setContent(new PresenceMessageContent(getDialogConfig()->sipIdentity->getSipUri(),
-				toId->getSipUri(),
+	notify->setContent(new PresenceMessageContent(getDialogConfig()->sipIdentity->getSipUri().getString(),
+				toId->getSipUri().getString(),
 				onlineStatus,
 				onlineStatus
 				));

Modified: trunk/libminisip/source/sip/SipDialogVoip.cxx
===================================================================
--- trunk/libminisip/source/sip/SipDialogVoip.cxx	2006-11-12 17:55:59 UTC (rev 2901)
+++ trunk/libminisip/source/sip/SipDialogVoip.cxx	2006-11-12 18:22:40 UTC (rev 2902)
@@ -643,7 +643,7 @@
 	ok->getHeaderValueTo()->setParameter("tag",dialogState.localTag);
 	MRef<SipHeaderValue *> contact = 
 		new SipHeaderValueContact( 
-			getDialogConfig()->sipIdentity->getSipUri(),
+			getDialogConfig()->sipIdentity->getSipUri().getString(),
 			getDialogConfig()->inherited->externalContactIP,
 			getDialogConfig()->inherited->getLocalSipPort(phoneconf->useSTUN),
 			"", getDialogConfig()->inherited->getTransport(),

Modified: trunk/libminisip/source/sip/SipDialogVoipClient.cxx
===================================================================
--- trunk/libminisip/source/sip/SipDialogVoipClient.cxx	2006-11-12 17:55:59 UTC (rev 2901)
+++ trunk/libminisip/source/sip/SipDialogVoipClient.cxx	2006-11-12 18:22:40 UTC (rev 2902)
@@ -729,7 +729,7 @@
 	
 	MRef<SipHeaderValue *> contact = 
 		new SipHeaderValueContact( 
-			getDialogConfig()->sipIdentity->getSipUri(),
+			getDialogConfig()->sipIdentity->getSipUri().getString(),
 			getDialogConfig()->inherited->externalContactIP,
 			getDialogConfig()->inherited->getLocalSipPort(phoneconf->useSTUN),
 			"", getDialogConfig()->inherited->getTransport(),

Modified: trunk/libminisip/source/sip/SipDialogVoipServer.cxx
===================================================================
--- trunk/libminisip/source/sip/SipDialogVoipServer.cxx	2006-11-12 17:55:59 UTC (rev 2901)
+++ trunk/libminisip/source/sip/SipDialogVoipServer.cxx	2006-11-12 18:22:40 UTC (rev 2902)
@@ -412,7 +412,7 @@
 	
 	MRef<SipHeaderValue *> contact = 
 		new SipHeaderValueContact( 
-			getDialogConfig()->sipIdentity->getSipUri(),
+			getDialogConfig()->sipIdentity->getSipUri().getString(),
 			getDialogConfig()->inherited->externalContactIP,
 			getDialogConfig()->inherited->getLocalSipPort(phoneconf->useSTUN),
 			"", getDialogConfig()->inherited->getTransport(),
@@ -478,7 +478,7 @@
 	
 	MRef<SipHeaderValue *> contact = 
 		new SipHeaderValueContact( 
-			getDialogConfig()->sipIdentity->getSipUri(),
+			getDialogConfig()->sipIdentity->getSipUri().getString(),
 			getDialogConfig()->inherited->externalContactIP,
 			getDialogConfig()->inherited->getLocalSipPort(phoneconf->useSTUN),
 			"", getDialogConfig()->inherited->getTransport(),

Modified: trunk/libminisip/source/sip/SipDialogVoipServer100rel.cxx
===================================================================
--- trunk/libminisip/source/sip/SipDialogVoipServer100rel.cxx	2006-11-12 17:55:59 UTC (rev 2901)
+++ trunk/libminisip/source/sip/SipDialogVoipServer100rel.cxx	2006-11-12 18:22:40 UTC (rev 2902)
@@ -283,7 +283,7 @@
 	
 	MRef<SipHeaderValue *> contact = 
 		new SipHeaderValueContact( 
-			getDialogConfig()->sipIdentity->getSipUri(),
+			getDialogConfig()->sipIdentity->getSipUri().getString(),
 			getDialogConfig()->inherited->externalContactIP,
 			getDialogConfig()->inherited->getLocalSipPort(phoneconf->useSTUN),
 			"", getDialogConfig()->inherited->getTransport(),
@@ -315,7 +315,7 @@
 	
 	MRef<SipHeaderValue *> contact = 
 		new SipHeaderValueContact( 
-			getDialogConfig()->sipIdentity->getSipUri(),
+			getDialogConfig()->sipIdentity->getSipUri().getString(),
 			getDialogConfig()->inherited->externalContactIP,
 			getDialogConfig()->inherited->getLocalSipPort(phoneconf->useSTUN),
 			"", getDialogConfig()->inherited->getTransport(),

Modified: trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx
===================================================================
--- trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx	2006-11-12 17:55:59 UTC (rev 2901)
+++ trunk/libminisip/source/sip/SipSoftPhoneConfiguration.cxx	2006-11-12 18:22:40 UTC (rev 2902)
@@ -116,7 +116,7 @@
 
 		backend->save( accountPath + "account_name", (*iIdent)->identityIdentifier );
 		
-		backend->save( accountPath + "sip_uri", (*iIdent)->sipUsername + "@" + (*iIdent)->sipDomain );
+		backend->save( accountPath + "sip_uri", (*iIdent)->getSipUri().getUserIpString() );
 		
 
 /*From SipDialogSecurity below*/
@@ -907,8 +907,8 @@
 	
 	for( it = identities.begin(); it!=identities.end(); it++ ) {
 		(*it)->lock();
-		if( (*it)->sipUsername == uri.getUserName() && 
-				(*it)->sipDomain == uri.getIp() ) {
+		if( (*it)->getSipUri().getUserName() == uri.getUserName() && 
+		    (*it)->getSipUri().getIp() == uri.getIp() ) {
 			(*it)->unlock();
 			return (*it);
 		}

Modified: trunk/libmsip/include/libmsip/SipDialogConfig.h
===================================================================
--- trunk/libmsip/include/libmsip/SipDialogConfig.h	2006-11-12 17:55:59 UTC (rev 2901)
+++ trunk/libmsip/include/libmsip/SipDialogConfig.h	2006-11-12 18:22:40 UTC (rev 2902)
@@ -156,13 +156,13 @@
 class LIBMSIP_API SipIdentity : public MObject{
 	public:
 		SipIdentity();
-		SipIdentity(std::string sipuri);
+		SipIdentity(const SipUri &sipuri);
 
 		void setIdentityName(std::string n);//{identityIdentifier = n;}
 		
-		void setSipUri(std::string addr);
+		void setSipUri(const SipUri &addr) { sipUri = addr; }
 		
-		std::string getSipUri();
+		const SipUri &getSipUri() const { return sipUri; }
 
 		/**
 		@returns the sip proxy used by this identity
@@ -216,9 +216,6 @@
 			return ret;
 		}
 		
-		std::string sipUsername;
-		std::string sipDomain;       //SipAddress is <sipUsername>@<sipDomain>
-
 		std::string identityIdentifier;
 
 
@@ -260,6 +257,8 @@
 		bool checkCert;
 		bool use_zrtp;
 	private: 
+		SipUri sipUri;
+
 		MRef<SipSim *> sim;
 
 		//bool use_srtp;

Modified: trunk/libmsip/include/libmsip/SipDialogRegister.h
===================================================================
--- trunk/libmsip/include/libmsip/SipDialogRegister.h	2006-11-12 17:55:59 UTC (rev 2901)
+++ trunk/libmsip/include/libmsip/SipDialogRegister.h	2006-11-12 18:22:40 UTC (rev 2902)
@@ -41,7 +41,7 @@
 
 		virtual bool handleCommand(const SipSMCommand &command);
 
-		virtual std::string getName(){return "SipDialogRegister["+getDialogConfig()->sipIdentity->sipDomain+"]";}
+		virtual std::string getName(){return "SipDialogRegister["+getDialogConfig()->sipIdentity->getSipUri().getIp()+"]";}
 		
 		virtual std::string getMemObjectType() const {return "SipDialogRegister";}
 		

Modified: trunk/libmsip/source/SipDialogConfig.cxx
===================================================================
--- trunk/libmsip/source/SipDialogConfig.cxx	2006-11-12 17:55:59 UTC (rev 2901)
+++ trunk/libmsip/source/SipDialogConfig.cxx	2006-11-12 18:22:40 UTC (rev 2902)
@@ -241,8 +241,7 @@
 	setIsRegistered (false);
 }
 
-SipIdentity::SipIdentity(string addr) : securityEnabled(false),registerToProxy(false){
-	setSipUri(addr);
+SipIdentity::SipIdentity(const SipUri &addr) : sipUri(addr),securityEnabled(false),registerToProxy(false){
 	securityEnabled = false;
 	ka_type=0;
 	//use_srtp=false;
@@ -259,6 +258,7 @@
 	setIsRegistered (false);
 }
 
+#if 0
 void SipIdentity::setSipUri(string addr){
 	if (addr.substr(0,4)=="sip:")
 			addr = addr.substr(4);
@@ -290,6 +290,7 @@
 	unlock();
 	return ret;
 }
+#endif
 
 MRef<SipProxy *> SipIdentity::getSipProxy() {
 	return sipProxy;
@@ -381,8 +382,7 @@
 string SipIdentity::getDebugString(){
 	lock();
 	string ret = "identity="+identityIdx+
-			"; username="+sipUsername+ 
-			"; domain="+sipDomain + 
+			"; uri="+sipUri.getString()+ 
 			" proxy=["+(getSipProxy()?getSipProxy()->getDebugString():"")+
 			"]; isRegistered="+itoa(currentlyRegistered);
 	unlock();

Modified: trunk/libmsip/source/dialogs/SipDialogManagement.cxx
===================================================================
--- trunk/libmsip/source/dialogs/SipDialogManagement.cxx	2006-11-12 17:55:59 UTC (rev 2901)
+++ trunk/libmsip/source/dialogs/SipDialogManagement.cxx	2006-11-12 18:22:40 UTC (rev 2902)
@@ -760,7 +760,7 @@
 		}
 		
 		CommandString cmdstr( (*it)->dialogState.callId, SipCommandString::proxy_register);
-		cmdstr["proxy_domain"] = (*it)->getDialogConfig()->sipIdentity->sipDomain;
+		cmdstr["proxy_domain"] = (*it)->getDialogConfig()->sipIdentity->getSipUri().getIp();
 		cmdstr.setParam3("0"); //expires = 0 ==> de-register
 		
 		SipSMCommand cmd( cmdstr,
@@ -769,7 +769,7 @@
 		sipStack->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 		pendingDeRegs++;
 		merr << "    De-registration request sent (username = " << 
-			(*it)->getDialogConfig()->sipIdentity->getSipUri() << ")" << end;
+			(*it)->getDialogConfig()->sipIdentity->getSipUri().getString() << ")" << end;
 	}
 	if( pendingDeRegs == 0 ) {
 		//if we have not sent any de-regs ... notify all un-registered
@@ -801,7 +801,7 @@
 		}
 		
 		CommandString cmdstr( (*it)->dialogState.callId, SipCommandString::proxy_register);
-		cmdstr["proxy_domain"] = (*it)->getDialogConfig()->sipIdentity->sipDomain;
+		cmdstr["proxy_domain"] = (*it)->getDialogConfig()->sipIdentity->getSipUri().getIp();
 		//expires = defaultExpires, read from the config file
 		cmdstr.setParam3((*it)->getDialogConfig()->sipIdentity->getSipProxy()->getDefaultExpires()); 
 		
@@ -811,7 +811,7 @@
 		sipStack->enqueueCommand(cmd, HIGH_PRIO_QUEUE);
 		pendingDeRegs++;
 		merr << "    Registration request sent (username = " << 
-			(*it)->getDialogConfig()->sipIdentity->getSipUri() << ")" << end;
+			(*it)->getDialogConfig()->sipIdentity->getSipUri().getString() << ")" << end;
 	}
 	if( pendingDeRegs == 0 ) {
 		//if we have not sent any de-regs ... notify all un-registered

Modified: trunk/libmsip/source/dialogs/SipDialogRegister.cxx
===================================================================
--- trunk/libmsip/source/dialogs/SipDialogRegister.cxx	2006-11-12 17:55:59 UTC (rev 2901)
+++ trunk/libmsip/source/dialogs/SipDialogRegister.cxx	2006-11-12 18:22:40 UTC (rev 2902)
@@ -615,6 +615,7 @@
 	setUpStateMachine();
 	dialogState.callId = itoa(rand())+"@"+getDialogConfig()->inherited->localIpString;
 
+#if 0
 	if (getDialogConfig()->sipIdentity->sipDomain==""){
 		uint32_t i=0;
 		string uri = getDialogConfig()->sipIdentity->getSipUri();
@@ -629,11 +630,13 @@
 				getDialogConfig()->sipIdentity->sipDomain+uri[i];
 		}
 	}
+#endif
+
 #ifdef DEBUG_OUTPUT
-	mdbg << "SipDialogRegister::SipDialogRegister: DEBUG - domain set to "<< getDialogConfig()->sipIdentity->sipDomain << end;
+	mdbg << "SipDialogRegister::SipDialogRegister: DEBUG - domain set to "<< getDialogConfig()->sipIdentity->getSipUri().getIp() << end;
 #endif
 
-	myDomain = getDialogConfig()->sipIdentity->sipDomain;
+	myDomain = getDialogConfig()->sipIdentity->getSipUri().getIp();
 }
 
 SipDialogRegister::~SipDialogRegister(){
@@ -656,7 +659,7 @@
 		&& (command.getDestination()==SipSMCommand::dialog_layer /*|| command.getDestination()==SipSMCommand::ANY*/)
 		&& (command.getCommandString().getOp()==SipCommandString::proxy_register)
 		&& ( command.getCommandString()["proxy_domain"]=="" 
-			 || command.getCommandString()["proxy_domain"]== getDialogConfig()->sipIdentity->sipDomain)
+			|| command.getCommandString()["proxy_domain"]== getDialogConfig()->sipIdentity->getSipUri().getIp())
 			){
 		return SipDialog::handleCommand(command);
 	}
@@ -694,7 +697,7 @@
 	MRef<SipRequest*> reg= SipRequest::createSipMessageRegister(
 		branch, 
 		dialogState.callId,
-		getDialogConfig()->sipIdentity->sipDomain, //proxy_domain,
+		getDialogConfig()->sipIdentity->getSipUri().getIp(), //proxy_domain,
 		getDialogConfig()->inherited->externalContactIP,
 		getDialogConfig()->inherited->getLocalSipPort(true), //if udp, use stun
 		getDialogConfig()->sipIdentity->getSipUri(),

Modified: trunk/minisip/minisip/gui/gtkgui/AccountsList.cxx
===================================================================
--- trunk/minisip/minisip/gui/gtkgui/AccountsList.cxx	2006-11-12 17:55:59 UTC (rev 2901)
+++ trunk/minisip/minisip/gui/gtkgui/AccountsList.cxx	2006-11-12 18:22:40 UTC (rev 2902)
@@ -67,7 +67,7 @@
 		Gtk::TreeModel::iterator iter = append();
 		(*iter)[columns->identity] = (*i);
 		(*iter)[columns->name] = (*i)->identityIdentifier;
-		(*iter)[columns->uri] = (*i)->sipUsername + "@" + (*i)->sipDomain;
+		(*iter)[columns->uri] = (*i)->getSipUri().getUserIpString();
 		(*iter)[columns->autodetectSettings] = (*i)->getSipProxy()->autodetectSettings;
 		(*iter)[columns->proxy] = (*i)->getSipProxy()->sipProxyAddressString;
 		(*iter)[columns->port] = (*i)->getSipProxy()->sipProxyPort;

Modified: trunk/minisip/minisip/gui/gtkgui/AccountsStatusWidget.cxx
===================================================================
--- trunk/minisip/minisip/gui/gtkgui/AccountsStatusWidget.cxx	2006-11-12 17:55:59 UTC (rev 2901)
+++ trunk/minisip/minisip/gui/gtkgui/AccountsStatusWidget.cxx	2006-11-12 18:22:40 UTC (rev 2902)
@@ -129,7 +129,7 @@
 			CommandString reg( "", SipCommandString::proxy_register );
 			reg["identityId"] = id->getId();
 			id->lock();
-			reg["proxy_domain"] = id->sipDomain;
+			reg["proxy_domain"] = id->getSipUri().getIp();
 			reg.setParam3( id->getSipProxy()->getDefaultExpires() );
 			id->unlock();
 			callback->handleCommand("sip", reg );
@@ -149,7 +149,7 @@
 			CommandString reg( "", SipCommandString::proxy_register );
 			reg["identityId"] = id->getId();
 			id->lock();
-			reg["proxy_domain"] = id->sipDomain;
+			reg["proxy_domain"] = id->getSipUri().getIp();
 			id->unlock();
 			reg.setParam3( "0" );
 			callback->handleCommand("sip", reg );

Modified: trunk/minisip/minisip/gui/gtkgui/MainWindow.cxx
===================================================================
--- trunk/minisip/minisip/gui/gtkgui/MainWindow.cxx	2006-11-12 17:55:59 UTC (rev 2901)
+++ trunk/minisip/minisip/gui/gtkgui/MainWindow.cxx	2006-11-12 18:22:40 UTC (rev 2902)
@@ -678,7 +678,7 @@
 	Gtk::HBox * hbox = new Gtk::HBox;
 	Glib::ustring tabLabelText;
 
-	string from = config->defaultIdentity->sipUsername + "@" + config->defaultIdentity->sipDomain;
+	string from = config->defaultIdentity->getSipUri().getUserIpString();
 	ConferenceWidget * conferenceWidget = new ConferenceWidget(from, confId, users, remoteUri,callId, this, incoming);
 
 	conferenceWidgets.push_back( conferenceWidget );
@@ -718,7 +718,7 @@
 }
 
 ImWidget * MainWindow::addIm( string uri ){
-	string from = config->defaultIdentity->sipUsername + "@" + config->defaultIdentity->sipDomain;
+	string from = config->defaultIdentity->getSipUri().getUserIpString();
 	ImWidget * imWidget = new ImWidget( this, uri, from );
 
 	imWidgets.push_back( imWidget );

Modified: trunk/minisip/minisip/gui/textui/MinisipTextUI.cxx
===================================================================
--- trunk/minisip/minisip/gui/textui/MinisipTextUI.cxx	2006-11-12 17:55:59 UTC (rev 2901)
+++ trunk/minisip/minisip/gui/textui/MinisipTextUI.cxx	2006-11-12 18:22:40 UTC (rev 2902)
@@ -278,7 +278,7 @@
 				confid=confid+users[i];
 				i++;
 			}
-			string mysipuri = config->defaultIdentity->sipUsername + "@" + config->defaultIdentity->sipDomain;
+			string mysipuri = config->defaultIdentity->getSipUri().getUserIpString();
 			users=trim(users.substr(i));
 			currentconf=new ConferenceControl(mysipuri,confid,false);
 			confCallback->setConferenceController(currentconf);
@@ -780,7 +780,7 @@
 			displayMessage("UNIMPLEMENTED - only one call/conference at the time with this UI.", red);
 		}else{
 			currentconfname = itoa(rand());
-			string mysipuri = config->defaultIdentity->sipUsername + "@" + config->defaultIdentity->sipDomain;
+			string mysipuri = config->defaultIdentity->getSipUri().getUserIpString();
 			currentconf=new ConferenceControl(mysipuri,currentconfname, true);
 			//conf->setGui(this);
 			confCallback->setConferenceController(currentconf);

More information about the Minisip-devel mailing list