Changeset af7f046 for protocols

Timestamp:

2010-03-14T16:56:00Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

8fb1263

Parents:

435f552

Message:

Don't send a <?xml> stream start after starttls since it upsets certain
jabberd's including Zimbra's. Thanks to jMCg and balzar in #bitlbee for
helping with figuring this out.

Location:

protocols/jabber

Files:

• io.c (modified) (2 diffs)
• jabber.h (modified) (1 diff)

protocols/jabber/io.c

@@ -441 +441 @@
         imcb_log( ic, "Converting stream to TLS" );
         
+        jd->flags |= JFLAG_STARTTLS_DONE;
         jd->ssl = ssl_starttls( jd->fd, jabber_connected_ssl, ic );
         
@@ -531 +532 @@
                 jd->r_inpa = b_input_add( jd->fd, GAIM_INPUT_READ, jabber_read_callback, ic );
         
-        greet = g_strdup_printf( "<?xml version='1.0' ?>"
-                                 "<stream:stream to=\"%s\" xmlns=\"jabber:client\" "
-                                  "xmlns:stream=\"http://etherx.jabber.org/streams\" version=\"1.0\">", jd->server );
+        greet = g_strdup_printf( "%s<stream:stream to=\"%s\" xmlns=\"jabber:client\" "
+                                  "xmlns:stream=\"http://etherx.jabber.org/streams\" version=\"1.0\">", 
+                                  ( jd->flags & JFLAG_STARTTLS_DONE ) ? "" : "<?xml version='1.0' ?>",
+                                  jd->server );
         
         st = jabber_write( ic, greet, strlen( greet ) );

protocols/jabber/jabber.h

@@ -46 +46 @@
                                            activates all XEP-85 related code. */
         JFLAG_XMLCONSOLE = 64,          /* If the user added an xmlconsole buddy. */
+        JFLAG_STARTTLS_DONE = 128,      /* If a plaintext session was converted to TLS. */
 } jabber_flags_t;