[Gaim-commits] SF.net SVN: gaim: [16666] trunk/src/protocols/jabber/jabber.c

[<ev...@us...>]

Revision: 16666
Author:   evands
Date:     2006-08-07 12:23:42 -0700 (Mon, 07 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16666&view=rev

Log Message:
-----------
When not connecting with "Use TLS (if available)" enabled, it's still possible to reach the JABBER_STREAM_REINITIALIZING connection stage.  This is step 4 of the 5-step non-SSL connection process.  In this situation, jabber_recv_cb_ssl() won't be called, so the delayed reintialization via js_>reinit being TRUE never occurs.  jabber_stream_init() is immediately called in that situation.

This may cause the same problems when using libxml which js->reinit was introduced to fix in [16585].  I'm not using libxml, so I couldn't test that... if so, a check against js->reinit and a subsequent jabber_stream_init() call is needed somewhere in the connection path taken when not using SSL.

Modified Paths:
--------------
    trunk/src/protocols/jabber/jabber.c
Modified: trunk/src/protocols/jabber/jabber.c
===================================================================
--- trunk/src/protocols/jabber/jabber.c	2006-08-07 17:16:54 UTC (rev 16665)
+++ trunk/src/protocols/jabber/jabber.c	2006-08-07 19:23:42 UTC (rev 16666)
@@ -1011,8 +1011,13 @@
 			break;
 		case JABBER_STREAM_REINITIALIZING:
 			gaim_connection_update_progress(js->gc, _("Re-initializing Stream"),
-					6, JABBER_CONNECT_STEPS);
-			js->reinit = TRUE;
+					(js->gsc ? 7 : 4), JABBER_CONNECT_STEPS);
+			if (js->gsc) {
+				/* The stream will be reinitialized later, in jabber_recv_cb_ssl() */
+				js->reinit = TRUE;
+			} else {
+				jabber_stream_init(js);
+			}
 			break;
 		case JABBER_STREAM_CONNECTED:
 			jabber_roster_request(js);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.