Attachment 2742 Details for Bug 2723 – Process all SRV records or fallback if SRV records not exist

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Process all SRV records or fallback if SRV records not exist

bp001-kopete-jabber-try-all-srv-and-fallback.diff (text/plain), 1.79 KB, created by Slávek Banko on 2016-11-13 04:18:43 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2016-11-13 04:18:43 CST

Size: 1.79 KB

patch

obsolete

>diff --git a/kopete/protocols/jabber/jabberconnector.cpp b/kopete/protocols/jabber/jabberconnector.cpp
>index 1a2febf..d08db42 100644
>--- a/kopete/protocols/jabber/jabberconnector.cpp
>+++ b/kopete/protocols/jabber/jabberconnector.cpp
>@@ -47,12 +47,10 @@ void JabberConnector::connectToServer ( const TQString &server )
> {
> 	kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Initiating connection to " << server << endl;
> 
>+	mServer = server;
> 	mErrorCode = KNetwork::TDESocketBase::NoError;
> 
> 	if( mHost.isEmpty() ) {
>-		if( mSrvResolver->isBusy() ) {
>-			mSrvResolver->stop();
>-		}
> 		mSrvResolver->resolve(server, "xmpp-client", "tcp");
> 		return;
> 	}
>@@ -90,14 +88,21 @@ void JabberConnector::slotError ( int code )
> void JabberConnector::slotSrvLookup()
> {
> 	if( mSrvResolver->failed() ) {
>-		mErrorCode = KNetwork::TDESocketBase::LookupFailure;
>-		emit error ();
>+		if( mErrorCode == KNetwork::TDESocketBase::NoError ) {
>+			// SRV records probably not exist - try server and default port as fallback
>+			if ( !mByteStream->connect ( mServer, TQString::number ( 5222 ) )) {
>+				mErrorCode = mByteStream->socket()->error ();
>+			}
>+		}
>+		if( mErrorCode != KNetwork::TDESocketBase::NoError ) {
>+			emit error ();
>+		}
> 		return;
> 	}
> 
> 	if( !mByteStream->connect( mSrvResolver->resultAddress().toString(), TQString::number( mSrvResolver->resultPort() ))) {
> 		mErrorCode = mByteStream->socket()->error ();
>-		emit error ();
>+		mSrvResolver->next();
> 	}
> }
> 
>diff --git a/kopete/protocols/jabber/jabberconnector.h b/kopete/protocols/jabber/jabberconnector.h
>index 10a7c44..c006210 100644
>--- a/kopete/protocols/jabber/jabberconnector.h
>+++ b/kopete/protocols/jabber/jabberconnector.h
>@@ -57,6 +57,7 @@ private slots:
> 	void slotSrvLookup ();
> 
> private:
>+	TQString mServer;
> 	TQString mHost;
> 	TQ_UINT16 mPort;
> 	int mErrorCode;

Actions: View | Diff

Attachments on bug 2723: 2742