Attachment #2742 for bug #2723

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. View | Details | Raw Unified | Return to bug 2723
Collapse All | Expand All




{
	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;
	}

void JabberConnector::slotSrvLookup()
{
	if( mSrvResolver->failed() ) {
		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 ();
		mSrvResolver->next();
	}
}


Lines 57-62 private slots: Link Here

(-)a/kopete/protocols/jabber/jabberconnector.h (+1 lines)
57	void slotSrvLookup ();	57	void slotSrvLookup ();
58		58
59	private:	59	private:
		60	TQString mServer;
60	TQString mHost;	61	TQString mHost;
61	TQ_UINT16 mPort;	62	TQ_UINT16 mPort;
62	int mErrorCode;	63	int mErrorCode;

Return to bug 2723

Lines 47-58 void JabberConnector::connectToServer ( const TQString &server ) Link Here

(-)a/kopete/protocols/jabber/jabberconnector.cpp (-6 / +11 lines)
47	{	47	{
48	kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Initiating connection to " << server << endl;	48	kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Initiating connection to " << server << endl;
49		49
		50	mServer = server;
50	mErrorCode = KNetwork::TDESocketBase::NoError;	51	mErrorCode = KNetwork::TDESocketBase::NoError;
51		52
52	if( mHost.isEmpty() ) {	53	if( mHost.isEmpty() ) {
53	if( mSrvResolver->isBusy() ) {
54	mSrvResolver->stop();
55	}
56	mSrvResolver->resolve(server, "xmpp-client", "tcp");	54	mSrvResolver->resolve(server, "xmpp-client", "tcp");
57	return;	55	return;
58	}	56	}
Lines 90-103 void JabberConnector::slotError ( int code ) Link Here
90	void JabberConnector::slotSrvLookup()	88	void JabberConnector::slotSrvLookup()
91	{	89	{
92	if( mSrvResolver->failed() ) {	90	if( mSrvResolver->failed() ) {
93	mErrorCode = KNetwork::TDESocketBase::LookupFailure;	91	if( mErrorCode == KNetwork::TDESocketBase::NoError ) {
94	emit error ();	92	// SRV records probably not exist - try server and default port as fallback
		93	if ( !mByteStream->connect ( mServer, TQString::number ( 5222 ) )) {
		94	mErrorCode = mByteStream->socket()->error ();
		95	}
		96	}
		97	if( mErrorCode != KNetwork::TDESocketBase::NoError ) {
		98	emit error ();
		99	}
95	return;	100	return;
96	}	101	}
97		102
98	if( !mByteStream->connect( mSrvResolver->resultAddress().toString(), TQString::number( mSrvResolver->resultPort() ))) {	103	if( !mByteStream->connect( mSrvResolver->resultAddress().toString(), TQString::number( mSrvResolver->resultPort() ))) {
99	mErrorCode = mByteStream->socket()->error ();	104	mErrorCode = mByteStream->socket()->error ();
100	emit error ();	105	mSrvResolver->next();
101	}	106	}
102	}	107	}
103		108