Changes in protocols/jabber/jabber.c [89d736a:4ac647d]

File:

• protocols/jabber/jabber.c (modified) (8 diffs)

protocols/jabber/jabber.c

@@ -33 +33 @@
 #include "jabber.h"
 #include "md5.h"
+#include "base64.h"
 
 GSList *jabber_connections;
 
-/* First enty is the default */
-static const int jabber_port_list[] = {
-        5222,
-        5223,
-        5220,
-        5221,
-        5224,
-        5225,
-        5226,
-        5227,
-        5228,
-        5229,
-        80,
-        443,
-        0
-};
-
 static void jabber_init( account_t *acc )
 {
         set_t *s;
-        char str[16];
-        
-        g_snprintf( str, sizeof( str ), "%d", jabber_port_list[0] );
-        s = set_add( &acc->set, "port", str, set_eval_int, acc );
+        
+        s = set_add( &acc->set, "port", JABBER_PORT_DEFAULT, set_eval_int, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;
         
@@ -80 +62 @@
         s = set_add( &acc->set, "xmlconsole", "false", set_eval_bool, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;
+
+        s = set_add( &acc->set, "proxy", "<local>;<auto>", NULL, acc );
 }
 
@@ -90 +74 @@
         struct ns_srv_reply *srv = NULL;
         char *connect_to, *s;
-        int i;
         
         /* For now this is needed in the _connected() handlers if using
@@ -196 +179 @@
         imcb_log( ic, "Connecting" );
         
-        for( i = 0; jabber_port_list[i] > 0; i ++ )
-                if( set_getint( &acc->set, "port" ) == jabber_port_list[i] )
-                        break;
-
-        if( jabber_port_list[i] == 0 )
-        {
-                imcb_log( ic, "Illegal port number" );
+        if( set_getint( &acc->set, "port" ) < JABBER_PORT_MIN ||
+            set_getint( &acc->set, "port" ) > JABBER_PORT_MAX )
+        {
+                imcb_log( ic, "Incorrect port number, must be in the %d-%d range",
+                               JABBER_PORT_MIN, JABBER_PORT_MAX );
                 imc_logout( ic, FALSE );
                 return;
@@ -240 +221 @@
 }
 
-/* This generates an unfinished md5_state_t variable. Every time we generate
-   an ID, we finish the state by adding a sequence number and take the hash. */
 static void jabber_generate_id_hash( struct jabber_data *jd )
 {
-        md5_byte_t binbuf[4];
+        md5_state_t id_hash;
+        md5_byte_t binbuf[16];
         char *s;
         
-        md5_init( &jd->cached_id_prefix );
-        md5_append( &jd->cached_id_prefix, (unsigned char *) jd->username, strlen( jd->username ) );
-        md5_append( &jd->cached_id_prefix, (unsigned char *) jd->server, strlen( jd->server ) );
+        md5_init( &id_hash );
+        md5_append( &id_hash, (unsigned char *) jd->username, strlen( jd->username ) );
+        md5_append( &id_hash, (unsigned char *) jd->server, strlen( jd->server ) );
         s = set_getstr( &jd->ic->acc->set, "resource" );
-        md5_append( &jd->cached_id_prefix, (unsigned char *) s, strlen( s ) );
-        random_bytes( binbuf, 4 );
-        md5_append( &jd->cached_id_prefix, binbuf, 4 );
+        md5_append( &id_hash, (unsigned char *) s, strlen( s ) );
+        random_bytes( binbuf, 16 );
+        md5_append( &id_hash, binbuf, 16 );
+        md5_finish( &id_hash, binbuf );
+        
+        s = base64_encode( binbuf, 9 );
+        jd->cached_id_prefix = g_strdup_printf( "%s%s", JABBER_CACHED_ID, s );
+        g_free( s );
 }
 
@@ -260 +245 @@
         struct jabber_data *jd = ic->proto_data;
         
+        while( jd->filetransfers )
+                imcb_file_canceled( ( ( struct jabber_transfer *) jd->filetransfers->data )->ft, "Logging out" );
+
+        while( jd->streamhosts )
+        {
+                jabber_streamhost_t *sh = jd->streamhosts->data;
+                jd->streamhosts = g_slist_remove( jd->streamhosts, sh );
+                g_free( sh->jid );
+                g_free( sh->host );
+                g_free( sh );
+        }
+
         if( jd->fd >= 0 )
                 jabber_end_stream( ic );
@@ -284 +281 @@
         xt_free( jd->xt );
         
+        g_free( jd->cached_id_prefix );
         g_free( jd->away_message );
         g_free( jd->username );
@@ -546 +544 @@
         ret->send_typing = jabber_send_typing;
         ret->handle_cmp = g_strcasecmp;
+        ret->transfer_request = jabber_si_transfer_request;
 
         register_protocol( ret );