Changeset 4ff0966

Timestamp:

2006-05-28T23:13:47Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

df417ca

Parents:

cdca30b (diff), 79b6213 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging from main/jelmer.

Files:

• configure (modified) (4 diffs)
• doc/README (modified) (1 diff)
• irc_commands.c (modified) (2 diffs)
• protocols/http_client.c (modified) (13 diffs)
• protocols/http_client.h (modified) (1 diff)
• protocols/msn/ns.c (modified) (1 diff)
• protocols/msn/passport.c (modified) (9 diffs)
• protocols/msn/passport.h (modified) (1 diff)
• protocols/msn/sb.c (modified) (2 diffs)
• protocols/msn/tables.c (modified) (1 diff)
• util.c (modified) (4 diffs)

configure

@@ -169 +169 @@
 fi
 
-GLIB=0
-
 if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then
         cat<<EOF>>Makefile.settings
@@ -176 +174 @@
 CFLAGS+=`$PKG_CONFIG --cflags glib-2.0 gmodule-2.0`
 EOF
-        echo '#define GLIB2' >> config.h
-        GLIB=2
-elif type glib-config > /dev/null 2> /dev/null; then
-        cat<<EOF>>Makefile.settings
-EFLAGS+=`glib-config --libs`
-CFLAGS+=`glib-config --cflags`
-EOF
-        echo '#define GLIB1' >> config.h
-        GLIB=1
-else
-        echo 'Cannot find glib development libraries, aborting. (Install libglib-dev?)'
+else
+        echo 'Cannot find glib2 development libraries, aborting. (Install libglib2-dev?)'
         exit 1;
 fi
-
-if [ GLIB = 1 -o -r /usr/include/iconv.h ]; then
-        :;
-elif [ -r /usr/local/include/iconv.h ]; then
-        echo CFLAGS+=-I/usr/local/include >> Makefile.settings
-else
-        echo
-        echo 'Warning: Could not find iconv.h, you might have to install it and/or modify'
-        echo 'Makefile.settings to tell where this file is.'
-fi
-
 
 if [ "$events" = "libevent" ]; then
@@ -223 +201 @@
 fi
 echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings
-
 
 detect_gnutls()
@@ -420 +397 @@
 ;;
 *BSD )
-        echo 'EFLAGS+=-liconv' >> Makefile.settings;
+;;
+Darwin )
+;;
+IRIX )
 ;;
 SunOS )
         echo 'EFLAGS+=-lresolv -lnsl -lsocket' >> Makefile.settings
         echo 'STRIP=\# skip strip' >> Makefile.settings
-        echo 'EFLAGS+=-liconv' >> Makefile.settings;
-;;
-Darwin )
-        echo 'EFLAGS+=-liconv' >> Makefile.settings;
-;;
-IRIX )
 ;;
 CYGWIN* )

doc/README

@@ -47 +47 @@
 
 BitlBee's only real dependency is GLib. This is available on virtually every
-platform. Any recent version of GLib (including 1.x versions) will work.
+platform. Any recent version of GLib (2.0 or higher) will work.
 
 These days, MSN Messenger clients have to connect to the MS Passport servers

irc_commands.c

@@ -321 +321 @@
 {
         user_t *u;
-        char buff[IRC_MAX_LINE];
+        char buff[IRC_MAX_LINE], *s;
         int lenleft, i;
         
@@ -331 +331 @@
         for( i = 1; cmd[i]; i ++ )
         {
-                if( ( u = user_find( irc, cmd[i] ) ) && u->online )
-                {
-                        /* [SH] Make sure we don't use too much buffer space. */
-                        lenleft -= strlen( u->nick ) + 1;
-                        
-                        if( lenleft < 0 )
+                char *this, *next;
+                
+                this = cmd[i];
+                while( *this )
+                {
+                        if( ( next = strchr( this, ' ' ) ) )
+                                *next = 0;
+                        
+                        if( ( u = user_find( irc, this ) ) && u->online )
+                        {
+                                lenleft -= strlen( u->nick ) + 1;
+                                
+                                if( lenleft < 0 )
+                                        break;
+                                
+                                strcat( buff, u->nick );
+                                strcat( buff, " " );
+                        }
+                        
+                        if( next )
+                        {
+                                *next = ' ';
+                                this = next + 1;
+                        }
+                        else
                         {
                                 break;
-                        }
-                        
-                        /* [SH] Add the nick to the buffer. Note
-                         * that an extra space is always added. Even
-                         * if it's the last nick in the list. Who
-                         * cares?
-                         */
-                        
-                        strcat( buff, u->nick );
-                        strcat( buff, " " );
-                }
-        }
-        
-        /* [WvG] Well, maybe someone cares, so why not remove it? */
+                        }    
+                }
+                
+                /* *sigh* */
+                if( lenleft < 0 )
+                        break;
+        }
+        
         if( strlen( buff ) > 0 )
                 buff[strlen(buff)-1] = '\0';

protocols/http_client.c

@@ -157 +157 @@
         
 error:
+        req->status_string = g_strdup( "Error while writing HTTP request" );
+        
         req->func( req );
         
@@ -216 +218 @@
                         if( !sockerr_again() )
                         {
+                                req->status_string = g_strdup( strerror( errno ) );
                                 goto cleanup;
                         }
@@ -243 +246 @@
            support... */
         if( req->bytes_read == 0 )
+        {
+                req->status_string = g_strdup( "Empty HTTP reply" );
                 goto cleanup;
+        }
         
         /* Zero termination is very convenient. */
@@ -264 +270 @@
         else
         {
+                req->status_string = g_strdup( "Malformed HTTP reply" );
                 goto cleanup;
         }
@@ -279 +286 @@
         {
                 if( sscanf( end1 + 1, "%d", &req->status_code ) != 1 )
+                {
+                        req->status_string = g_strdup( "Can't parse status code" );
                         req->status_code = -1;
-        }
-        else
-        {
+                }
+                else
+                {
+                        char *eol;
+                        
+                        if( evil_server )
+                                eol = strchr( end1, '\n' );
+                        else
+                                eol = strchr( end1, '\r' );
+                        
+                        req->status_string = g_strndup( end1 + 1, eol - end1 - 1 );
+                        
+                        /* Just to be sure... */
+                        if( ( eol = strchr( req->status_string, '\r' ) ) )
+                                *eol = 0;
+                        if( ( eol = strchr( req->status_string, '\n' ) ) )
+                                *eol = 0;
+                }
+        }
+        else
+        {
+                req->status_string = g_strdup( "Can't locate status code" );
                 req->status_code = -1;
         }
@@ -291 +319 @@
                 int error = 0, new_port, new_proto;
                 
+                /* We might fill it again, so let's not leak any memory. */
+                g_free( req->status_string );
+                req->status_string = NULL;
+                
                 loc = strstr( req->reply_headers, "\nLocation: " );
                 if( loc == NULL ) /* We can't handle this redirect... */
+                {
+                        req->status_string = g_strdup( "Can't locate Location: header" );
                         goto cleanup;
+                }
                 
                 loc += 11;
@@ -310 +345 @@
                            don't need this yet anyway, I won't implement it. */
                         
+                        req->status_string = g_strdup( "Can't handle recursive redirects" );
+                        
                         goto cleanup;
                 }
@@ -327 +364 @@
                         if( !url_set( url, loc ) )
                         {
+                                req->status_string = g_strdup( "Malformed redirect URL" );
                                 g_free( url );
                                 goto cleanup;
@@ -337 +375 @@
                            going to use strcat(), whether you like it or not. :-) */
                         
-                        /* First, find the GET/POST/whatever from the original request. */
-                        s = strchr( req->request, ' ' );
+                        sprintf( new_request, "GET %s HTTP/1.0", url->file );
+                        
+                        s = strstr( req->request, "\r\n" );
                         if( s == NULL )
                         {
+                                req->status_string = g_strdup( "Error while rebuilding request string" );
                                 g_free( new_request );
                                 g_free( url );
@@ -346 +386 @@
                         }
                         
-                        *s = 0;
-                        sprintf( new_request, "%s %s HTTP/1.0\r\n", req->request, url->file );
-                        *s = ' ';
-                        
-                        s = strstr( req->request, "\r\n" );
-                        if( s == NULL )
-                        {
-                                g_free( new_request );
-                                g_free( url );
-                                goto cleanup;
-                        }
-                        
-                        strcat( new_request, s + 2 );
+                        strcat( new_request, s );
                         new_host = g_strdup( url->host );
                         new_port = url->port;
@@ -372 +400 @@
                 
                 req->fd = -1;
-                req->ssl = 0;
+                req->ssl = NULL;
                 
                 if( new_proto == PROTO_HTTPS )
@@ -390 +418 @@
                 if( error )
                 {
+                        req->status_string = g_strdup( "Connection problem during redirect" );
                         g_free( new_request );
                         goto cleanup;
@@ -418 +447 @@
         g_free( req->request );
         g_free( req->reply_headers );
+        g_free( req->status_string );
         g_free( req );
         

protocols/http_client.h

@@ -37 +37 @@
         int request_length;
         int status_code;
+        char *status_string;
         char *reply_headers;
         char *reply_body;

protocols/msn/ns.c

@@ -656 +656 @@
         if( key == NULL )
         {
-                hide_login_progress( gc, "Error during Passport authentication" );
+                char *err;
+                
+                err = g_strdup_printf( "Error during Passport authentication (%s)",
+                                       rep->error_string ? rep->error_string : "Unknown error" );
+                
+                hide_login_progress( gc, err );
                 signoff( gc );
+                
+                g_free( err );
         }
         else

protocols/msn/passport.c

@@ -69 +69 @@
         }
         
-        reqs = g_malloc( strlen( header ) + strlen( dummy ) + 128 );
-        sprintf( reqs, "GET %s HTTP/1.0\r\n%s\r\n\r\n", dummy, header );
+        reqs = g_strdup_printf( "GET %s HTTP/1.0\r\n%s\r\n\r\n", dummy, header );
         
         *dummy = 0;
@@ -88 +87 @@
         struct passport_reply *rep = req->data;
         
-        if( !g_slist_find( msn_connections, rep->data ) || !req->finished || !req->reply_headers )
+        if( !g_slist_find( msn_connections, rep->data ) )
         {
                 destroy_reply( rep );
@@ -94 +93 @@
         }
         
-        if( req->status_code == 200 )
+        if( req->finished && req->reply_headers && req->status_code == 200 )
         {
                 char *dummy;
@@ -109 +108 @@
                         rep->result = g_strdup( dummy );
                 }
+                else
+                {
+                        rep->error_string = g_strdup( "Could not parse Passport server response" );
+                }
+        }
+        else
+        {
+                rep->error_string = g_strdup_printf( "HTTP error: %s",
+                                      req->status_string ? req->status_string : "Unknown error" );
         }
         
@@ -145 +153 @@
 }
 
-#define PPR_REQUEST "GET /rdr/pprdr.asp HTTP/1.0\r\n\r\n"
 static int passport_retrieve_dalogin( gpointer func, gpointer data, char *header )
 {
@@ -155 +162 @@
         rep->header = header;
         
-        req = http_dorequest( "nexus.passport.com", 443, 1, PPR_REQUEST, passport_retrieve_dalogin_ready, rep );
+        req = http_dorequest_url( "https://nexus.passport.com/rdr/pprdr.asp", passport_retrieve_dalogin_ready, rep );
         
         if( !req )
@@ -169 +176 @@
         char *urlend;
         
-        if( !g_slist_find( msn_connections, rep->data ) || !req->finished || !req->reply_headers )
+        if( !g_slist_find( msn_connections, rep->data ) )
         {
                 destroy_reply( rep );
@@ -175 +182 @@
         }
         
+        if( !req->finished || !req->reply_headers || req->status_code != 200 )
+        {
+                rep->error_string = g_strdup_printf( "HTTP error while fetching DALogin: %s",
+                                        req->status_string ? req->status_string : "Unknown error" );
+                goto failure;
+        }
+        
         dalogin = strstr( req->reply_headers, "DALogin=" );     
         
         if( !dalogin )
+        {
+                rep->error_string = g_strdup( "Parse error while fetching DALogin" );
                 goto failure;
+        }
         
         dalogin += strlen( "DALogin=" );
@@ -208 +225 @@
         g_free( rep->result );
         g_free( rep->header );
+        g_free( rep->error_string );
         g_free( rep );
 }

protocols/msn/passport.h

@@ -39 +39 @@
         char *result;
         char *header;
+        char *error_string;
 };
 

protocols/msn/sb.c

@@ -529 +529 @@
                 {
                         msn_sb_destroy( sb );
-                        return( 0 );
-                }
-                if( err->flags & STATUS_FATAL )
+                        return 0;
+                }
+                else if( err->flags & STATUS_FATAL )
                 {
                         signoff( gc );
-                        return( 0 );
-                }
-                if( err->flags & STATUS_SB_IM_SPARE )
+                        return 0;
+                }
+                else if( err->flags & STATUS_SB_IM_SPARE )
                 {
                         if( sb->who )
@@ -559 +559 @@
                                 sb->msgq = NULL;
                         }
+                        
+                        /* Do NOT return 0 here, we want to keep this sb. */
                 }
         }

protocols/msn/tables.c

@@ -127 +127 @@
         
         { 910, "Server is busy",                                        STATUS_FATAL },
-        { 911, "Authentication failed",                                 STATUS_FATAL },
+        { 911, "Authentication failed",                                 STATUS_SB_FATAL | STATUS_FATAL },
         { 912, "Server is busy",                                        STATUS_FATAL },
         { 913, "Not allowed when hiding",                               0 },

util.c

@@ -39 +39 @@
 #include <glib.h>
 #include <time.h>
-#ifdef GLIB2
-#define iconv_t GIConv
-#define iconv_open g_iconv_open
-#define iconv_close g_iconv_close
-#define iconv g_iconv
-#else
-#include <iconv.h>
-#endif
 
 void strip_linefeed(gchar *text)
@@ -465 +457 @@
 signed int do_iconv( char *from_cs, char *to_cs, char *src, char *dst, size_t size, size_t maxbuf )
 {
-        iconv_t cd;
+        GIConv cd;
         size_t res;
         size_t inbytesleft, outbytesleft;
@@ -471 +463 @@
         char *outbuf = dst;
         
-        cd = iconv_open( to_cs, from_cs );
-        if( cd == (iconv_t) -1 )
+        cd = g_iconv_open( to_cs, from_cs );
+        if( cd == (GIConv) -1 )
                 return( -1 );
         
         inbytesleft = size ? size : strlen( src );
         outbytesleft = maxbuf - 1;
-        res = iconv( cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft );
+        res = g_iconv( cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft );
         *outbuf = '\0';
-        iconv_close( cd );
+        g_iconv_close( cd );
         
         if( res == (size_t) -1 )
@@ -489 +481 @@
 char *set_eval_charset( irc_t *irc, set_t *set, char *value )
 {
-        iconv_t cd;
+        GIConv cd;
 
         if ( g_strncasecmp( value, "none", 4 ) == 0 )
                 return( value );
 
-        cd = iconv_open( "UTF-8", value );
-        if( cd == (iconv_t) -1 )
+        cd = g_iconv_open( "UTF-8", value );
+        if( cd == (GIConv) -1 )
                 return( NULL );
 
-        iconv_close( cd );
+        g_iconv_close( cd );
         return( value );
 }