- Timestamp:
- 2006-09-22T12:04:35Z (18 years ago)
- Branches:
- master
- Children:
- 8d74291
- Parents:
- deff040
- Location:
- protocols/jabber
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/jabber/Makefile
rdeff040 r5997488 10 10 11 11 # [SH] Program variables 12 objects = io.o iq.o jabber.o jabber_util.o message.o presence.o xmltree.o12 objects = io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o xmltree.o 13 13 14 14 CFLAGS += -Wall -
protocols/jabber/io.c
rdeff040 r5997488 134 134 aborted the connection already... Or not? FIXME */ 135 135 return FALSE; 136 } 137 138 if( jd->flags & JFLAG_STREAM_RESTART ) 139 { 140 jd->flags &= ~JFLAG_STREAM_RESTART; 141 xt_reset( jd->xt ); 142 jabber_start_stream( gc ); 136 143 } 137 144 … … 204 211 { "message", "stream:stream", jabber_pkt_message }, 205 212 { "presence", "stream:stream", jabber_pkt_presence }, 213 { "mechanisms", "stream:features", sasl_pkt_mechanisms }, 214 { "challenge", "stream:stream", sasl_pkt_challenge }, 215 { "success", "stream:stream", sasl_pkt_result }, 216 { "failure", "stream:stream", sasl_pkt_result }, 206 217 { NULL, "stream:stream", jabber_pkt_misc }, 207 218 { NULL, NULL, NULL } … … 224 235 greet = g_strdup_printf( "<?xml version='1.0' ?>" 225 236 "<stream:stream to=\"%s\" xmlns=\"jabber:client\" " 226 "xmlns:stream=\"http://etherx.jabber.org/streams\">", jd->server ); 227 /* Add this when TLS and SASL are supported? */ 228 // version=\"1.0\">" 237 "xmlns:stream=\"http://etherx.jabber.org/streams\" version=\"1.0\">", jd->server ); 229 238 230 239 st = jabber_write( gc, greet, strlen( greet ) ); -
protocols/jabber/jabber.h
rdeff040 r5997488 32 32 typedef enum 33 33 { 34 JFLAG_STREAM_STARTED = 1, 35 JFLAG_AUTHENTICATED = 2, 34 JFLAG_STREAM_STARTED = 1, /* Set when we detected the beginning of the stream and want to do auth. */ 35 JFLAG_AUTHENTICATED = 2, /* Set when we're successfully authenticatd. */ 36 JFLAG_STREAM_RESTART = 4, /* Set when we want to restart the stream (after SASL or TLS). */ 37 JFLAG_SUPPORTS_TLS = 8, /* Set when there's <starttls/> in <stream:features>. */ 36 38 } jabber_flags_t; 37 39 … … 60 62 void jabber_end_stream( struct gaim_connection *gc ); 61 63 64 /* sasl.c */ 65 xt_status sasl_pkt_mechanisms( struct xt_node *node, gpointer data ); 66 xt_status sasl_pkt_challenge( struct xt_node *node, gpointer data ); 67 xt_status sasl_pkt_result( struct xt_node *node, gpointer data ); 68 62 69 struct jabber_data 63 70 {
Note: See TracChangeset
for help on using the changeset viewer.