Changes in protocols/jabber/jabber.c [89d736a:5a71d9c]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/jabber/jabber.c
r89d736a r5a71d9c 33 33 #include "jabber.h" 34 34 #include "md5.h" 35 #include "base64.h" 35 36 36 37 GSList *jabber_connections; 37 38 38 /* First enty is the default */39 static const int jabber_port_list[] = {40 5222,41 5223,42 5220,43 5221,44 5224,45 5225,46 5226,47 5227,48 5228,49 5229,50 80,51 443,52 053 };54 55 39 static void jabber_init( account_t *acc ) 56 40 { 57 41 set_t *s; 58 char str[16]; 59 60 g_snprintf( str, sizeof( str ), "%d", jabber_port_list[0] ); 61 s = set_add( &acc->set, "port", str, set_eval_int, acc ); 42 43 s = set_add( &acc->set, "port", JABBER_PORT_DEFAULT, set_eval_int, acc ); 62 44 s->flags |= ACC_SET_OFFLINE_ONLY; 63 45 … … 90 72 struct ns_srv_reply *srv = NULL; 91 73 char *connect_to, *s; 92 int i;93 74 94 75 /* For now this is needed in the _connected() handlers if using … … 196 177 imcb_log( ic, "Connecting" ); 197 178 198 for( i = 0; jabber_port_list[i] > 0; i ++ ) 199 if( set_getint( &acc->set, "port" ) == jabber_port_list[i] ) 200 break; 201 202 if( jabber_port_list[i] == 0 ) 203 { 204 imcb_log( ic, "Illegal port number" ); 179 if( set_getint( &acc->set, "port" ) < JABBER_PORT_MIN || 180 set_getint( &acc->set, "port" ) > JABBER_PORT_MAX ) 181 { 182 imcb_log( ic, "Incorrect port number, must be in the %d-%d range", 183 JABBER_PORT_MIN, JABBER_PORT_MAX ); 205 184 imc_logout( ic, FALSE ); 206 185 return; … … 240 219 } 241 220 242 /* This generates an unfinished md5_state_t variable. Every time we generate243 an ID, we finish the state by adding a sequence number and take the hash. */244 221 static void jabber_generate_id_hash( struct jabber_data *jd ) 245 222 { 246 md5_byte_t binbuf[4]; 223 md5_state_t id_hash; 224 md5_byte_t binbuf[16]; 247 225 char *s; 248 226 249 md5_init( & jd->cached_id_prefix);250 md5_append( & jd->cached_id_prefix, (unsigned char *) jd->username, strlen( jd->username ) );251 md5_append( & jd->cached_id_prefix, (unsigned char *) jd->server, strlen( jd->server ) );227 md5_init( &id_hash ); 228 md5_append( &id_hash, (unsigned char *) jd->username, strlen( jd->username ) ); 229 md5_append( &id_hash, (unsigned char *) jd->server, strlen( jd->server ) ); 252 230 s = set_getstr( &jd->ic->acc->set, "resource" ); 253 md5_append( &jd->cached_id_prefix, (unsigned char *) s, strlen( s ) ); 254 random_bytes( binbuf, 4 ); 255 md5_append( &jd->cached_id_prefix, binbuf, 4 ); 231 md5_append( &id_hash, (unsigned char *) s, strlen( s ) ); 232 random_bytes( binbuf, 16 ); 233 md5_append( &id_hash, binbuf, 16 ); 234 md5_finish( &id_hash, binbuf ); 235 236 s = base64_encode( binbuf, 9 ); 237 jd->cached_id_prefix = g_strdup_printf( "%s%s", JABBER_CACHED_ID, s ); 238 g_free( s ); 256 239 } 257 240 … … 528 511 529 512 ret->name = "jabber"; 513 ret->mms = 0; /* no limit */ 530 514 ret->login = jabber_login; 531 515 ret->init = jabber_init;
Note: See TracChangeset
for help on using the changeset viewer.