Changes in / [3e91c3e:8e419cb]

Files:

• Makefile (modified) (1 diff)
• bitlbee.c (modified) (8 diffs)
• bitlbee.conf (modified) (3 diffs)
• bitlbee.h (modified) (1 diff)
• commands.c (modified) (5 diffs)
• commands.h (modified) (2 diffs)
• conf.c (modified) (7 diffs)
• conf.h (modified) (2 diffs)
• configure (modified) (8 diffs)
• irc.c (modified) (12 diffs)
• irc.h (modified) (2 diffs)
• protocols/Makefile (modified) (1 diff)
• protocols/http_client.c (added)
• protocols/http_client.h (added)
• protocols/jabber/Makefile (modified) (2 diffs)
• protocols/jabber/jabber.c (modified) (2 diffs)
• protocols/msn/Makefile (modified) (2 diffs)
• protocols/msn/msn.c (modified) (3 diffs)
• protocols/msn/msn.h (modified) (3 diffs)
• protocols/msn/ns.c (modified) (4 diffs)
• protocols/msn/passport.c (modified) (3 diffs)
• protocols/msn/passport.h (modified) (1 diff)
• protocols/msn/sb.c (modified) (2 diffs)
• protocols/msn/tables.c (modified) (8 diffs)
• protocols/nogaim.h (modified) (2 diffs)
• protocols/oscar/Makefile (modified) (2 diffs)
• protocols/oscar/oscar.c (modified) (2 diffs)
• protocols/proxy.c (modified) (1 diff)
• protocols/ssl_bogus.c (modified) (2 diffs)
• protocols/ssl_client.h (modified) (1 diff)
• protocols/ssl_gnutls.c (modified) (9 diffs)
• protocols/ssl_nss.c (modified) (2 diffs)
• protocols/ssl_openssl.c (modified) (7 diffs)
• protocols/util.c (deleted)
• protocols/yahoo/Makefile (modified) (2 diffs)
• protocols/yahoo/yahoo_fn.c (modified) (190 diffs)
• protocols/yahoo/yahoo_util.c (modified) (1 diff)
• sock.h (modified) (1 diff)
• storage_text.c (modified) (1 diff)
• unix.c (modified) (6 diffs)
• url.c (modified) (6 diffs)
• url.h (modified) (2 diffs)
• util.c (added)

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = account.o bitlbee.o commands.o crypting.o help.o ini.o irc.o nick.o query.o set.o url.o user.o storage_text.o storage.o
+objects = account.o bitlbee.o commands.o crypting.o help.o ini.o irc.o nick.o query.o set.o storage.o storage_text.o url.o user.o util.o
 subdirs = protocols
 

bitlbee.c

@@ -37 +37 @@
         size_t size = sizeof( struct sockaddr_in );
         struct sockaddr_in conn_info;
-        int new_socket = accept( global.listen_socket, (struct sockaddr *) &conn_info, 
-                                     &size );
-        
-        log_message( LOGLVL_INFO, "Creating new connection with fd %d.", new_socket );
-        irc_new( new_socket );
-
+        int new_socket = accept( global.listen_socket, (struct sockaddr *) &conn_info, &size );
+        pid_t client_pid = 0;
+        
+        if( global.conf->runmode == RUNMODE_FORKDAEMON )
+                client_pid = fork();
+        
+        if( client_pid == 0 )
+        {
+                log_message( LOGLVL_INFO, "Creating new connection with fd %d.", new_socket );
+                irc_new( new_socket );
+                
+                if( global.conf->runmode == RUNMODE_FORKDAEMON )
+                {
+                        /* Close the listening socket, we're a client. */
+                        close( global.listen_socket );
+                        g_source_remove( global.listen_watch_source_id );
+                }
+        }
+        else
+        {
+                /* We don't need this one, only the client does. */
+                close( new_socket );
+                
+                /* Or maybe we didn't even get a child process... */
+                if( client_pid == -1 )
+                        log_message( LOGLVL_ERROR, "Failed to fork() subprocess for client: %s", strerror( errno ) );
+        }
+        
         return TRUE;
 }
@@ -50 +72 @@
 int bitlbee_daemon_init()
 {
+#ifdef IPV6
+        struct sockaddr_in6 listen_addr;
+#else
         struct sockaddr_in listen_addr;
+#endif
         int i;
         GIOChannel *ch;
         
-        global.listen_socket = socket( AF_INET, SOCK_STREAM, 0 );
+        log_link( LOGLVL_ERROR, LOGOUTPUT_SYSLOG );
+        log_link( LOGLVL_WARNING, LOGOUTPUT_SYSLOG );
+        
+        global.listen_socket = socket( AF_INETx, SOCK_STREAM, 0 );
         if( global.listen_socket == -1 )
         {
@@ -60 +89 @@
                 return( -1 );
         }
-        listen_addr.sin_family = AF_INET;
+        
+#ifdef IPV6
+        listen_addr.sin6_family = AF_INETx;
+        listen_addr.sin6_port = htons( global.conf->port );
+        i = inet_pton( AF_INETx, ipv6_wrap( global.conf->iface ), &listen_addr.sin6_addr );
+#else
+        listen_addr.sin_family = AF_INETx;
         listen_addr.sin_port = htons( global.conf->port );
-        listen_addr.sin_addr.s_addr = inet_addr( global.conf->iface );
-
-        i = bind( global.listen_socket, (struct sockaddr *) &listen_addr, sizeof( struct sockaddr ) );
+        i = inet_pton( AF_INETx, global.conf->iface, &listen_addr.sin_addr );
+#endif
+        
+        if( i != 1 )
+        {
+                log_message( LOGLVL_ERROR, "Couldn't parse address `%s'", global.conf->iface );
+                return( -1 );
+        }
+        
+        i = bind( global.listen_socket, (struct sockaddr *) &listen_addr, sizeof( listen_addr ) );
         if( i == -1 )
         {
@@ -70 +112 @@
                 return( -1 );
         }
-
+        
         i = listen( global.listen_socket, 10 );
         if( i == -1 )
@@ -77 +119 @@
                 return( -1 );
         }
-
+        
         ch = g_io_channel_unix_new( global.listen_socket );
-        g_io_add_watch( ch, G_IO_IN, bitlbee_io_new_client, NULL );
-
+        global.listen_watch_source_id = g_io_add_watch( ch, G_IO_IN, bitlbee_io_new_client, NULL );
+        
 #ifndef _WIN32
         if( !global.conf->nofork )
@@ -175 +217 @@
         int st, size;
         char *temp;
-#ifdef FLOOD_SEND
-        time_t newtime;
-#endif
-
-#ifdef FLOOD_SEND       
-        newtime = time( NULL );
-        if( ( newtime - irc->oldtime ) > FLOOD_SEND_INTERVAL )
-        {
-                irc->sentbytes = 0;
-                irc->oldtime = newtime;
-        }
-#endif
-        
+
         if( irc->sendbuffer == NULL )
                 return( FALSE );
         
         size = strlen( irc->sendbuffer );
-        
-#ifdef FLOOD_SEND
-        if( ( FLOOD_SEND_BYTES - irc->sentbytes ) > size )
-                st = write( irc->fd, irc->sendbuffer, size );
-        else
-                st = write( irc->fd, irc->sendbuffer, ( FLOOD_SEND_BYTES - irc->sentbytes ) );
-#else
         st = write( irc->fd, irc->sendbuffer, size );
-#endif
         
         if( st <= 0 )
@@ -214 +236 @@
                 }
         }
-        
-#ifdef FLOOD_SEND
-        irc->sentbytes += st;
-#endif          
         
         if( st == size )
@@ -246 +264 @@
         g_main_quit( global.loop );
 }
-
-int root_command_string( irc_t *irc, user_t *u, char *command, int flags )
-{
-        char *cmd[IRC_MAX_ARGS];
-        char *s;
-        int k;
-        char q = 0;
-        
-        memset( cmd, 0, sizeof( cmd ) );
-        cmd[0] = command;
-        k = 1;
-        for( s = command; *s && k < ( IRC_MAX_ARGS - 1 ); s ++ )
-                if( *s == ' ' && !q )
-                {
-                        *s = 0;
-                        while( *++s == ' ' );
-                        if( *s == '"' || *s == '\'' )
-                        {
-                                q = *s;
-                                s ++;
-                        }
-                        if( *s )
-                        {
-                                cmd[k++] = s;
-                                s --;
-                        }
-                }
-                else if( *s == q )
-                {
-                        q = *s = 0;
-                }
-        cmd[k] = NULL;
-        
-        return( root_command( irc, cmd ) );
-}
-
-int root_command( irc_t *irc, char *cmd[] )
-{       
-        int i;
-        
-        if( !cmd[0] )
-                return( 0 );
-        
-        for( i = 0; commands[i].command; i++ )
-                if( g_strcasecmp( commands[i].command, cmd[0] ) == 0 )
-                {
-                        if( !cmd[commands[i].required_parameters] )
-                        {
-                                irc_usermsg( irc, "Not enough parameters given (need %d)", commands[i].required_parameters );
-                                return( 0 );
-                        }
-                        commands[i].execute( irc, cmd );
-                        return( 1 );
-                }
-        
-        irc_usermsg( irc, "Unknown command: %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[0] );
-        
-        return( 1 );
-}
-
-/* Decode%20a%20file%20name                                             */
-void http_decode( char *s )
-{
-        char *t;
-        int i, j, k;
-        
-        t = g_new( char, strlen( s ) + 1 );
-        
-        for( i = j = 0; s[i]; i ++, j ++ )
-        {
-                if( s[i] == '%' )
-                {
-                        if( sscanf( s + i + 1, "%2x", &k ) )
-                        {
-                                t[j] = k;
-                                i += 2;
-                        }
-                        else
-                        {
-                                *t = 0;
-                                break;
-                        }
-                }
-                else
-                {
-                        t[j] = s[i];
-                }
-        }
-        t[j] = 0;
-        
-        strcpy( s, t );
-        g_free( t );
-}
-
-/* Warning: This one explodes the string. Worst-cases can make the string 3x its original size! */
-/* This fuction is safe, but make sure you call it safely as well! */
-void http_encode( char *s )
-{
-        char *t;
-        int i, j;
-        
-        t = g_strdup( s );
-        
-        for( i = j = 0; t[i]; i ++, j ++ )
-        {
-                if( t[i] <= ' ' || ((unsigned char *)t)[i] >= 128 || t[i] == '%' )
-                {
-                        sprintf( s + j, "%%%02X", ((unsigned char*)t)[i] );
-                        j += 2;
-                }
-                else
-                {
-                        s[j] = t[i];
-                }
-        }
-        s[j] = 0;
-        
-        g_free( t );
-}
-
-/* Strip newlines from a string. Modifies the string passed to it. */ 
-char *strip_newlines( char *source )
-{
-        int i;  
-
-        for( i = 0; source[i] != '\0'; i ++ )
-                if( source[i] == '\n' || source[i] == '\r' )
-                        source[i] = 32;
-        
-        return source;
-}

bitlbee.conf

@@ -14 +14 @@
 ##    and other reasons, the use of daemon-mode is *STRONGLY* discouraged,
 ##    don't even *think* of reporting bugs when you use this.
+##  ForkDaemon -- Run as a stand-alone daemon, but keep all clients in separate
+##    child processes. This should be pretty safe and reliable to use instead
+##    of inetd mode.
 ##
 # RunMode = Inetd
@@ -19 +22 @@
 ## DaemonPort/DaemonInterface:
 ##
-## For RunMode=Daemon, here you can specify on what interface and port the
-## daemon should be listening for connections.
+## For daemon mode, you can specify on what interface and port the daemon
+## should be listening for connections.
 ##
 # DaemonInterface = 0.0.0.0
@@ -42 +45 @@
 # AuthPassword = ItllBeBitlBee   ## Heh.. Our slogan. ;-)
 
+## OperPassword
+##
+## Password that unlocks access to special operator commands.
+##
+# OperPassword = ChangeMe!
+
 ## HostName
 ##
 ## Normally, BitlBee gets a hostname using getsockname(). If you have a nicer
 ## alias for your BitlBee daemon, you can set it here and BitlBee will identify
-## itself with that name instead. Leave it commented out if you want BitlBee to
-## use getsockname() to get a hostname.
+## itself with that name instead.
 ##
 # HostName = localhost

bitlbee.h

@@ -111 +111 @@
 typedef struct global_t {
         int listen_socket;
+        gint listen_watch_source_id;
         help_t *help;
         conf_t *conf;

commands.c

@@ -32 +32 @@
 #include <string.h>
 
-command_t commands[] = {
+const command_t commands[] = {
         { "help",           0, cmd_help }, 
         { "identify",       1, cmd_identify },
@@ -55 +55 @@
 };
 
+int root_command_string( irc_t *irc, user_t *u, char *command, int flags )
+{
+        char *cmd[IRC_MAX_ARGS];
+        char *s;
+        int k;
+        char q = 0;
+        
+        memset( cmd, 0, sizeof( cmd ) );
+        cmd[0] = command;
+        k = 1;
+        for( s = command; *s && k < ( IRC_MAX_ARGS - 1 ); s ++ )
+                if( *s == ' ' && !q )
+                {
+                        *s = 0;
+                        while( *++s == ' ' );
+                        if( *s == '"' || *s == '\'' )
+                        {
+                                q = *s;
+                                s ++;
+                        }
+                        if( *s )
+                        {
+                                cmd[k++] = s;
+                                s --;
+                        }
+                }
+                else if( *s == q )
+                {
+                        q = *s = 0;
+                }
+        cmd[k] = NULL;
+        
+        return( root_command( irc, cmd ) );
+}
+
+int root_command( irc_t *irc, char *cmd[] )
+{       
+        int i;
+        
+        if( !cmd[0] )
+                return( 0 );
+        
+        for( i = 0; commands[i].command; i++ )
+                if( g_strcasecmp( commands[i].command, cmd[0] ) == 0 )
+                {
+                        if( !cmd[commands[i].required_parameters] )
+                        {
+                                irc_usermsg( irc, "Not enough parameters given (need %d)", commands[i].required_parameters );
+                                return( 0 );
+                        }
+                        commands[i].execute( irc, cmd );
+                        return( 1 );
+                }
+        
+        irc_usermsg( irc, "Unknown command: %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[0] );
+        
+        return( 1 );
+}
+
 int cmd_help( irc_t *irc, char **cmd )
 {
@@ -97 +156 @@
         case STORAGE_OK:
                 irc_usermsg( irc, "Password accepted" );
+                irc_umode_set( irc, "+R", 1 );
                 break;
         default:
@@ -122 +182 @@
                 case STORAGE_OK:
                         irc->status = USTATUS_IDENTIFIED;
+                        irc_umode_set( irc, "+R", 1 );
                         break;
 
@@ -146 +207 @@
         case STORAGE_OK:
                 irc_setpass( irc, NULL );
+                irc->status = USTATUS_LOGGED_IN;
+                irc_umode_set( irc, "-R", 1 );
                 irc_usermsg( irc, "Account `%s' removed", irc->nick );
                 return( 0 );

commands.h

@@ -29 +29 @@
 #include "bitlbee.h"
 
-/* Hmm... Linked list? Plleeeeaaase?? ;-) */
-
 typedef struct command_t
 {
@@ -58 +56 @@
 int cmd_dump( irc_t *irc, char **cmd );
 
-
-
-extern command_t commands[];
+extern const command_t commands[];
 
 #endif

conf.c

@@ -46 +46 @@
         conf = g_new0( conf_t, 1 );
         
+#ifdef IPV6
+        conf->iface = "::";
+#else
         conf->iface = "0.0.0.0";
+#endif
         conf->port = 6667;
         conf->nofork = 0;
@@ -53 +57 @@
         conf->runmode = RUNMODE_INETD;
         conf->authmode = AUTHMODE_OPEN;
-        conf->password = NULL;
+        conf->auth_pass = NULL;
+        conf->oper_pass = NULL;
         conf->configdir = g_strdup( CONFIG );
         conf->plugindir = g_strdup( PLUGINDIR );
@@ -71 +76 @@
         }
         
-        while( ( opt = getopt( argc, argv, "i:p:nvIDc:d:h" ) ) >= 0 )
+        while( ( opt = getopt( argc, argv, "i:p:nvIDFc:d:h" ) ) >= 0 )
         {
                 if( opt == 'i' )
@@ -94 +99 @@
                 else if( opt == 'D' )
                         conf->runmode=RUNMODE_DAEMON;
+                else if( opt == 'F' )
+                        conf->runmode=RUNMODE_FORKDAEMON;
                 else if( opt == 'c' )
                 {
@@ -118 +125 @@
                                 "  -I  Classic/InetD mode. (Default)\n"
                                 "  -D  Daemon mode. (Still EXPERIMENTAL!)\n"
+                                "  -F  Forking daemon. (one process per client)\n"
                                 "  -i  Specify the interface (by IP address) to listen on.\n"
                                 "      (Default: 0.0.0.0 (any interface))\n"
@@ -157 +165 @@
                                 if( g_strcasecmp( ini->value, "daemon" ) == 0 )
                                         conf->runmode = RUNMODE_DAEMON;
+                                else if( g_strcasecmp( ini->value, "forkdaemon" ) == 0 )
+                                        conf->runmode = RUNMODE_FORKDAEMON;
                                 else
                                         conf->runmode = RUNMODE_INETD;
@@ -184 +194 @@
                         else if( g_strcasecmp( ini->key, "authpassword" ) == 0 )
                         {
-                                conf->password = g_strdup( ini->value );
+                                conf->auth_pass = g_strdup( ini->value );
+                        }
+                        else if( g_strcasecmp( ini->key, "operpassword" ) == 0 )
+                        {
+                                conf->oper_pass = g_strdup( ini->value );
                         }
                         else if( g_strcasecmp( ini->key, "hostname" ) == 0 )

conf.h

@@ -27 +27 @@
 #define __CONF_H
 
-typedef enum runmode { RUNMODE_DAEMON, RUNMODE_INETD } runmode_t;
+typedef enum runmode { RUNMODE_DAEMON, RUNMODE_FORKDAEMON, RUNMODE_INETD } runmode_t;
 typedef enum authmode { AUTHMODE_OPEN, AUTHMODE_CLOSED, AUTHMODE_REGISTERED } authmode_t;
 
@@ -38 +38 @@
         runmode_t runmode;
         authmode_t authmode;
-        char *password;
+        char *auth_pass;
+        char *oper_pass;
         char *hostname;
         char *configdir;

configure

@@ -23 +23 @@
 debug=0
 strip=1
-flood=0
 ipv6=1
 ssl=auto
@@ -258 +257 @@
         if [ "$ret" = "0" ]; then
                 echo
-                echo 'WARNING: Could not find a suitable SSL library (GnuTLS, libnss or OpenSSL).'
-                echo '         This is necessary for MSN and full Jabber support. To continue,'
-                echo '         install a suitable SSL library or disable MSN support (--msn=0).'
-                echo '         If you want Jabber without SSL support you can try --ssl=bogus.'
+                echo 'ERROR: Could not find a suitable SSL library (GnuTLS, libnss or OpenSSL).'
+                echo '       This is necessary for MSN and full Jabber support. To continue,'
+                echo '       install a suitable SSL library or disable MSN support (--msn=0).'
+                echo '       If you want Jabber without SSL support you can try --ssl=bogus.'
                 
                 exit 1;
@@ -291 +290 @@
 fi
 
-if [ "$flood" = 1 ]; then
-        # echo '#define FLOOD_SEND' >> config.h
-        echo 'Flood protection is disabled in this release because of too many bugs.' 2> /dev/stderr
-        rm config.h
-        rm Makefile.settings
-        exit 1
+echo
+if [ -z "$BITLBEE_VERSION" -a -d .bzr -a -x "`which bzr`" ]; then
+        rev=`bzr revno`
+        echo 'Using bzr revision #'$rev' as version number'
+        BITLBEE_VERSION=\"bzr-$rev\"
 fi
 
 if [ -n "$BITLBEE_VERSION" ]; then
-        echo
         echo 'Spoofing version number: '$BITLBEE_VERSION
         echo '#undef BITLBEE_VERSION' >> config.h
-        echo '#define BITLBEE_VERSION '$BITLBEE_VERSION >> config.h;
+        echo '#define BITLBEE_VERSION '$BITLBEE_VERSION >> config.h
+        echo
 fi
 
@@ -314 +312 @@
         echo '#define WITH_MSN' >> config.h
         protocols=$protocols'msn '
-        protoobjs=$protoobjs'msnn.o '
+        protoobjs=$protoobjs'msn_mod.o '
 fi
 
@@ -322 +320 @@
         echo '#define WITH_JABBER' >> config.h
         protocols=$protocols'jabber '
-        protoobjs=$protoobjs'jabberr.o '
+        protoobjs=$protoobjs'jabber_mod.o '
 fi
 
@@ -330 +328 @@
         echo '#define WITH_OSCAR' >> config.h
         protocols=$protocols'oscar '
-        protoobjs=$protoobjs'oscarr.o '
+        protoobjs=$protoobjs'oscar_mod.o '
 fi
 
@@ -338 +336 @@
         echo '#define WITH_YAHOO' >> config.h
         protocols=$protocols'yahoo '
-        protoobjs=$protoobjs'yahooo.o '
+        protoobjs=$protoobjs'yahoo_mod.o '
 fi
 
 if [ "$protocols" = "PROTOCOLS = " ]; then
-        echo
         echo "WARNING: You haven't selected any communication protocol to compile!"
         echo "         Bitlbee will run, but you will be unable to connect to IM servers!"
@@ -350 +347 @@
 echo "PROTOOBJS = $protoobjs" >> Makefile.settings
 
-echo
 echo Architecture: $arch
 case "$arch" in

irc.c

@@ -40 +40 @@
 irc_t *irc_new( int fd )
 {
-        irc_t *irc = g_new0( irc_t, 1 );
-        
+        irc_t *irc;
+        struct hostent *peer;
+        unsigned int i;
+        char buf[128];
+#ifdef IPV6
+        struct sockaddr_in6 sock[1];
+#else
         struct sockaddr_in sock[1];
-#ifdef IPV6
-        struct sockaddr_in6 sock6[1];
 #endif
-        struct hostent *peer;
-        unsigned int i, j;
+        
+        irc = g_new0( irc_t, 1 );
         
         irc->fd = fd;
@@ -71 +74 @@
         
         i = sizeof( *sock );
-#ifdef IPV6
-        j = sizeof( *sock6 );
-#endif
+        
         if( global.conf->hostname )
                 irc->myhost = g_strdup( global.conf->hostname );
-        else if( getsockname( irc->fd, (struct sockaddr*) sock, &i ) == 0 && sock->sin_family == AF_INET )
-        {
-                if( ( peer = gethostbyaddr( (char*) &sock->sin_addr, sizeof( sock->sin_addr ), AF_INET ) ) )
+#ifdef IPV6
+        else if( getsockname( irc->fd, (struct sockaddr*) sock, &i ) == 0 && sock->sin6_family == AF_INETx )
+        {
+                if( ( peer = gethostbyaddr( (char*) &sock->sin6_addr, sizeof( sock->sin6_addr ), AF_INETx ) ) )
                         irc->myhost = g_strdup( peer->h_name );
-        }
-#ifdef IPV6
-        else if( getsockname( irc->fd, (struct sockaddr*) sock6, &j ) == 0 && sock6->sin6_family == AF_INET6 )
-        {
-                if( ( peer = gethostbyaddr( (char*) &sock6->sin6_addr, sizeof( sock6->sin6_addr ), AF_INET6 ) ) )
+                else if( inet_ntop( AF_INETx, &sock->sin6_addr, buf, sizeof( buf ) - 1 ) != NULL )
+                        irc->myhost = g_strdup( ipv6_unwrap( buf ) );
+        }
+#else
+        else if( getsockname( irc->fd, (struct sockaddr*) sock, &i ) == 0 && sock->sin_family == AF_INETx )
+        {
+                if( ( peer = gethostbyaddr( (char*) &sock->sin_addr, sizeof( sock->sin_addr ), AF_INETx ) ) )
                         irc->myhost = g_strdup( peer->h_name );
+                else if( inet_ntop( AF_INETx, &sock->sin_addr, buf, sizeof( buf ) - 1 ) != NULL )
+                        irc->myhost = g_strdup( buf );
         }
 #endif
@@ -91 +97 @@
         i = sizeof( *sock );
 #ifdef IPV6
-        j = sizeof( *sock6 );
+        if( getpeername( irc->fd, (struct sockaddr*) sock, &i ) == 0 && sock->sin6_family == AF_INETx )
+        {
+                if( ( peer = gethostbyaddr( (char*) &sock->sin6_addr, sizeof( sock->sin6_addr ), AF_INETx ) ) )
+                        irc->host = g_strdup( peer->h_name );
+                else if( inet_ntop( AF_INETx, &sock->sin6_addr, buf, sizeof( buf ) - 1 ) != NULL )
+                        irc->host = g_strdup( ipv6_unwrap( buf ) );
+        }
+#else
+        if( getpeername( irc->fd, (struct sockaddr*) sock, &i ) == 0 && sock->sin_family == AF_INETx )
+        {
+                if( ( peer = gethostbyaddr( (char*) &sock->sin_addr, sizeof( sock->sin_addr ), AF_INETx ) ) )
+                        irc->host = g_strdup( peer->h_name );
+                else if( inet_ntop( AF_INETx, &sock->sin_addr, buf, sizeof( buf ) - 1 ) != NULL )
+                        irc->host = g_strdup( buf );
+        }
 #endif
-        if( getpeername( irc->fd, (struct sockaddr*) sock, &i ) == 0 && sock->sin_family == AF_INET )
-        {
-                if( ( peer = gethostbyaddr( (char*) &sock->sin_addr, sizeof( sock->sin_addr ), AF_INET ) ) )
-                        irc->host = g_strdup( peer->h_name );
-        }
-#ifdef IPV6
-        else if( getpeername( irc->fd, (struct sockaddr*) sock6, &j ) == 0 && sock6->sin6_family == AF_INET6 )
-        {
-                if( ( peer = gethostbyaddr( (char*) &sock6->sin6_addr, sizeof( sock6->sin6_addr ), AF_INET6 ) ) )
-                        irc->host = g_strdup( peer->h_name );
-        }
-#endif
-        
+        
+        /* Rare, but possible. */
         if( !irc->host ) irc->host = g_strdup( "localhost." );
         if( !irc->myhost ) irc->myhost = g_strdup( "localhost." );
@@ -264 +273 @@
         g_free(irc);
         
-        if( global.conf->runmode == RUNMODE_INETD )
+        if( global.conf->runmode == RUNMODE_INETD || global.conf->runmode == RUNMODE_FORKDAEMON )
                 g_main_quit( global.loop );
 }
@@ -422 +431 @@
                                 irc_reply( irc, 461, "%s :Need more parameters", cmd[0] );
                         }
-                        else if( strcmp( cmd[1], (global.conf)->password ) == 0 )
+                        else if( strcmp( cmd[1], (global.conf)->auth_pass ) == 0 )
                         {
                                 irc->status = USTATUS_AUTHORIZED;
@@ -500 +509 @@
         {
                 irc_write( irc, ":%s PONG %s :%s", irc->myhost, irc->myhost, cmd[1]?cmd[1]:irc->myhost );
+        }
+        else if( g_strcasecmp( cmd[0], "OPER" ) == 0 )
+        {
+                if( !cmd[2] )
+                        irc_reply( irc, 461, "%s :Need more parameters", cmd[0] );
+                else if( strcmp( cmd[2], global.conf->oper_pass ) == 0 )
+                        irc_umode_set( irc, "+o", 1 );
+                // else
+                        /* FIXME/TODO: Find out which reply to send now. */
         }
         else if( g_strcasecmp( cmd[0], "MODE" ) == 0 )
@@ -524 +542 @@
                         {
                                 if( cmd[2] )
-                                        irc_umode_set( irc, irc->nick, cmd[2] );
+                                        irc_umode_set( irc, cmd[2], 0 );
                         }
                         else
@@ -923 +941 @@
         if( irc->sendbuffer != NULL ) {
                 size = strlen( irc->sendbuffer ) + strlen( line );
-#ifdef FLOOD_SEND
-                if( size > FLOOD_SEND_MAXBUFFER ) {
-                        /* Die flooder, die! >:) */
-
-                        g_free(irc->sendbuffer);
-                        
-                        /* We need the \r\n at the start because else we might append our string to a half
-                         * sent line. A bit hackish, but it works.
-                         */
-                        irc->sendbuffer = g_strdup( "\r\nERROR :Sendq Exceeded\r\n" );
-                        irc->quit = 1;
-                        
-                        return;
-                }
-#endif
                 irc->sendbuffer = g_renew ( char, irc->sendbuffer, size + 1 );
                 strcpy( ( irc->sendbuffer + strlen( irc->sendbuffer ) ), line );
@@ -1075 +1078 @@
         irc_reply( irc,   2, ":Host %s is running BitlBee " BITLBEE_VERSION " " ARCH "/" CPU ".", irc->myhost );
         irc_reply( irc,   3, ":%s", IRCD_INFO );
-        irc_reply( irc,   4, "%s %s %s %s", irc->myhost, BITLBEE_VERSION, UMODES, CMODES );
+        irc_reply( irc,   4, "%s %s %s %s", irc->myhost, BITLBEE_VERSION, UMODES UMODES_PRIV, CMODES );
+        irc_reply( irc,   5, "PREFIX=(ov)@+ CHANTYPES=#& CHANMODES=,,,%s NICKLEN=%d NETWORK=BitlBee CASEMAPPING=rfc1459 MAXTARGETS=1 WATCH=128 :are supported by this server", CMODES, MAX_NICK_LENGTH - 1 );
         irc_motd( irc );
-        irc_umode_set( irc, irc->myhost, "+" UMODE );
+        irc_umode_set( irc, "+" UMODE, 1 );
 
         u = user_add( irc, irc->mynick );
@@ -1204 +1208 @@
 
 
-void irc_umode_set( irc_t *irc, char *who, char *s )
-{
+void irc_umode_set( irc_t *irc, char *s, int allow_priv )
+{
+        /* allow_priv: Set to 0 if s contains user input, 1 if you want
+           to set a "privileged" mode (+o, +R, etc). */
         char m[256], st = 1, *t;
         int i;
@@ -1218 +1224 @@
                 if( *t == '+' || *t == '-' )
                         st = *t == '+';
-                else
+                else if( st == 0 || ( strchr( UMODES, *t ) || ( allow_priv && strchr( UMODES_PRIV, *t ) ) ) )
                         m[(int)*t] = st;
         }
@@ -1225 +1231 @@
         
         for( i = 0; i < 256 && strlen( irc->umode ) < ( sizeof( irc->umode ) - 1 ); i ++ )
-                if( m[i] && strchr( UMODES, i ) )
+                if( m[i] )
                         irc->umode[strlen(irc->umode)] = i;
         

irc.h

@@ -33 +33 @@
 #define IRC_PING_STRING "PinglBee"
 
-/* #define FLOOD_SEND 
- * Not yet enabled by default due to some problems.
- */
-#define FLOOD_SEND_INTERVAL 30
-#define FLOOD_SEND_BYTES (1024*10)
-#define FLOOD_SEND_MAXBUFFER (1024*20)
-
-#define UMODES "ais"
+#define UMODES "ias"
+#define UMODES_PRIV "Ro"
 #define CMODES "nt"
 #define CMODE "t"
@@ -127 +121 @@
 void irc_names( irc_t *irc, char *channel );
 void irc_topic( irc_t *irc, char *channel );
-void irc_umode_set( irc_t *irc, char *who, char *s );
+void irc_umode_set( irc_t *irc, char *s, int allow_priv );
 void irc_who( irc_t *irc, char *channel );
 void irc_spawn( irc_t *irc, user_t *u );

protocols/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = md5.o nogaim.o proxy.o sha.o util.o $(SSL_CLIENT)
+objects = http_client.o md5.o nogaim.o proxy.o sha.o $(SSL_CLIENT)
 
 # [SH] The next two lines should contain the directory name (in $(subdirs))

protocols/jabber/Makefile

@@ -16 +16 @@
 
 # [SH] Phony targets
-all: jabberr.o
+all: jabber_mod.o
 
 .PHONY: all clean distclean
@@ -33 +33 @@
         @$(CC) -c $(CFLAGS) $< -o $@
 
-jabberr.o: $(objects)
-        @echo '*' Linking jabberr.o
-        @$(LD) $(LFLAGS) $(objects) -o jabberr.o
+jabber_mod.o: $(objects)
+        @echo '*' Linking jabber_mod.o
+        @$(LD) $(LFLAGS) $(objects) -o jabber_mod.o

protocols/jabber/jabber.c

@@ -1249 +1249 @@
                         gjab_auth(gjc);
                 } else {
+                        gjab_reqroster(gjc);
                         account_online(GJ_GC(gjc));
-
-                        if (bud_list_cache_exists(GJ_GC(gjc)))
-                                do_import(GJ_GC(gjc), NULL);
-
+                        
                         ((struct jabber_data *)GJ_GC(gjc)->proto_data)->did_import = TRUE;
-
-                        gjab_reqroster(gjc);
                 }
         } else {
@@ -1860 +1856 @@
                         xmlnode_insert_cdata(y, "away", -1);
                         y = xmlnode_insert_tag(x, "status");
-                        {
-                                char *utf8 = str_to_utf8(message);
-                                xmlnode_insert_cdata(y, utf8, -1);
-                                g_free(utf8);
-                        }
+                        xmlnode_insert_cdata(y, message, -1);
                         gc->away = "";
                 } else {

protocols/msn/Makefile

@@ -16 +16 @@
 
 # [SH] Phony targets
-all: msnn.o
+all: msn_mod.o
         
 .PHONY: all clean distclean
@@ -33 +33 @@
         @$(CC) -c $(CFLAGS) $< -o $@
 
-msnn.o: $(objects)
-        @echo '*' Linking msnn.o
-        @$(LD) $(LFLAGS) $(objects) -o msnn.o
+msn_mod.o: $(objects)
+        @echo '*' Linking msn_mod.o
+        @$(LD) $(LFLAGS) $(objects) -o msn_mod.o
         
 

protocols/msn/msn.c

@@ -170 +170 @@
         
         for( i = 0; msn_away_state_list[i].number > -1; i ++ )
-                l = g_list_append( l, msn_away_state_list[i].name );
+                l = g_list_append( l, (void*) msn_away_state_list[i].name );
         
         return( l );
@@ -177 +177 @@
 static char *msn_get_status_string( struct gaim_connection *gc, int number )
 {
-        struct msn_away_state *st = msn_away_state_by_number( number );
+        const struct msn_away_state *st = msn_away_state_by_number( number );
         
         if( st )
-                return( st->name );
+                return( (char*) st->name );
         else
                 return( "" );
@@ -189 +189 @@
         char buf[1024];
         struct msn_data *md = gc->proto_data;
-        struct msn_away_state *st;
+        const struct msn_away_state *st;
         
         if( strcmp( state, GAIM_AWAY_CUSTOM ) == 0 )

protocols/msn/msn.h

@@ -67 +67 @@
         GSList *switchboards;
         int buddycount;
-        struct msn_away_state *away_state;
+        const struct msn_away_state *away_state;
 };
 
@@ -127 +127 @@
 #define STATUS_FATAL            1
 #define STATUS_SB_FATAL         2
+#define STATUS_SB_IM_SPARE      4       /* Make one-to-one conversation switchboard available again, invite failed. */
+#define STATUS_SB_CHAT_SPARE    8       /* Same, but also for groupchats (not used yet). */
 
 int msn_chat_id;
-extern struct msn_away_state msn_away_state_list[];
-extern struct msn_status_code msn_status_code_list[];
+extern const struct msn_away_state msn_away_state_list[];
+extern const struct msn_status_code msn_status_code_list[];
 
 /* Keep a list of all the active connections. We need these lists because
@@ -154 +156 @@
 
 /* tables.c */
-struct msn_away_state *msn_away_state_by_number( int number );
-struct msn_away_state *msn_away_state_by_code( char *code );
-struct msn_away_state *msn_away_state_by_name( char *name );
-struct msn_status_code *msn_status_by_number( int number );
+const struct msn_away_state *msn_away_state_by_number( int number );
+const struct msn_away_state *msn_away_state_by_code( char *code );
+const struct msn_away_state *msn_away_state_by_name( char *name );
+const struct msn_status_code *msn_status_by_number( int number );
 
 /* sb.c */

protocols/msn/ns.c

@@ -208 +208 @@
                 {
                         /* Time for some Passport black magic... */
-                        if( !passport_get_id( gc, gc->username, gc->password, cmd[4], msn_auth_got_passport_id ) )
+                        if( !passport_get_id( msn_auth_got_passport_id, gc, gc->username, gc->password, cmd[4] ) )
                         {
                                 hide_login_progress_error( gc, "Error while contacting Passport server" );
@@ -365 +365 @@
         else if( strcmp( cmd[0], "ILN" ) == 0 )
         {
-                struct msn_away_state *st;
+                const struct msn_away_state *st;
                 
                 if( num_parts != 6 )
@@ -393 +393 @@
         else if( strcmp( cmd[0], "NLN" ) == 0 )
         {
-                struct msn_away_state *st;
+                const struct msn_away_state *st;
                 
                 if( num_parts != 5 )
@@ -539 +539 @@
         {
                 int num = atoi( cmd[0] );
-                struct msn_status_code *err = msn_status_by_number( num );
+                const struct msn_status_code *err = msn_status_by_number( num );
                 
                 g_snprintf( buf, sizeof( buf ), "Error reported by MSN server: %s", err->text );

protocols/msn/passport.c

@@ -20 +20 @@
  */
 
-#include "ssl_client.h"
+#include "http_client.h"
 #include "passport.h"
 #include "msn.h"
@@ -31 +31 @@
 static char *prd_cached = NULL;
 
-static char *passport_create_header( char *reply, char *email, char *pwd );
+static int passport_get_id_real( gpointer func, gpointer data, char *header );
+static void passport_get_id_ready( struct http_request *req );
+
 static int passport_retrieve_dalogin( gpointer data, gpointer func, char *header );
-static void passport_retrieve_dalogin_connected( gpointer data, void *ssl, GaimInputCondition cond );
-static int passport_get_id_from( gpointer data, gpointer func, char *header_i, char *url );
-static void passport_get_id_connected( gpointer data, void *ssl, GaimInputCondition cond );
+static void passport_retrieve_dalogin_ready( struct http_request *req );
+
+static char *passport_create_header( char *cookie, char *email, char *pwd );
 static void destroy_reply( struct passport_reply *rep );
 
-
-int passport_get_id( gpointer data, char *username, char *password, char *cookie, gpointer func )
+int passport_get_id( gpointer func, gpointer data, char *username, char *password, char *cookie )
 {
         char *header = passport_create_header( cookie, username, password );
         
-        if( prd_cached )
-        {
-                int st;
-                
-                st = passport_get_id_from( data, func, header, prd_cached );
-                g_free( header );
-                return( st );
-        }
+        if( prd_cached == NULL )
+                return passport_retrieve_dalogin( func, data, header );
         else
-        {
-                return( passport_retrieve_dalogin( data, func, header ) );
-        }
-}
-
-
-static char *passport_create_header( char *reply, char *email, char *pwd )
-{
-        char *buffer = g_new0( char, 2048 );
-        char *currenttoken;
-        char *email_enc, *pwd_enc;
-        
-        email_enc = g_new0( char, strlen( email ) * 3 + 1 );
-        strcpy( email_enc, email );
-        http_encode( email_enc );
-        
-        pwd_enc = g_new0( char, strlen( pwd ) * 3 + 1 );
-        strcpy( pwd_enc, pwd );
-        http_encode( pwd_enc );
-        
-        currenttoken = strstr( reply, "lc=" );
-        if( currenttoken == NULL )
-                return( NULL );
-        
-        g_snprintf( buffer, 2048,
-                    "Authorization: Passport1.4 OrgVerb=GET,"
-                    "OrgURL=http%%3A%%2F%%2Fmessenger%%2Emsn%%2Ecom,"
-                    "sign-in=%s,pwd=%s,%s", email_enc, pwd_enc,
-                    currenttoken );
-        
-        g_free( email_enc );
-        g_free( pwd_enc );
-        
-        return( buffer );
-}
-
-
-static int passport_retrieve_dalogin( gpointer data, gpointer func, char *header )
-{
-        struct passport_reply *rep = g_new0( struct passport_reply, 1 );
-        void *ssl;
-        
+                return passport_get_id_real( func, data, header );
+}
+
+static int passport_get_id_real( gpointer func, gpointer data, char *header )
+{
+        struct passport_reply *rep;
+        char *server, *dummy, *reqs;
+        struct http_request *req;
+        
+        rep = g_new0( struct passport_reply, 1 );
         rep->data = data;
         rep->func = func;
-        rep->header = header;
-        
-        ssl = ssl_connect( "nexus.passport.com", 443, passport_retrieve_dalogin_connected, rep );
-        
-        if( !ssl )
-                destroy_reply( rep );
-        
-        return( ssl != NULL );
-}
-
-#define PPR_BUFFERSIZE 2048
-#define PPR_REQUEST "GET /rdr/pprdr.asp HTTP/1.0\r\n\r\n"
-static void passport_retrieve_dalogin_connected( gpointer data, void *ssl, GaimInputCondition cond )
-{
-        int ret;
-        char buffer[PPR_BUFFERSIZE+1];
-        struct passport_reply *rep = data;
-        
-        if( !g_slist_find( msn_connections, rep->data ) )
-        {
-                if( ssl ) ssl_disconnect( ssl );
+        
+        server = g_strdup( prd_cached );
+        dummy = strchr( server, '/' );
+        
+        if( dummy == NULL )
+        {
+                destroy_reply( rep );
+                return( 0 );
+        }
+        
+        reqs = g_malloc( strlen( header ) + strlen( dummy ) + 128 );
+        sprintf( reqs, "GET %s HTTP/1.0\r\n%s\r\n\r\n", dummy, header );
+        
+        *dummy = 0;
+        req = http_dorequest( server, 443, 1, reqs, passport_get_id_ready, rep );
+        
+        g_free( server );
+        g_free( reqs );
+        
+        if( req == NULL )
+                destroy_reply( rep );
+        
+        return( req != NULL );
+}
+
+static void passport_get_id_ready( struct http_request *req )
+{
+        struct passport_reply *rep = req->data;
+        
+        if( !g_slist_find( msn_connections, rep->data ) || !req->finished || !req->reply_headers )
+        {
                 destroy_reply( rep );
                 return;
         }
         
-        if( !ssl )
-        {
-                rep->func( rep );
-                destroy_reply( rep );
-                return;
-        }
-        
-        ssl_write( ssl, PPR_REQUEST, strlen( PPR_REQUEST ) );
-        
-        if( ( ret = ssl_read( ssl, buffer, PPR_BUFFERSIZE ) ) <= 0 )
-        {
-                goto failure;
-        }
-
-        {
-                char *dalogin = strstr( buffer, "DALogin=" );
-                char *urlend;
+        if( req->status_code == 200 )
+        {
+                char *dummy;
                 
-                if( !dalogin )
-                        goto failure;
-                
-                dalogin += strlen( "DALogin=" );
-                urlend = strchr( dalogin, ',' );
-                if( urlend )
-                        *urlend = 0;
-                
-                /* strip the http(s):// part from the url */
-                urlend = strstr( urlend, "://" );
-                if( urlend )
-                        dalogin = urlend + strlen( "://" );
-                
-                if( prd_cached == NULL )
-                        prd_cached = g_strdup( dalogin );
-        }
-        
-        if( passport_get_id_from( rep->data, rep->func, rep->header, prd_cached ) )
-        {
-                ssl_disconnect( ssl );
-                destroy_reply( rep );
-                return;
-        }
-        
-failure:        
-        ssl_disconnect( ssl );
-        rep->func( rep );
-        destroy_reply( rep );
-}
-
-
-static int passport_get_id_from( gpointer data, gpointer func, char *header_i, char *url )
-{
-        struct passport_reply *rep = g_new0( struct passport_reply, 1 );
-        char server[512], *dummy;
-        void *ssl;
-        
-        rep->data = data;
-        rep->func = func;
-        rep->redirects = 4;
-        
-        strncpy( server, url, 512 );
-        dummy = strchr( server, '/' );
-        if( dummy )
-                *dummy = 0;
-        
-        ssl = ssl_connect( server, 443, passport_get_id_connected, rep );
-        
-        if( ssl )
-        {
-                rep->header = g_strdup( header_i );
-                rep->url = g_strdup( url );
-        }
-        else
-        {
-                destroy_reply( rep );
-        }
-        
-        return( ssl != NULL );
-}
-
-#define PPG_BUFFERSIZE 4096
-static void passport_get_id_connected( gpointer data, void *ssl, GaimInputCondition cond )
-{
-        struct passport_reply *rep = data;
-        char server[512], buffer[PPG_BUFFERSIZE+1], *dummy;
-        int ret;
-        
-        if( !g_slist_find( msn_connections, rep->data ) )
-        {
-                if( ssl ) ssl_disconnect( ssl );
-                destroy_reply( rep );
-                return;
-        }
-        
-        if( !ssl )
-        {
-                rep->func( rep );
-                destroy_reply( rep );
-                return;
-        }
-        
-        memset( buffer, 0, PPG_BUFFERSIZE + 1 );
-        
-        strncpy( server, rep->url, 512 );
-        dummy = strchr( server, '/' );
-        if( dummy == NULL )
-                goto end;
-        
-        g_snprintf( buffer, PPG_BUFFERSIZE - 1, "GET %s HTTP/1.0\r\n"
-                    "%s\r\n\r\n", dummy, rep->header );
-        
-        ssl_write( ssl, buffer, strlen( buffer ) );
-        memset( buffer, 0, PPG_BUFFERSIZE + 1 );
-        
-        {
-                char *buffer2 = buffer;
-                
-                while( ( ( ret = ssl_read( ssl, buffer2, 512 ) ) > 0 ) &&
-                       ( buffer + PPG_BUFFERSIZE - buffer2 - ret - 512 >= 0 ) )
-                {
-                        buffer2 += ret;
-                }
-        }
-        
-        if( *buffer == 0 )
-                goto end;
-        
-        if( ( dummy = strstr( buffer, "Location:" ) ) )
-        {
-                char *urlend;
-                
-                rep->redirects --;
-                if( rep->redirects == 0 )
-                        goto end;
-                
-                dummy += strlen( "Location:" );
-                while( isspace( *dummy ) ) dummy ++;
-                urlend = dummy;
-                while( !isspace( *urlend ) ) urlend ++;
-                *urlend = 0;
-                if( ( urlend = strstr( dummy, "://" ) ) )
-                        dummy = urlend + strlen( "://" );
-                
-                g_free( rep->url );
-                rep->url = g_strdup( dummy );
-                
-                strncpy( server, dummy, sizeof( server ) - 1 );
-                dummy = strchr( server, '/' );
-                if( dummy ) *dummy = 0;
-                
-                ssl_disconnect( ssl );
-                
-                if( ssl_connect( server, 443, passport_get_id_connected, rep ) )
-                {
-                        return;
-                }
-                else
-                {
-                        rep->func( rep );
-                        destroy_reply( rep );
-                        return;
-                }
-        }
-        else if( strstr( buffer, "200 OK" ) )
-        {
-                if( ( dummy = strstr( buffer, "from-PP='" ) ) )
+                if( ( dummy = strstr( req->reply_headers, "from-PP='" ) ) )
                 {
                         char *responseend;
@@ -298 +111 @@
         }
         
-end:
-        ssl_disconnect( ssl );
         rep->func( rep );
         destroy_reply( rep );
 }
 
+static char *passport_create_header( char *cookie, char *email, char *pwd )
+{
+        char *buffer = g_new0( char, 2048 );
+        char *currenttoken;
+        char *email_enc, *pwd_enc;
+        
+        email_enc = g_new0( char, strlen( email ) * 3 + 1 );
+        strcpy( email_enc, email );
+        http_encode( email_enc );
+        
+        pwd_enc = g_new0( char, strlen( pwd ) * 3 + 1 );
+        strcpy( pwd_enc, pwd );
+        http_encode( pwd_enc );
+        
+        currenttoken = strstr( cookie, "lc=" );
+        if( currenttoken == NULL )
+                return( NULL );
+        
+        g_snprintf( buffer, 2048,
+                    "Authorization: Passport1.4 OrgVerb=GET,"
+                    "OrgURL=http%%3A%%2F%%2Fmessenger%%2Emsn%%2Ecom,"
+                    "sign-in=%s,pwd=%s,%s", email_enc, pwd_enc,
+                    currenttoken );
+        
+        g_free( email_enc );
+        g_free( pwd_enc );
+        
+        return( buffer );
+}
+
+#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 )
+{
+        struct passport_reply *rep = g_new0( struct passport_reply, 1 );
+        struct http_request *req;
+        
+        rep->data = data;
+        rep->func = func;
+        rep->header = header;
+        
+        req = http_dorequest( "nexus.passport.com", 443, 1, PPR_REQUEST, passport_retrieve_dalogin_ready, rep );
+        
+        if( !req )
+                destroy_reply( rep );
+        
+        return( req != NULL );
+}
+
+static void passport_retrieve_dalogin_ready( struct http_request *req )
+{
+        struct passport_reply *rep = req->data;
+        char *dalogin;
+        char *urlend;
+        
+        if( !g_slist_find( msn_connections, rep->data ) || !req->finished || !req->reply_headers )
+        {
+                destroy_reply( rep );
+                return;
+        }
+        
+        dalogin = strstr( req->reply_headers, "DALogin=" );     
+        
+        if( !dalogin )
+                goto failure;
+        
+        dalogin += strlen( "DALogin=" );
+        urlend = strchr( dalogin, ',' );
+        if( urlend )
+                *urlend = 0;
+        
+        /* strip the http(s):// part from the url */
+        urlend = strstr( urlend, "://" );
+        if( urlend )
+                dalogin = urlend + strlen( "://" );
+        
+        if( prd_cached == NULL )
+                prd_cached = g_strdup( dalogin );
+        
+        if( passport_get_id_real( rep->func, rep->data, rep->header ) )
+        {
+                destroy_reply( rep );
+                return;
+        }
+        
+failure:        
+        rep->func( rep );
+        destroy_reply( rep );
+}
 
 static void destroy_reply( struct passport_reply *rep )
 {
-        if( rep->result ) g_free( rep->result );
-        if( rep->url ) g_free( rep->url );
-        if( rep->header ) g_free( rep->header );
-        if( rep ) g_free( rep );
-}
+        g_free( rep->result );
+        g_free( rep->header );
+        g_free( rep );
+}

protocols/msn/passport.h

@@ -35 +35 @@
 struct passport_reply
 {
+        void (*func)( struct passport_reply * );
         void *data;
         char *result;
-        void (*func)( struct passport_reply * );
-        char *url;
         char *header;
-        int redirects;
 };
 
-int passport_get_id( gpointer data, char *username, char *password, char *cookie, gpointer func );
+int passport_get_id( gpointer func, gpointer data, char *username, char *password, char *cookie );
 
 #endif /* __PASSPORT_H__ */

protocols/msn/sb.c

@@ -512 +512 @@
         {
                 int num = atoi( cmd[0] );
-                struct msn_status_code *err = msn_status_by_number( num );
+                const struct msn_status_code *err = msn_status_by_number( num );
                 
                 g_snprintf( buf, sizeof( buf ), "Error reported by switchboard server: %s", err->text );
@@ -522 +522 @@
                         return( 0 );
                 }
-                else if( err->flags & STATUS_FATAL )
+                if( err->flags & STATUS_FATAL )
                 {
                         signoff( gc );
                         return( 0 );
+                }
+                if( err->flags & STATUS_SB_IM_SPARE )
+                {
+                        if( sb->who )
+                        {
+                                struct msn_message *m;
+                                GSList *l;
+                                
+                                /* Apparently some invitation failed. We might want to use this
+                                   board later, so keep it as a spare. */
+                                g_free( sb->who );
+                                sb->who = NULL;
+                                
+                                /* Also clear the msgq, otherwise someone else might get them. */
+                                for( l = sb->msgq; l; l = l->next )
+                                {
+                                        m = l->data;
+                                        g_free( m->who );
+                                        g_free( m->text );
+                                        g_free( m );
+                                }
+                                g_slist_free( sb->msgq );
+                                sb->msgq = NULL;
+                        }
                 }
         }

protocols/msn/tables.c

@@ -27 +27 @@
 #include "msn.h"
 
-struct msn_away_state msn_away_state_list[] =
+const struct msn_away_state msn_away_state_list[] =
 {
         {  0, "NLN", "Available" },
@@ -40 +40 @@
 };
 
-struct msn_away_state *msn_away_state_by_number( int number )
+const struct msn_away_state *msn_away_state_by_number( int number )
 {
         int i;
@@ -51 +51 @@
 }
 
-struct msn_away_state *msn_away_state_by_code( char *code )
+const struct msn_away_state *msn_away_state_by_code( char *code )
 {
         int i;
@@ -62 +62 @@
 }
 
-struct msn_away_state *msn_away_state_by_name( char *name )
+const struct msn_away_state *msn_away_state_by_name( char *name )
 {
         int i;
@@ -73 +73 @@
 }
 
-struct msn_status_code msn_status_code_list[] =
+const struct msn_status_code msn_status_code_list[] =
 {
         { 200, "Invalid syntax",                                        0 },
@@ -80 +80 @@
         { 206, "Domain name missing",                                   0 },
         { 207, "Already logged in",                                     0 },
-        { 208, "Invalid handle",                                        0 },
+        { 208, "Invalid handle",                                        STATUS_SB_IM_SPARE },
         { 209, "Forbidden nickname",                                    0 },
         { 210, "Buddy list too long",                                   0 },
         { 215, "Handle is already in list",                             0 },
-        { 216, "Handle is not in list",                                 0 },
-        { 217, "Person is off-line or non-existent",                    0 },
+        { 216, "Handle is not in list",                                 STATUS_SB_IM_SPARE },
+        { 217, "Person is off-line or non-existent",                    STATUS_SB_IM_SPARE },
         { 218, "Already in that mode",                                  0 },
         { 219, "Handle is already in opposite list",                    0 },
@@ -118 +118 @@
         { 711, "Write is blocking",                                     STATUS_FATAL },
         { 712, "Session is overloaded",                                 STATUS_FATAL },
-        { 713, "Calling too rapidly",                                   0 },
+        { 713, "Calling too rapidly",                                   STATUS_SB_IM_SPARE },
         { 714, "Too many sessions",                                     STATUS_FATAL },
         { 715, "Not expected/Invalid argument/action",                  0 },
@@ -144 +144 @@
 };
 
-struct msn_status_code *msn_status_by_number( int number )
+const struct msn_status_code *msn_status_by_number( int number )
 {
         static struct msn_status_code *unknown = NULL;

protocols/nogaim.h

@@ -312 +312 @@
 G_MODULE_EXPORT void serv_got_chat_in( struct gaim_connection *gc, int id, char *who, int whisper, char *msg, time_t mtime );
 G_MODULE_EXPORT void serv_got_chat_left( struct gaim_connection *gc, int id );
-/* void serv_finish_login( struct gaim_connection *gc ); */
 
 /* util.c */
-G_MODULE_EXPORT char *utf8_to_str( const char *in );
-G_MODULE_EXPORT char *str_to_utf8( const char *in );
 G_MODULE_EXPORT void strip_linefeed( gchar *text );
 G_MODULE_EXPORT char *add_cr( char *text );
@@ -323 +320 @@
 G_MODULE_EXPORT time_t get_time( int year, int month, int day, int hour, int min, int sec );
 G_MODULE_EXPORT void strip_html( char *msg );
-G_MODULE_EXPORT char * escape_html(const char *html);
+G_MODULE_EXPORT char *escape_html( const char *html );
 G_MODULE_EXPORT void info_string_append(GString *str, char *newline, char *name, char *value);
+G_MODULE_EXPORT char *ipv6_wrap( char *src );
+G_MODULE_EXPORT char *ipv6_unwrap( char *src );
 
 /* prefs.c */

protocols/oscar/Makefile

@@ -16 +16 @@
 
 # [SH] Phony targets
-all: oscarr.o
+all: oscar_mod.o
 
 .PHONY: all clean distclean
@@ -33 +33 @@
         @$(CC) -c $(CFLAGS) $< -o $@
 
-oscarr.o: $(objects)
-        @echo '*' Linking oscarr.o
-        @$(LD) $(LFLAGS) $(objects) -o oscarr.o
+oscar_mod.o: $(objects)
+        @echo '*' Linking oscar_mod.o
+        @$(LD) $(LFLAGS) $(objects) -o oscar_mod.o

protocols/oscar/oscar.c

@@ -21 +21 @@
  */
 
-#include "sock.h"
 #include <errno.h>
 #include <ctype.h>
@@ -33 +32 @@
 #include "bitlbee.h"
 #include "proxy.h"
+#include "sock.h"
 
 #include "aim.h"

protocols/proxy.c

@@ -106 +106 @@
         if (condition & GAIM_WRITE_COND)
                 gaim_cond |= GAIM_INPUT_WRITE;
-//      if (condition & GAIM_ERR_COND)
-//              fprintf( stderr, "ERROR! fd=%d\n", g_io_channel_unix_get_fd( source ) );
 
         closure->function(closure->data, g_io_channel_unix_get_fd(source), gaim_cond);

protocols/ssl_bogus.c

@@ -28 +28 @@
 int ssl_errno;
 
-void *ssl_connect( char *host, int port, SslInputFunction func, gpointer data )
+void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
 {
         return( NULL );
@@ -51 +51 @@
         return( -1 );
 }
+
+GaimInputCondition ssl_getdirection( void *conn )
+{
+        return GAIM_INPUT_READ;
+}

protocols/ssl_client.h

@@ -33 +33 @@
 extern int ssl_errno;
 
-typedef void (*SslInputFunction)(gpointer, void*, GaimInputCondition);
+typedef void (*ssl_input_function)(gpointer, void*, GaimInputCondition);
 
-G_MODULE_EXPORT void *ssl_connect( char *host, int port, SslInputFunction func, gpointer data );
+G_MODULE_EXPORT void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data );
 G_MODULE_EXPORT int ssl_read( void *conn, char *buf, int len );
 G_MODULE_EXPORT int ssl_write( void *conn, const char *buf, int len );
 G_MODULE_EXPORT void ssl_disconnect( void *conn_ );
 G_MODULE_EXPORT int ssl_getfd( void *conn );
+G_MODULE_EXPORT GaimInputCondition ssl_getdirection( void *conn );

protocols/ssl_gnutls.c

@@ -38 +38 @@
 struct scd
 {
-        SslInputFunction func;
+        ssl_input_function func;
         gpointer data;
         int fd;
@@ -51 +51 @@
 
 
-void *ssl_connect( char *host, int port, SslInputFunction func, gpointer data )
+void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
 {
         struct scd *conn = g_new0( struct scd, 1 );
@@ -111 +111 @@
         
         if( conn->inpa != -1 )
+        {
                 gaim_input_remove( conn->inpa );
+                conn->inpa = -1;
+        }
         
         if( ( st = gnutls_handshake( conn->session ) ) < 0 )
@@ -117 +120 @@
                 if( st == GNUTLS_E_AGAIN || st == GNUTLS_E_INTERRUPTED )
                 {
-                        conn->inpa = gaim_input_add( conn->fd,
-                                                     gnutls_record_get_direction( conn->session ) ?
-                                                         GAIM_INPUT_WRITE : GAIM_INPUT_READ,
+                        conn->inpa = gaim_input_add( conn->fd, ssl_getdirection( conn ),
                                                      ssl_handshake, data );
                 }
@@ -145 +146 @@
 int ssl_read( void *conn, char *buf, int len )
 {
+        int st;
+        
         if( !((struct scd*)conn)->established )
         {
@@ -151 +154 @@
         }
         
-        return( gnutls_record_recv( ((struct scd*)conn)->session, buf, len ) );
-        
+        st = gnutls_record_recv( ((struct scd*)conn)->session, buf, len );
+        
+        ssl_errno = SSL_OK;
+        if( st == GNUTLS_E_AGAIN || st == GNUTLS_E_INTERRUPTED )
+                ssl_errno = SSL_AGAIN;
+        
+        return st;
 }
 
 int ssl_write( void *conn, const char *buf, int len )
 {
+        int st;
+        
         if( !((struct scd*)conn)->established )
         {
@@ -163 +173 @@
         }
         
-        return( gnutls_record_send( ((struct scd*)conn)->session, buf, len ) );
+        st = gnutls_record_send( ((struct scd*)conn)->session, buf, len );
+        
+        ssl_errno = SSL_OK;
+        if( st == GNUTLS_E_AGAIN || st == GNUTLS_E_INTERRUPTED )
+                ssl_errno = SSL_AGAIN;
+        
+        return st;
 }
 
@@ -169 +185 @@
 {
         struct scd *conn = conn_;
+        
+        if( conn->inpa != -1 )
+                gaim_input_remove( conn->inpa );
         
         if( conn->established )
@@ -184 +203 @@
         return( ((struct scd*)conn)->fd );
 }
+
+GaimInputCondition ssl_getdirection( void *conn )
+{
+        return( gnutls_record_get_direction( ((struct scd*)conn)->session ) ?
+                GAIM_INPUT_WRITE : GAIM_INPUT_READ );
+}

protocols/ssl_nss.c

@@ -45 +45 @@
 struct scd
 {
-        SslInputFunction func;
+        ssl_input_function func;
         gpointer data;
         int fd;
@@ -91 +91 @@
 
 
-void *ssl_connect( char *host, int port, SslInputFunction func, gpointer data )
+void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
 {
         struct scd *conn = g_new0( struct scd, 1 );

protocols/ssl_openssl.c

@@ -41 +41 @@
 struct scd
 {
-        SslInputFunction func;
+        ssl_input_function func;
         gpointer data;
         int fd;
         gboolean established;
         
+        int inpa;
+        int lasterr;            /* Necessary for SSL_get_error */
         SSL *ssl;
         SSL_CTX *ssl_ctx;
@@ -54 +56 @@
 
 
-void *ssl_connect( char *host, int port, SslInputFunction func, gpointer data )
+void *ssl_connect( char *host, int port, ssl_input_function func, gpointer data )
 {
         struct scd *conn = g_new0( struct scd, 1 );
@@ -93 +95 @@
 }
 
+static void ssl_handshake( gpointer data, gint source, GaimInputCondition cond );
+
 static void ssl_connected( gpointer data, gint source, GaimInputCondition cond )
 {
@@ -98 +102 @@
         
         if( source == -1 )
-                goto ssl_connected_failure;
-        
+                return ssl_handshake( data, -1, cond );
+        
+        /* Make it non-blocking at least during the handshake... */
+        sock_make_nonblocking( conn->fd );
         SSL_set_fd( conn->ssl, conn->fd );
         
-        if( SSL_connect( conn->ssl ) < 0 )
-                goto ssl_connected_failure;
+        return ssl_handshake( data, source, cond );
+}       
+
+static void ssl_handshake( gpointer data, gint source, GaimInputCondition cond )
+{
+        struct scd *conn = data;
+        int st;
+        
+        if( conn->inpa != -1 )
+        {
+                gaim_input_remove( conn->inpa );
+                conn->inpa = -1;
+        }
+        
+        if( ( st = SSL_connect( conn->ssl ) ) < 0 )
+        {
+                conn->lasterr = SSL_get_error( conn->ssl, st );
+                if( conn->lasterr != SSL_ERROR_WANT_READ && conn->lasterr != SSL_ERROR_WANT_WRITE )
+                        goto ssl_connected_failure;
+                
+                conn->inpa = gaim_input_add( conn->fd, ssl_getdirection( conn ), ssl_handshake, data );
+                return;
+        }
         
         conn->established = TRUE;
+        sock_make_blocking( conn->fd );         /* For now... */
         conn->func( conn->data, conn, cond );
         return;
@@ -127 +155 @@
 int ssl_read( void *conn, char *buf, int len )
 {
+        int st;
+        
         if( !((struct scd*)conn)->established )
-                return( 0 );
-        
-        return( SSL_read( ((struct scd*)conn)->ssl, buf, len ) );
+        {
+                ssl_errno = SSL_NOHANDSHAKE;
+                return -1;
+        }
+        
+        st = SSL_read( ((struct scd*)conn)->ssl, buf, len );
+        
+        ssl_errno = SSL_OK;
+        if( st <= 0 )
+        {
+                ((struct scd*)conn)->lasterr = SSL_get_error( ((struct scd*)conn)->ssl, st );
+                if( ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_READ || ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_WRITE )
+                        ssl_errno = SSL_AGAIN;
+        }
+        
+        return st;
 }
 
 int ssl_write( void *conn, const char *buf, int len )
 {
+        int st;
+        
         if( !((struct scd*)conn)->established )
-                return( 0 );
-        
-        return( SSL_write( ((struct scd*)conn)->ssl, buf, len ) );
+        {
+                ssl_errno = SSL_NOHANDSHAKE;
+                return -1;
+        }
+        
+        st = SSL_write( ((struct scd*)conn)->ssl, buf, len );
+        
+        ssl_errno = SSL_OK;
+        if( st <= 0 )
+        {
+                ((struct scd*)conn)->lasterr = SSL_get_error( ((struct scd*)conn)->ssl, st );
+                if( ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_READ || ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_WRITE )
+                        ssl_errno = SSL_AGAIN;
+        }
+        
+        return st;
 }
 
@@ -144 +202 @@
 {
         struct scd *conn = conn_;
+        
+        if( conn->inpa != -1 )
+                gaim_input_remove( conn->inpa );
         
         if( conn->established )
@@ -159 +220 @@
         return( ((struct scd*)conn)->fd );
 }
+
+GaimInputCondition ssl_getdirection( void *conn )
+{
+        return( ((struct scd*)conn)->lasterr == SSL_ERROR_WANT_WRITE ? GAIM_INPUT_WRITE : GAIM_INPUT_READ );
+}

protocols/yahoo/Makefile

@@ -16 +16 @@
 
 # [SH] Phony targets
-all: yahooo.o
+all: yahoo_mod.o
 
 .PHONY: all clean distclean
@@ -33 +33 @@
         @$(CC) -c $(CFLAGS) $< -o $@
 
-yahooo.o: $(objects)
-        @echo '*' Linking yahooo.o
-        @$(LD) $(LFLAGS) $(objects) -o yahooo.o
+yahoo_mod.o: $(objects)
+        @echo '*' Linking yahoo_mod.o
+        @$(LD) $(LFLAGS) $(objects) -o yahoo_mod.o

protocols/yahoo/yahoo_fn.c

@@ -25 +25 @@
 #include "yahoo_fn.h"
 
-unsigned char table_0[256] = {
+static const unsigned char table_0[256] = {
    0x5A, 0x41, 0x11, 0x77, 0x29, 0x9C, 0x31, 0xAD,
    0x4A, 0x32, 0x1A, 0x6D, 0x56, 0x9F, 0x39, 0xA6,
@@ -59 +59 @@
    0x7B, 0xBE, 0xF9, 0xAF, 0x82, 0x63, 0x47, 0x23 };
 
-unsigned char table_1[256] = {
+static const unsigned char table_1[256] = {
    0x08, 0xCB, 0x54, 0xCF, 0x97, 0x53, 0x59, 0xF1,
    0x66, 0xEC, 0xDB, 0x1B, 0xB1, 0xE2, 0x36, 0xEB,
@@ -93 +93 @@
    0x05, 0x95, 0xBB, 0x79, 0x61, 0x3E, 0x81, 0xF7 };
 
-unsigned char table_2[32] = {
+static const unsigned char table_2[32] = {
    0x19, 0x05, 0x09, 0x1C, 0x0B, 0x1A, 0x12, 0x03,
    0x06, 0x04, 0x0D, 0x1D, 0x15, 0x0E, 0x1B, 0x18,
@@ -99 +99 @@
    0x16, 0x0A, 0x10, 0x0F, 0x01, 0x14, 0x11, 0x17 };
 
-unsigned char table_3[256] = {
+static const unsigned char table_3[256] = {
    0xBC, 0x1B, 0xCC, 0x1E, 0x5B, 0x59, 0x4F, 0xA8,
    0x62, 0xC6, 0xC1, 0xBB, 0x83, 0x2D, 0xA3, 0xA6,
@@ -133 +133 @@
    0x7C, 0xEF, 0xE0, 0x99, 0x09, 0xA0, 0x01, 0x7E };
 
-unsigned char table_4[32] = {
+static const unsigned char table_4[32] = {
    0x1F, 0x0B, 0x00, 0x1E, 0x03, 0x0E, 0x15, 0x01,
    0x1A, 0x17, 0x1D, 0x1B, 0x11, 0x0F, 0x0A, 0x12,
@@ -139 +139 @@
    0x08, 0x05, 0x10, 0x19, 0x0C, 0x14, 0x16, 0x1C };
 
-unsigned char table_5[256] = {
+static const unsigned char table_5[256] = {
    0x9A, 0xAB, 0x61, 0x28, 0x0A, 0x23, 0xFC, 0xBA,
    0x90, 0x22, 0xB7, 0x62, 0xD9, 0x09, 0x91, 0xF4,
@@ -173 +173 @@
    0x46, 0x73, 0x69, 0xD5, 0x10, 0xEE, 0x02, 0xEF };
 
-unsigned char table_6[32] = {
+static const unsigned char table_6[32] = {
    0x1A, 0x1C, 0x0F, 0x0C, 0x00, 0x02, 0x13, 0x09,
    0x11, 0x05, 0x0D, 0x12, 0x18, 0x0B, 0x04, 0x10,
@@ -179 +179 @@
    0x19, 0x1F, 0x01, 0x0E, 0x15, 0x06, 0x0A, 0x1D };
 
-unsigned char table_7[256] = {
+static const unsigned char table_7[256] = {
    0x52, 0x11, 0x72, 0xD0, 0x76, 0xD7, 0xAE, 0x03,
    0x7F, 0x19, 0xF4, 0xB8, 0xB3, 0x5D, 0xCA, 0x2D,
@@ -213 +213 @@
    0x88, 0x9E, 0x9C, 0x5B, 0x4D, 0x3A, 0x39, 0xEF };
 
-unsigned char table_8[32] = {
+static const unsigned char table_8[32] = {
    0x13, 0x08, 0x1E, 0x1D, 0x17, 0x16, 0x07, 0x1F,
    0x0E, 0x03, 0x1A, 0x19, 0x01, 0x12, 0x11, 0x10,
@@ -219 +219 @@
    0x1C, 0x18, 0x0A, 0x15, 0x02, 0x1B, 0x06, 0x0D };
 
-unsigned char table_9[256] = {
+static const unsigned char table_9[256] = {
    0x20, 0x2A, 0xDA, 0xFE, 0x76, 0x0D, 0xED, 0x39,
    0x51, 0x4C, 0x46, 0x9A, 0xF1, 0xB0, 0x10, 0xC7,
@@ -253 +253 @@
    0xF9, 0xF0, 0x2C, 0x74, 0xE9, 0x71, 0xC0, 0x2D };
 
-unsigned char table_10[32] = {
+static const unsigned char table_10[32] = {
    0x1D, 0x12, 0x11, 0x0D, 0x1E, 0x19, 0x16, 0x1B,
    0x18, 0x13, 0x07, 0x17, 0x0C, 0x02, 0x00, 0x15,
@@ -259 +259 @@
    0x1F, 0x1A, 0x0B, 0x09, 0x0A, 0x14, 0x1C, 0x03 };
 
-unsigned char table_11[256] = {
+static const unsigned char table_11[256] = {
    0x6B, 0x1D, 0xC6, 0x0A, 0xB7, 0xAC, 0xB2, 0x11,
    0x29, 0xD3, 0xA2, 0x4D, 0xCB, 0x03, 0xEF, 0xA6,
@@ -293 +293 @@
    0x64, 0x76, 0xFF, 0x9F, 0x2E, 0x02, 0xCC, 0x57 };
 
-unsigned char table_12[32] = {
+static const unsigned char table_12[32] = {
    0x14, 0x1B, 0x18, 0x00, 0x1F, 0x15, 0x17, 0x07,
    0x11, 0x1A, 0x0E, 0x13, 0x12, 0x06, 0x01, 0x03,
@@ -299 +299 @@
    0x0D, 0x1E, 0x04, 0x05, 0x08, 0x16, 0x0A, 0x02 };
 
-unsigned char table_13[256] = {
+static const unsigned char table_13[256] = {
    0x37, 0x8A, 0x1B, 0x91, 0xA5, 0x2B, 0x2D, 0x88,
    0x8E, 0xFE, 0x0E, 0xD3, 0xF3, 0xE9, 0x7D, 0xD1,
@@ -333 +333 @@
    0x97, 0x4A, 0xB8, 0x7A, 0xF4, 0xFB, 0x04, 0xA8 };
 
-unsigned char table_14[32] = {
+static const unsigned char table_14[32] = {
    0x04, 0x14, 0x13, 0x15, 0x1A, 0x1B, 0x0F, 0x16,
    0x02, 0x0D, 0x0C, 0x06, 0x10, 0x17, 0x01, 0x0B,
@@ -339 +339 @@
    0x11, 0x09, 0x1D, 0x07, 0x0E, 0x12, 0x03, 0x00 };
 
-unsigned char table_15[256] = {
+static const unsigned char table_15[256] = {
    0x61, 0x48, 0x58, 0x41, 0x7F, 0x88, 0x43, 0x42,
    0xD9, 0x80, 0x81, 0xFE, 0xC6, 0x49, 0xD7, 0x2C,
@@ -373 +373 @@
    0xAB, 0x8D, 0x02, 0x74, 0xBD, 0x3D, 0x8E, 0xDD };
 
-unsigned char table_16[256] = {
+static const unsigned char table_16[256] = {
    0x3F, 0x9C, 0x17, 0xC1, 0x59, 0xC6, 0x23, 0x93,
    0x4B, 0xDF, 0xCB, 0x55, 0x2B, 0xDE, 0xCD, 0xAD,
@@ -407 +407 @@
    0xF4, 0xBE, 0xEA, 0x19, 0x43, 0x01, 0xB1, 0x96 };
 
-unsigned char table_17[256] = {
+static const unsigned char table_17[256] = {
    0x7E, 0xF1, 0xD3, 0x75, 0x87, 0xA6, 0xED, 0x9E,
    0xA9, 0xD5, 0xC6, 0xBF, 0xE6, 0x6A, 0xEE, 0x4B,
@@ -441 +441 @@
    0x9F, 0x99, 0x62, 0xAA, 0xFA, 0x11, 0x0C, 0x52 };
 
-unsigned char table_18[256] = {
+static const unsigned char table_18[256] = {
    0x0F, 0x42, 0x3D, 0x86, 0x3E, 0x66, 0xFE, 0x5C,
    0x52, 0xE2, 0xA3, 0xB3, 0xCE, 0x16, 0xCC, 0x95,
@@ -475 +475 @@
    0xFA, 0x4E, 0xEF, 0x54, 0xE6, 0x7F, 0xC0, 0x67 };
 
-unsigned char table_19[256] = {
+static const unsigned char table_19[256] = {
    0xEA, 0xE7, 0x13, 0x14, 0xB9, 0xC0, 0xC4, 0x42,
    0x49, 0x6E, 0x2A, 0xA6, 0x65, 0x3C, 0x6A, 0x40,
@@ -509 +509 @@
    0x1E, 0x0D, 0xAE, 0x7B, 0x5E, 0x61, 0xE9, 0x63 };
 
-unsigned char table_20[32] = {
+static const unsigned char table_20[32] = {
    0x0D, 0x0B, 0x11, 0x02, 0x05, 0x1B, 0x08, 0x1D,
    0x04, 0x14, 0x01, 0x09, 0x00, 0x19, 0x1E, 0x15,
@@ -515 +515 @@
    0x13, 0x1A, 0x06, 0x17, 0x0E, 0x12, 0x18, 0x03 };
 
-unsigned char table_21[256] = {
+static const unsigned char table_21[256] = {
    0x4C, 0x94, 0xAD, 0x66, 0x9E, 0x69, 0x04, 0xA8,
    0x61, 0xE0, 0xE1, 0x3D, 0xFD, 0x9C, 0xFB, 0x19,
@@ -549 +549 @@
    0xFF, 0xD8, 0xE7, 0xDD, 0xBB, 0x78, 0xD5, 0x81 };
 
-unsigned char table_22[32] = {
+static const unsigned char table_22[32] = {
    0x0B, 0x15, 0x1C, 0x0C, 0x06, 0x0A, 0x1D, 0x16,
    0x12, 0x0E, 0x04, 0x11, 0x1F, 0x0F, 0x07, 0x02,
@@ -555 +555 @@
    0x03, 0x00, 0x01, 0x08, 0x09, 0x14, 0x1B, 0x1E };
 
-unsigned char table_23[256] = {
+static const unsigned char table_23[256] = {
    0x36, 0x53, 0x2D, 0xD0, 0x7A, 0xF0, 0xD5, 0x1C,
    0x50, 0x61, 0x9A, 0x90, 0x0B, 0x29, 0x20, 0x77,
@@ -589 +589 @@
    0x1D, 0x15, 0xC6, 0xBF, 0xA9, 0x43, 0xC0, 0x49 };
 
-unsigned char table_24[256] = {
+static const unsigned char table_24[256] = {
    0xDC, 0x5A, 0xE6, 0x59, 0x64, 0xDA, 0x58, 0x40,
    0x95, 0xF8, 0x2A, 0xE0, 0x39, 0x7E, 0x32, 0x89,
@@ -623 +623 @@
    0xEA, 0x8D, 0x2D, 0x5F, 0xF6, 0xA7, 0x80, 0x3A };
 
-unsigned char table_25[32] = {
+static const unsigned char table_25[32] = {
    0x0A, 0x11, 0x17, 0x03, 0x05, 0x0B, 0x18, 0x13,
    0x09, 0x02, 0x00, 0x1C, 0x0C, 0x08, 0x1B, 0x14,
@@ -629 +629 @@
    0x0F, 0x1A, 0x10, 0x04, 0x12, 0x15, 0x07, 0x1F };
 
-unsigned char table_26[32] = {
+static const unsigned char table_26[32] = {
    0x19, 0x13, 0x1B, 0x01, 0x1C, 0x0D, 0x0C, 0x15,
    0x0B, 0x00, 0x1A, 0x0F, 0x12, 0x16, 0x08, 0x0A,
@@ -635 +635 @@
    0x1F, 0x07, 0x17, 0x05, 0x02, 0x0E, 0x1E, 0x09 };
 
-unsigned char table_27[256] = {
+static const unsigned char table_27[256] = {
    0x72, 0xF0, 0x14, 0xCB, 0x61, 0xA5, 0xB2, 0x02,
    0x75, 0x22, 0xC3, 0x9D, 0x5A, 0x63, 0xFA, 0x5F,
@@ -669 +669 @@
    0x5E, 0x6F, 0x47, 0x64, 0xBC, 0x9A, 0x60, 0x7E };
 
-unsigned char table_28[32] = {
+static const unsigned char table_28[32] = {
    0x15, 0x05, 0x08, 0x19, 0x02, 0x18, 0x1E, 0x07,
    0x0D, 0x0C, 0x1A, 0x06, 0x17, 0x03, 0x10, 0x09,
@@ -675 +675 @@
    0x1B, 0x13, 0x0A, 0x16, 0x0E, 0x00, 0x1D, 0x14 };
 
-unsigned char table_29[256] = {
+static const unsigned char table_29[256] = {
    0x34, 0x59, 0x05, 0x13, 0x09, 0x1D, 0xDF, 0x77,
    0x11, 0xA5, 0x92, 0x27, 0xCD, 0x7B, 0x5E, 0x80,
@@ -709 +709 @@
    0x46, 0x62, 0xB6, 0xB0, 0x15, 0x04, 0x95, 0x4D };
 
-unsigned char table_30[32] = {
+static const unsigned char table_30[32] = {
    0x00, 0x1C, 0x0E, 0x0C, 0x06, 0x16, 0x09, 0x12,
    0x01, 0x13, 0x0B, 0x14, 0x11, 0x08, 0x04, 0x18,
@@ -715 +715 @@
    0x1E, 0x1F, 0x0F, 0x07, 0x0D, 0x05, 0x1D, 0x0A };
 
-unsigned char table_31[256] = {
+static const unsigned char table_31[256] = {
    0xDF, 0xD8, 0x3F, 0xBC, 0x5F, 0xC9, 0x8E, 0x4C,
    0x0B, 0x3C, 0xE5, 0xBF, 0x39, 0xD5, 0x30, 0xDD,
@@ -749 +749 @@
    0x92, 0x48, 0xF7, 0x0A, 0xF6, 0xE2, 0x4B, 0x56 };
 
-unsigned char table_32[256] = {
+static const unsigned char table_32[256] = {
    0x7B, 0x0F, 0x56, 0x2F, 0x1E, 0x2A, 0x7A, 0xD1,
    0x02, 0x91, 0x4E, 0x37, 0x6C, 0x10, 0xA7, 0xF2,
@@ -783 +783 @@
    0x47, 0x6B, 0x8A, 0xA2, 0x9A, 0xA3, 0x45, 0x41 };
 
-unsigned char table_33[256] = {
+static const unsigned char table_33[256] = {
    0xDE, 0xD3, 0x79, 0x67, 0x13, 0x5C, 0x04, 0xF2,
    0xD9, 0x9F, 0x65, 0x56, 0xCC, 0x3B, 0xA4, 0x9A,
@@ -817 +817 @@
    0x80, 0x3C, 0xEE, 0x47, 0xC6, 0x3A, 0x53, 0xF6 };
 
-unsigned char table_34[256] = {
+static const unsigned char table_34[256] = {
    0xF0, 0xE9, 0x3E, 0xD6, 0x89, 0xC8, 0xC7, 0x23,
    0x75, 0x26, 0x5F, 0x9C, 0x57, 0xB8, 0x2A, 0x29,
@@ -851 +851 @@
    0x03, 0x05, 0xBF, 0x06, 0x1B, 0xC0, 0x1A, 0x60 };
 
-unsigned char table_35[256] = {
+static const unsigned char table_35[256] = {
    0xCC, 0x40, 0xEF, 0x1F, 0xDB, 0xE5, 0x71, 0x51,
    0x3B, 0x0F, 0x7D, 0x9C, 0x83, 0x17, 0x6F, 0x8F,
@@ -885 +885 @@
    0x59, 0xC4, 0x9F, 0xD0, 0x66, 0x7B, 0x33, 0xB5 };
 
-unsigned char table_36[256] = {
+static const unsigned char table_36[256] = {
    0xDB, 0x6F, 0xFE, 0xB3, 0x5C, 0x1F, 0xB8, 0xBF,
    0xA3, 0x71, 0x11, 0x56, 0x90, 0xE2, 0x63, 0x18,
@@ -919 +919 @@
    0x4B, 0xB6, 0x7B, 0x4D, 0xCF, 0x7E, 0x48, 0xE3 };
 
-unsigned char table_37[256] = {
+static const unsigned char table_37[256] = {
    0x1F, 0xD6, 0xB1, 0xB3, 0x40, 0xAD, 0xDE, 0xB7,
    0x19, 0xB4, 0xE7, 0x0B, 0x9C, 0x2D, 0xE0, 0xF5,
@@ -953 +953 @@
    0x73, 0xC8, 0x86, 0x47, 0xDB, 0xAB, 0x6F, 0x8C };
 
-unsigned char table_38[256] = {
+static const unsigned char table_38[256] = {
    0xAA, 0x8D, 0x37, 0x94, 0x99, 0xDD, 0x70, 0x77,
    0x78, 0xC9, 0x0F, 0xFA, 0xE2, 0x05, 0xC2, 0x16,
@@ -987 +987 @@
    0x09, 0x76, 0x00, 0x46, 0x4E, 0x53, 0xCE, 0x4A };
 
-unsigned char table_39[32] = {
+static const unsigned char table_39[32] = {
    0x12, 0x18, 0x0E, 0x08, 0x16, 0x05, 0x06, 0x00,
    0x11, 0x17, 0x15, 0x1B, 0x14, 0x01, 0x1F, 0x19,
@@ -993 +993 @@
    0x0B, 0x13, 0x0C, 0x09, 0x1E, 0x02, 0x1A, 0x1C };
 
-unsigned char table_40[32] = {
+static const unsigned char table_40[32] = {
    0x16, 0x02, 0x06, 0x0E, 0x0D, 0x1C, 0x08, 0x0A,
    0x0F, 0x13, 0x0B, 0x18, 0x07, 0x04, 0x14, 0x01,
@@ -999 +999 @@
    0x12, 0x19, 0x1D, 0x03, 0x0C, 0x00, 0x09, 0x15 };
 
-unsigned char table_41[32] = {
+static const unsigned char table_41[32] = {
    0x13, 0x18, 0x04, 0x1F, 0x1D, 0x11, 0x03, 0x00,
    0x10, 0x12, 0x06, 0x0A, 0x1C, 0x07, 0x15, 0x0E,
@@ -1005 +1005 @@
    0x1A, 0x17, 0x14, 0x1E, 0x0D, 0x0F, 0x19, 0x1B };
 
-unsigned char table_42[32] = {
+static const unsigned char table_42[32] = {
    0x00, 0x08, 0x15, 0x1D, 0x05, 0x18, 0x06, 0x07,
    0x1F, 0x01, 0x0B, 0x03, 0x19, 0x13, 0x02, 0x1C,
@@ -1011 +1011 @@
    0x1B, 0x16, 0x10, 0x0D, 0x0A, 0x14, 0x12, 0x04 };
 
-unsigned char table_43[256] = {
+static const unsigned char table_43[256] = {
    0x34, 0xB7, 0x36, 0x85, 0x5F, 0x93, 0x98, 0x70,
    0x1E, 0x59, 0x83, 0x60, 0x6F, 0xBF, 0xF9, 0xD0,
@@ -1045 +1045 @@
    0x73, 0x76, 0x3A, 0x21, 0x53, 0xA4, 0x50, 0x6A };
 
-unsigned char table_44[32] = {
+static const unsigned char table_44[32] = {
    0x1A, 0x0E, 0x0A, 0x17, 0x1F, 0x08, 0x10, 0x14,
    0x0C, 0x0F, 0x09, 0x1C, 0x06, 0x18, 0x1E, 0x12,
@@ -1051 +1051 @@
    0x16, 0x19, 0x05, 0x1D, 0x02, 0x07, 0x04, 0x1B };
 
-unsigned char table_45[256] = {
+static const unsigned char table_45[256] = {
    0x5E, 0xD6, 0xE2, 0x54, 0x35, 0xC2, 0xAC, 0x9D,
    0x92, 0x64, 0x57, 0x65, 0xC8, 0xAE, 0x21, 0xA9,
@@ -1085 +1085 @@
    0xF9, 0x2B, 0x32, 0x8F, 0xFB, 0xC7, 0x07, 0x82 };
 
-unsigned char table_46[256] = {
+static const unsigned char table_46[256] = {
    0x85, 0x78, 0xFE, 0x6C, 0x61, 0xA0, 0x71, 0xCC,
    0x45, 0x54, 0x7A, 0xE6, 0x82, 0x1D, 0xA6, 0x02,
@@ -1119 +1119 @@
    0xC7, 0xE4, 0x37, 0xE5, 0xFC, 0xBD, 0x99, 0x41 };
 
-unsigned char table_47[32] = {
+static const unsigned char table_47[32] = {
    0x18, 0x1D, 0x16, 0x10, 0x11, 0x04, 0x1E, 0x08,
    0x19, 0x0E, 0x0F, 0x02, 0x14, 0x1C, 0x07, 0x17,
@@ -1125 +1125 @@
    0x13, 0x15, 0x0C, 0x00, 0x06, 0x1F, 0x03, 0x1B };
 
-unsigned char table_48[32] = {
+static const unsigned char table_48[32] = {
    0x13, 0x08, 0x15, 0x01, 0x17, 0x10, 0x0F, 0x1F,
    0x1D, 0x0D, 0x12, 0x03, 0x06, 0x0A, 0x1C, 0x19,
@@ -1131 +1131 @@
    0x14, 0x09, 0x0C, 0x18, 0x05, 0x07, 0x0E, 0x0B };
 
-unsigned char table_49[32] = {
+static const unsigned char table_49[32] = {
    0x1F, 0x0F, 0x19, 0x07, 0x18, 0x05, 0x1E, 0x1D,
    0x15, 0x08, 0x17, 0x10, 0x0A, 0x0E, 0x0C, 0x1B,
@@ -1137 +1137 @@
    0x12, 0x1C, 0x0B, 0x16, 0x14, 0x01, 0x11, 0x00 };
 
-unsigned char table_50[32] = {
+static const unsigned char table_50[32] = {
    0x16, 0x18, 0x1C, 0x0E, 0x12, 0x00, 0x04, 0x1B,
    0x1F, 0x13, 0x17, 0x0A, 0x1E, 0x03, 0x0C, 0x01,
@@ -1143 +1143 @@
    0x06, 0x0D, 0x0B, 0x1D, 0x05, 0x07, 0x11, 0x1A };
 
-unsigned char table_51[32] = {
+static const unsigned char table_51[32] = {
    0x1C, 0x0D, 0x1B, 0x07, 0x17, 0x0E, 0x06, 0x01,
    0x12, 0x19, 0x03, 0x0B, 0x10, 0x08, 0x00, 0x1E,
@@ -1149 +1149 @@
    0x0F, 0x11, 0x05, 0x09, 0x15, 0x16, 0x1F, 0x14 };
 
-unsigned char table_52[256] = {
+static const unsigned char table_52[256] = {
    0x34, 0x0B, 0x47, 0xA3, 0x56, 0x30, 0x73, 0xD4,
    0x4B, 0xF6, 0xA6, 0x80, 0x22, 0x95, 0xA5, 0xBB,
@@ -1183 +1183 @@
    0x01, 0x0C, 0x5D, 0x7D, 0xB8, 0xBE, 0x6A, 0x16 };
 
-unsigned char table_53[256] = {
+static const unsigned char table_53[256] = {
    0xE3, 0xF4, 0x8D, 0x72, 0x45, 0x32, 0x9D, 0xCE,
    0x1F, 0x6B, 0xBC, 0xDC, 0xF1, 0xEC, 0x5A, 0x3B,
@@ -1217 +1217 @@
    0xAB, 0x64, 0xE0, 0xBE, 0xDA, 0xBD, 0x96, 0x94 };
 
-unsigned char table_54[32] = {
+static const unsigned char table_54[32] = {
    0x01, 0x02, 0x1D, 0x10, 0x0E, 0x11, 0x08, 0x14,
    0x12, 0x09, 0x15, 0x17, 0x16, 0x04, 0x06, 0x1B,
@@ -1223 +1223 @@
    0x0C, 0x0B, 0x0D, 0x05, 0x0F, 0x00, 0x19, 0x03 };
 
-unsigned char table_55[32] = {
+static const unsigned char table_55[32] = {
    0x01, 0x12, 0x13, 0x09, 0x0B, 0x19, 0x03, 0x0E,
    0x02, 0x1F, 0x1D, 0x1B, 0x1E, 0x11, 0x06, 0x05,
@@ -1229 +1229 @@
    0x18, 0x10, 0x0F, 0x17, 0x1C, 0x0A, 0x04, 0x14 };
 
-unsigned char table_56[256] = {
+static const unsigned char table_56[256] = {
    0xEF, 0x06, 0x5F, 0x11, 0x4B, 0x60, 0x13, 0xBB,
    0x79, 0xD7, 0xE4, 0x6D, 0x22, 0xB4, 0x15, 0x50,
@@ -1263 +1263 @@
    0x96, 0xD5, 0xEB, 0x64, 0x8A, 0xC8, 0x7A, 0xBE };
 
-unsigned char table_57[256] = {
+static const unsigned char table_57[256] = {
    0xD1, 0x9B, 0x15, 0x06, 0xB4, 0xF6, 0x97, 0xF0,
    0xC6, 0x5B, 0x88, 0x12, 0x25, 0xFA, 0x7B, 0x79,
@@ -1297 +1297 @@
    0x4E, 0x3C, 0x84, 0x14, 0x28, 0x3A, 0xE9, 0xC0 };
 
-unsigned char table_58[256] = {
+static const unsigned char table_58[256] = {
    0xE9, 0x81, 0x60, 0xA7, 0x18, 0xA0, 0x0F, 0x55,
    0x2B, 0x52, 0xE0, 0x8B, 0x9D, 0x85, 0xD2, 0xA3,
@@ -1331 +1331 @@
    0x68, 0x1E, 0xF6, 0xA6, 0x6C, 0xB2, 0xD1, 0x58 };
 
-unsigned char table_59[256] = {
+static const unsigned char table_59[256] = {
    0x4C, 0x85, 0x2B, 0x14, 0xCC, 0x4D, 0x5F, 0xD7,
    0xCE, 0x28, 0xC5, 0x0B, 0xA1, 0x99, 0x08, 0xDE,
@@ -1365 +1365 @@
    0x5D, 0x1A, 0x8D, 0xC1, 0x58, 0x48, 0xAD, 0x0F };
 
-unsigned char table_60[32] = {
+static const unsigned char table_60[32] = {
    0x1C, 0x06, 0x1E, 0x10, 0x1D, 0x05, 0x00, 0x0E,
    0x0C, 0x02, 0x11, 0x19, 0x15, 0x18, 0x16, 0x07,
@@ -1371 +1371 @@
    0x03, 0x08, 0x12, 0x04, 0x1B, 0x0A, 0x17, 0x1A };
 
-unsigned char table_61[256] = {
+static const unsigned char table_61[256] = {
    0xC5, 0xA6, 0xF2, 0x6B, 0x4B, 0x58, 0xE0, 0x41,
    0xC6, 0x2F, 0x13, 0xFE, 0xC1, 0x34, 0x3F, 0x24,
@@ -1405 +1405 @@
    0xCF, 0x60, 0xAA, 0xA4, 0xEB, 0xC4, 0x4E, 0xC2 };
 
-unsigned char table_62[256] = {
+static const unsigned char table_62[256] = {
    0x01, 0x59, 0xEC, 0xFC, 0x51, 0xD2, 0xE4, 0x9D,
    0xAA, 0x61, 0xD5, 0xCA, 0x63, 0x5D, 0xCE, 0x36,
@@ -1439 +1439 @@
    0xCF, 0xE9, 0xDB, 0xD3, 0x02, 0x9A, 0x0E, 0x5F };
 
-unsigned char table_63[256] = {
+static const unsigned char table_63[256] = {
    0x0C, 0x02, 0xEE, 0x94, 0x2D, 0x76, 0x96, 0x75,
    0x21, 0xDC, 0x37, 0x03, 0xC0, 0xF7, 0xDF, 0xEF,
@@ -1473 +1473 @@
    0x8C, 0xE2, 0x83, 0xA7, 0xD6, 0x0E, 0xB3, 0xDD };
 
-unsigned char table_64[32] = {
+static const unsigned char table_64[32] = {
    0x03, 0x05, 0x0D, 0x09, 0x1A, 0x16, 0x08, 0x10,
    0x06, 0x1E, 0x1C, 0x15, 0x02, 0x04, 0x17, 0x0C,
@@ -1479 +1479 @@
    0x0E, 0x00, 0x1D, 0x1F, 0x01, 0x0F, 0x07, 0x12 };
 
-unsigned char table_65[32] = {
+static const unsigned char table_65[32] = {
    0x01, 0x0A, 0x1E, 0x14, 0x10, 0x1D, 0x0D, 0x17,
    0x0E, 0x0C, 0x0F, 0x12, 0x04, 0x1A, 0x05, 0x02,
@@ -1485 +1485 @@
    0x11, 0x00, 0x16, 0x06, 0x03, 0x18, 0x15, 0x07 };
 
-unsigned char table_66[32] = {
+static const unsigned char table_66[32] = {
    0x1C, 0x18, 0x0C, 0x09, 0x05, 0x03, 0x15, 0x12,
    0x0D, 0x02, 0x08, 0x0E, 0x19, 0x07, 0x13, 0x17,
@@ -1491 +1491 @@
    0x0F, 0x10, 0x01, 0x1B, 0x00, 0x04, 0x1A, 0x16 };
 
-unsigned char table_67[256] = {
+static const unsigned char table_67[256] = {
    0x6B, 0x49, 0xC8, 0x86, 0xFF, 0xC0, 0x5D, 0xEF,
    0xF7, 0x06, 0xE0, 0x98, 0xA9, 0x72, 0x71, 0xD5,
@@ -1525 +1525 @@
    0x24, 0x43, 0x21, 0x83, 0xFB, 0xFD, 0x8B, 0x96 };
 
-unsigned char table_68[256] = {
+static const unsigned char table_68[256] = {
    0x93, 0xFF, 0x83, 0x70, 0x12, 0x2D, 0x1C, 0xD6,
    0xF9, 0xEE, 0xCF, 0x94, 0x7B, 0xB5, 0xA4, 0x84,
@@ -1559 +1559 @@
    0x8C, 0x6D, 0x91, 0x63, 0x3A, 0x4D, 0xC1, 0x01 };
 
-unsigned char table_69[256] = {
+static const unsigned char table_69[256] = {
    0x21, 0x6B, 0x9B, 0xAE, 0x11, 0x5A, 0x91, 0xC2,
    0x47, 0x8E, 0x87, 0x86, 0x4F, 0xFC, 0x8F, 0x66,
@@ -1593 +1593 @@
    0x73, 0xDB, 0xB6, 0x83, 0xCE, 0x1E, 0xC1, 0x3C };
 
-unsigned char table_70[256] = {
+static const unsigned char table_70[256] = {
    0x54, 0x23, 0xF1, 0x09, 0x9D, 0xEB, 0x26, 0xD9,
    0x6C, 0xC1, 0xBC, 0x3D, 0x6E, 0xB0, 0x5F, 0xE2,
@@ -1627 +1627 @@
    0x49, 0x84, 0x38, 0xC7, 0xE3, 0xD4, 0x1A, 0xBF };
 
-unsigned char table_71[32] = {
+static const unsigned char table_71[32] = {
    0x17, 0x13, 0x0E, 0x1A, 0x0D, 0x18, 0x19, 0x10,
    0x14, 0x11, 0x16, 0x05, 0x04, 0x00, 0x12, 0x0A,
@@ -1633 +1633 @@
    0x0C, 0x06, 0x1B, 0x08, 0x1D, 0x01, 0x15, 0x1E };
 
-unsigned char table_72[256] = {
+static const unsigned char table_72[256] = {
    0xC9, 0xA7, 0x1B, 0xEC, 0x2B, 0x8B, 0xB0, 0xEB,
    0x7F, 0x39, 0x25, 0xD9, 0x1D, 0xD5, 0x67, 0xA0,
@@ -1667 +1667 @@
    0x08, 0x53, 0xF2, 0xB9, 0x5A, 0x3E, 0xE9, 0xD2 };
 
-unsigned char table_73[256] = {
+static const unsigned char table_73[256] = {
    0x36, 0x37, 0xED, 0xD8, 0xBF, 0xD7, 0x12, 0xB7,
    0x40, 0x32, 0x19, 0x4A, 0x44, 0x2A, 0xCE, 0xA5,
@@ -1701 +1701 @@
    0xFF, 0x90, 0x6B, 0xBC, 0x54, 0x95, 0xBD, 0x07 };
 
-unsigned char table_74[256] = {
+static const unsigned char table_74[256] = {
    0xA7, 0xCF, 0x99, 0x1A, 0x13, 0xC7, 0xE9, 0xC4,
    0xB6, 0x0E, 0x15, 0x09, 0xFF, 0xDF, 0xBE, 0x03,
@@ -1735 +1735 @@
    0x2F, 0xD8, 0xC3, 0x7C, 0x9C, 0x98, 0xEA, 0x71 };
 
-unsigned char table_75[256] = {
+static const unsigned char table_75[256] = {
    0xE7, 0xA5, 0x30, 0xE1, 0x9D, 0x81, 0xBE, 0x83,
    0xB2, 0x1E, 0xE4, 0x69, 0x2F, 0x2B, 0x0D, 0xEB,
@@ -1769 +1769 @@
    0x89, 0x46, 0x78, 0xDC, 0x32, 0x8B, 0x67, 0x36 };
 
-unsigned char table_76[256] = {
+static const unsigned char table_76[256] = {
    0x3D, 0x66, 0x40, 0xC5, 0x1D, 0xF5, 0xE7, 0xB7,
    0x2C, 0x23, 0x09, 0xC2, 0x68, 0xE6, 0xD3, 0x8D,
@@ -1803 +1803 @@
    0xD1, 0x95, 0xC3, 0xA0, 0x0F, 0xCA, 0xAC, 0xFC };
 
-unsigned char table_77[32] = {
+static const unsigned char table_77[32] = {
    0x1C, 0x0D, 0x1E, 0x01, 0x06, 0x16, 0x18, 0x17,
    0x0B, 0x1F, 0x04, 0x0F, 0x00, 0x19, 0x08, 0x0A,
@@ -1809 +1809 @@
    0x1A, 0x12, 0x13, 0x0E, 0x1D, 0x10, 0x02, 0x1B };
 
-unsigned char table_78[32] = {
+static const unsigned char table_78[32] = {
    0x0E, 0x02, 0x17, 0x12, 0x1E, 0x09, 0x15, 0x03,
    0x01, 0x0B, 0x0F, 0x11, 0x10, 0x0A, 0x16, 0x06,
@@ -1815 +1815 @@
    0x13, 0x0D, 0x1B, 0x08, 0x19, 0x14, 0x05, 0x1A };
 
-unsigned char table_79[32] = {
+static const unsigned char table_79[32] = {
    0x12, 0x0B, 0x11, 0x01, 0x07, 0x0E, 0x1A, 0x0D,
    0x1E, 0x18, 0x14, 0x1F, 0x0A, 0x17, 0x19, 0x1B,
@@ -1821 +1821 @@
    0x09, 0x06, 0x04, 0x16, 0x15, 0x1C, 0x05, 0x03 };
 
-unsigned char table_80[256] = {
+static const unsigned char table_80[256] = {
    0x14, 0xE7, 0x31, 0x0F, 0xD1, 0x5F, 0xED, 0x1E,
    0xA6, 0x77, 0x20, 0x57, 0x34, 0x64, 0x33, 0x0B,
@@ -1855 +1855 @@
    0x39, 0xB9, 0xC0, 0x22, 0xF1, 0x4D, 0x90, 0xFC };
 
-unsigned char table_81[32] = {
+static const unsigned char table_81[32] = {
    0x03, 0x02, 0x1D, 0x0E, 0x09, 0x1A, 0x0C, 0x11,
    0x1C, 0x0D, 0x08, 0x12, 0x19, 0x10, 0x04, 0x17,
@@ -1861 +1861 @@
    0x1E, 0x0B, 0x0F, 0x01, 0x07, 0x14, 0x1F, 0x06 };
 
-unsigned char table_82[256] = {
+static const unsigned char table_82[256] = {
    0x53, 0xD3, 0x64, 0x89, 0x7D, 0xA5, 0x66, 0xA4,
    0x09, 0x46, 0x17, 0x2C, 0xAF, 0x8C, 0x21, 0x5F,
@@ -1895 +1895 @@
    0x6A, 0x78, 0xB5, 0x71, 0x56, 0x87, 0x7F, 0x86 };
 
-unsigned char table_83[32] = {
+static const unsigned char table_83[32] = {
    0x1B, 0x0A, 0x1F, 0x01, 0x10, 0x08, 0x0E, 0x18,
    0x06, 0x04, 0x00, 0x1C, 0x0C, 0x19, 0x0D, 0x16,
@@ -1901 +1901 @@
    0x17, 0x1E, 0x1A, 0x1D, 0x0B, 0x11, 0x14, 0x15 };
 
-unsigned char table_84[32] = {
+static const unsigned char table_84[32] = {
    0x02, 0x1A, 0x0D, 0x15, 0x01, 0x16, 0x1E, 0x00,
    0x08, 0x1B, 0x04, 0x10, 0x1C, 0x18, 0x19, 0x14,
@@ -1907 +1907 @@
    0x1D, 0x17, 0x13, 0x06, 0x0F, 0x05, 0x09, 0x1F };
 
-unsigned char table_85[256] = {
+static const unsigned char table_85[256] = {
    0xC6, 0x7C, 0xCE, 0xBD, 0x84, 0x3E, 0x0B, 0xD8,
    0xFE, 0xCC, 0x46, 0x50, 0xD1, 0xFB, 0xA0, 0x6D,
@@ -1941 +1941 @@
    0x2D, 0x57, 0xE7, 0x82, 0x1E, 0x37, 0x63, 0x43 };
 
-unsigned char table_86[32] = {
+static const unsigned char table_86[32] = {
    0x11, 0x07, 0x0F, 0x0A, 0x19, 0x1D, 0x0B, 0x09,
    0x1C, 0x1E, 0x14, 0x06, 0x0C, 0x16, 0x13, 0x04,
@@ -1947 +1947 @@
    0x10, 0x1A, 0x1F, 0x01, 0x17, 0x0E, 0x03, 0x1B };
 
-unsigned char table_87[32] = {
+static const unsigned char table_87[32] = {
    0x17, 0x0E, 0x1D, 0x13, 0x0B, 0x19, 0x03, 0x06,
    0x09, 0x01, 0x0D, 0x15, 0x1C, 0x16, 0x18, 0x1B,
@@ -1953 +1953 @@
    0x02, 0x04, 0x07, 0x1A, 0x14, 0x0A, 0x0C, 0x05 };
 
-unsigned char table_88[32] = {
+static const unsigned char table_88[32] = {
    0x09, 0x08, 0x17, 0x10, 0x0A, 0x07, 0x1C, 0x1F,
    0x04, 0x0E, 0x01, 0x0C, 0x0D, 0x1B, 0x03, 0x15,
@@ -1959 +1959 @@
    0x05, 0x11, 0x14, 0x00, 0x16, 0x1D, 0x12, 0x13 };
 
-unsigned char table_89[32] = {
+static const unsigned char table_89[32] = {
    0x15, 0x1C, 0x1D, 0x14, 0x0F, 0x1A, 0x05, 0x02,
    0x07, 0x09, 0x06, 0x08, 0x1F, 0x00, 0x10, 0x13,
@@ -1965 +1965 @@
    0x12, 0x04, 0x11, 0x0A, 0x01, 0x0B, 0x17, 0x19 };
 
-unsigned char table_90[256] = {
+static const unsigned char table_90[256] = {
    0x62, 0x36, 0x64, 0x0E, 0x4C, 0x6C, 0xBE, 0xCF,
    0x25, 0x5A, 0x3D, 0x12, 0x54, 0x9F, 0xE7, 0xA5,
@@ -1999 +1999 @@
    0x20, 0x94, 0x45, 0xED, 0xDC, 0xBD, 0x7E, 0x50 };
 
-unsigned char table_91[32] = {
+static const unsigned char table_91[32] = {
    0x03, 0x04, 0x0C, 0x18, 0x10, 0x0D, 0x13, 0x1B,
    0x1F, 0x07, 0x11, 0x17, 0x1C, 0x1D, 0x05, 0x06,
@@ -2005 +2005 @@
    0x14, 0x16, 0x00, 0x15, 0x19, 0x09, 0x0F, 0x1E };
 
-unsigned char table_92[32] = {
+static const unsigned char table_92[32] = {
    0x1E, 0x10, 0x01, 0x07, 0x11, 0x16, 0x15, 0x17,
    0x1F, 0x14, 0x0C, 0x1C, 0x06, 0x03, 0x00, 0x18,
@@ -2011 +2011 @@
    0x0F, 0x12, 0x0B, 0x13, 0x0A, 0x04, 0x1D, 0x1A };
 
-unsigned char table_93[256] = {
+static const unsigned char table_93[256] = {
    0x76, 0x78, 0xA2, 0x94, 0x0E, 0x7F, 0xDF, 0xC1,
    0xB9, 0xE1, 0x3D, 0x59, 0x6F, 0x1E, 0x53, 0x99,
@@ -2045 +2045 @@
    0x24, 0x34, 0xE2, 0xEC, 0x85, 0x47, 0xF4, 0xB2 };
 
-unsigned char table_94[32] = {
+static const unsigned char table_94[32] = {
    0x1C, 0x07, 0x05, 0x1A, 0x10, 0x1D, 0x14, 0x12,
    0x08, 0x0F, 0x0C, 0x01, 0x04, 0x1B, 0x16, 0x0A,
@@ -2051 +2051 @@
    0x0E, 0x09, 0x15, 0x19, 0x03, 0x18, 0x00, 0x0B };
 
-unsigned char table_95[32] = {
+static const unsigned char table_95[32] = {
    0x12, 0x10, 0x11, 0x15, 0x03, 0x0A, 0x14, 0x05,
    0x1D, 0x07, 0x17, 0x0D, 0x09, 0x08, 0x1B, 0x1F,
@@ -2057 +2057 @@
    0x1E, 0x1C, 0x01, 0x0C, 0x1A, 0x0F, 0x13, 0x16 };
 
-unsigned char table_96[256] = {
+static const unsigned char table_96[256] = {
    0x1C, 0x6E, 0xCD, 0xB4, 0xB3, 0x93, 0xA8, 0x2E,
    0x4F, 0x09, 0xE3, 0x72, 0x64, 0x13, 0x21, 0xF5,
@@ -2091 +2091 @@
    0x59, 0xCE, 0xE1, 0x57, 0x20, 0x58, 0x51, 0xD8 };
 
-unsigned char table_97[256] = {
+static const unsigned char table_97[256] = {
    0x15, 0x2D, 0xAF, 0x36, 0xCF, 0xD3, 0xD0, 0xED,
    0xB2, 0x1B, 0xFE, 0x92, 0xBD, 0xAD, 0x58, 0x0F,
@@ -2125 +2125 @@
    0x83, 0x25, 0x9F, 0xD9, 0x99, 0xC1, 0xFD, 0xB3 };
 
-unsigned char table_98[256] = {
+static const unsigned char table_98[256] = {
    0xC8, 0xE6, 0x38, 0x93, 0xE5, 0x03, 0x18, 0x1F,
    0xE9, 0x5A, 0xB6, 0xAF, 0xC3, 0x95, 0x00, 0x51,
@@ -2159 +2159 @@
    0x54, 0x3A, 0x13, 0x09, 0x2C, 0xB5, 0xC7, 0x63 };
 
-unsigned char table_99[32] = {
+static const unsigned char table_99[32] = {
    0x19, 0x00, 0x10, 0x18, 0x09, 0x11, 0x13, 0x1D,
    0x08, 0x1A, 0x02, 0x05, 0x03, 0x17, 0x12, 0x01,
@@ -2165 +2165 @@
    0x0E, 0x16, 0x1E, 0x04, 0x1B, 0x0A, 0x0C, 0x1C };
 
-unsigned char table_100[256] = {
+static const unsigned char table_100[256] = {
    0x9B, 0x3A, 0xAE, 0x60, 0x27, 0x67, 0x1E, 0x4E,
    0x91, 0xDA, 0x85, 0x43, 0x5C, 0xCC, 0x89, 0x55,
@@ -2199 +2199 @@
    0x30, 0x0C, 0xB2, 0x7B, 0xBE, 0xFB, 0x23, 0x2C };
 
-unsigned char table_101[32] = {
+static const unsigned char table_101[32] = {
    0x18, 0x08, 0x14, 0x17, 0x03, 0x10, 0x19, 0x04,
    0x0D, 0x1C, 0x06, 0x1D, 0x1E, 0x12, 0x11, 0x0B,
@@ -2205 +2205 @@
    0x15, 0x0A, 0x0C, 0x1A, 0x00, 0x01, 0x1F, 0x09 };
 
-unsigned char table_102[32] = {
+static const unsigned char table_102[32] = {
    0x17, 0x1F, 0x0E, 0x05, 0x13, 0x0C, 0x14, 0x1A,
    0x0F, 0x01, 0x12, 0x1C, 0x00, 0x07, 0x0D, 0x02,
@@ -2211 +2211 @@
    0x06, 0x15, 0x0A, 0x19, 0x09, 0x08, 0x1B, 0x0B };
 
-unsigned char table_103[32] = {
+static const unsigned char table_103[32] = {
    0x0F, 0x09, 0x1E, 0x11, 0x0D, 0x08, 0x10, 0x00,
    0x01, 0x1F, 0x1D, 0x1C, 0x12, 0x04, 0x07, 0x05,
@@ -2217 +2217 @@
    0x18, 0x0B, 0x0A, 0x13, 0x0C, 0x0E, 0x03, 0x06 };
 
-unsigned char table_104[256] = {
+static const unsigned char table_104[256] = {
    0xA4, 0x9F, 0x78, 0x39, 0x3D, 0x81, 0x51, 0x24,
    0x46, 0x2A, 0x56, 0xE8, 0xDF, 0x73, 0xA8, 0xA2,
@@ -2251 +2251 @@
    0x97, 0xBB, 0x37, 0x8C, 0x54, 0x53, 0x9E, 0x8F };
 
-unsigned char table_105[256] = {
+static const unsigned char table_105[256] = {
    0x7B, 0x35, 0x11, 0x79, 0x07, 0x2F, 0xF6, 0x82,
    0x8E, 0xB4, 0x6E, 0xD2, 0x6D, 0xC5, 0x8C, 0x1C,
@@ -2285 +2285 @@
    0xBA, 0x1E, 0x44, 0x87, 0x45, 0x9F, 0xC9, 0x94 };
 
-unsigned char table_106[32] = {
+static const unsigned char table_106[32] = {
    0x03, 0x11, 0x07, 0x1B, 0x0F, 0x14, 0x0C, 0x01,
    0x04, 0x02, 0x09, 0x0A, 0x05, 0x12, 0x06, 0x1F,
@@ -2291 +2291 @@
    0x1E, 0x1D, 0x17, 0x19, 0x13, 0x16, 0x0B, 0x1A };
 
-unsigned char table_107[32] = {
+static const unsigned char table_107[32] = {
    0x13, 0x1B, 0x06, 0x11, 0x1C, 0x07, 0x08, 0x0E,
    0x10, 0x05, 0x09, 0x18, 0x04, 0x15, 0x1E, 0x0F,
@@ -2297 +2297 @@
    0x03, 0x0C, 0x0A, 0x1D, 0x14, 0x01, 0x16, 0x0B };
 
-unsigned char table_108[256] = {
+static const unsigned char table_108[256] = {
    0x99, 0xA3, 0x48, 0xE8, 0x5A, 0x7D, 0x97, 0xCA,
    0x7F, 0x06, 0x9B, 0x04, 0xE0, 0xF3, 0x18, 0xAE,
@@ -2331 +2331 @@
    0xCC, 0xE2, 0x44, 0x73, 0xBE, 0x26, 0x8C, 0x5B };
 
-unsigned char table_109[256] = {
+static const unsigned char table_109[256] = {
    0xE3, 0x95, 0xDB, 0x09, 0x82, 0x0A, 0x8F, 0x9E,
    0xC9, 0xDC, 0x28, 0x35, 0x0F, 0x8B, 0xA8, 0xA5,
@@ -2365 +2365 @@
    0x1E, 0xF4, 0xD5, 0xB1, 0x5C, 0x25, 0xE8, 0x1C };
 
-unsigned char table_110[256] = {
+static const unsigned char table_110[256] = {
    0xC3, 0x06, 0x3C, 0xCB, 0xD2, 0x44, 0x9D, 0x48,
    0x28, 0xAA, 0xA9, 0xD0, 0x64, 0x25, 0x56, 0xCA,
@@ -2399 +2399 @@
    0x4B, 0xCF, 0xB4, 0x2F, 0xBB, 0xEF, 0xDB, 0x33 };
 
-unsigned char table_111[32] = {
+static const unsigned char table_111[32] = {
    0x09, 0x0F, 0x00, 0x15, 0x12, 0x17, 0x1A, 0x0D,
    0x1C, 0x0B, 0x01, 0x0A, 0x05, 0x1E, 0x1D, 0x0C,
@@ -2405 +2405 @@
    0x10, 0x16, 0x11, 0x1F, 0x04, 0x06, 0x02, 0x13 };
 
-unsigned char table_112[256] = {
+static const unsigned char table_112[256] = {
    0xF9, 0x7D, 0xBE, 0xD5, 0x9F, 0xB8, 0x95, 0x43,
    0xDB, 0xAE, 0x7E, 0xEC, 0x5B, 0x58, 0x18, 0x49,
@@ -2439 +2439 @@
    0xA1, 0xCC, 0xDF, 0x60, 0xD8, 0x5A, 0xE6, 0xD4 };
 
-unsigned char table_113[256] = {
+static const unsigned char table_113[256] = {
    0x46, 0x9D, 0x39, 0xB2, 0x8D, 0x3B, 0x59, 0x5A,
    0xD0, 0x9C, 0xE4, 0x04, 0x01, 0xE2, 0xB3, 0xD2,
@@ -2473 +2473 @@
    0xFE, 0x7B, 0x67, 0xFF, 0x10, 0xEC, 0xC6, 0x86 };
 
-unsigned char table_114[32] = {
+static const unsigned char table_114[32] = {
    0x11, 0x10, 0x04, 0x1D, 0x08, 0x15, 0x1A, 0x1B,
    0x14, 0x18, 0x0F, 0x17, 0x16, 0x07, 0x1E, 0x0E,
@@ -2479 +2479 @@
    0x1F, 0x19, 0x09, 0x1C, 0x01, 0x0D, 0x03, 0x05 };
 
-unsigned char table_115[256] = {
+static const unsigned char table_115[256] = {
    0xB7, 0xBB, 0x63, 0x0D, 0xF0, 0x33, 0x5A, 0x05,
    0xF2, 0x7F, 0x64, 0xDB, 0x51, 0xC9, 0x2C, 0x85,
@@ -2513 +2513 @@
    0x8C, 0x17, 0xB5, 0xEB, 0xD5, 0xF3, 0x0B, 0x3C };
 
-unsigned char table_116[32] = {
+static const unsigned char table_116[32] = {
    0x00, 0x05, 0x10, 0x1C, 0x0C, 0x1A, 0x04, 0x1B,
    0x0A, 0x0D, 0x14, 0x0B, 0x07, 0x03, 0x12, 0x1E,
@@ -2519 +2519 @@
    0x19, 0x18, 0x16, 0x02, 0x13, 0x0E, 0x17, 0x1D };
 
-unsigned char table_117[256] = {
+static const unsigned char table_117[256] = {
    0xD0, 0x9A, 0xAB, 0xA8, 0xA7, 0xDF, 0x28, 0xCE,
    0x3E, 0x51, 0xBF, 0x76, 0x03, 0xA0, 0x53, 0x3F,
@@ -2553 +2553 @@
    0xC1, 0xFD, 0x92, 0xA1, 0xF7, 0xAE, 0xDC, 0x58 };
 
-unsigned char table_118[256] = {
+static const unsigned char table_118[256] = {
    0x38, 0xA0, 0xA6, 0xFC, 0x7C, 0x5A, 0x97, 0x1D,
    0xFD, 0x00, 0x20, 0xA2, 0x72, 0x10, 0x1F, 0x48,
@@ -2587 +2587 @@
    0xD9, 0x2F, 0x02, 0xAC, 0x30, 0x6A, 0xD6, 0x95 };
 
-unsigned char table_119[32] = {
+static const unsigned char table_119[32] = {
    0x14, 0x0A, 0x1C, 0x00, 0x0C, 0x1F, 0x1E, 0x0B,
    0x12, 0x1D, 0x17, 0x08, 0x07, 0x04, 0x09, 0x10,
@@ -2593 +2593 @@
    0x18, 0x02, 0x06, 0x01, 0x19, 0x16, 0x13, 0x0F };
 
-unsigned char table_120[256] = {
+static const unsigned char table_120[256] = {
    0xCE, 0x89, 0xB2, 0x72, 0x04, 0x77, 0x64, 0xAE,
    0x80, 0x99, 0xB5, 0x00, 0x7B, 0x50, 0x9D, 0xE3,
@@ -2627 +2627 @@
    0x5E, 0xCA, 0xFD, 0x11, 0xA3, 0xC7, 0xC0, 0x91 };
 
-unsigned char table_121[32] = {
+static const unsigned char table_121[32] = {
    0x1E, 0x12, 0x06, 0x1D, 0x15, 0x1F, 0x13, 0x0B,
    0x10, 0x0D, 0x1C, 0x01, 0x0A, 0x0E, 0x02, 0x19,
@@ -2633 +2633 @@
    0x14, 0x08, 0x18, 0x05, 0x09, 0x0F, 0x1B, 0x07 };
 
-unsigned char table_122[256] = {
+static const unsigned char table_122[256] = {
    0x85, 0xDF, 0x7F, 0x7C, 0x56, 0xF0, 0x0C, 0x7D,
    0x76, 0xA8, 0x58, 0x31, 0x25, 0x8A, 0x0D, 0x23,
@@ -2667 +2667 @@
    0xCE, 0x2D, 0x4E, 0x83, 0xC3, 0x69, 0xEE, 0xB2 };
 
-unsigned char table_123[256] = {
+static const unsigned char table_123[256] = {
    0x9D, 0xFB, 0x3C, 0x81, 0xAA, 0x05, 0xB2, 0xBE,
    0xD1, 0x5F, 0x4C, 0xE0, 0xA3, 0xF4, 0xDE, 0x35,
@@ -2701 +2701 @@
    0x48, 0x77, 0xD0, 0x0A, 0x8A, 0x3A, 0x43, 0x79 };
 
-unsigned char table_124[256] = {
+static const unsigned char table_124[256] = {
    0x6C, 0xC3, 0x28, 0x2F, 0x42, 0x4B, 0x7C, 0x3C,
    0xCE, 0x24, 0xC8, 0x51, 0x25, 0x3F, 0x49, 0x8D,
@@ -2735 +2735 @@
    0x62, 0x1B, 0xDE, 0x91, 0x87, 0x97, 0x05, 0x2E };
 
-unsigned char table_125[32] = {
+static const unsigned char table_125[32] = {
    0x1A, 0x18, 0x12, 0x15, 0x00, 0x1C, 0x01, 0x0B,
    0x19, 0x1B, 0x1F, 0x11, 0x07, 0x10, 0x1E, 0x06,
@@ -2741 +2741 @@
    0x02, 0x03, 0x13, 0x14, 0x09, 0x1D, 0x05, 0x0F };
 
-unsigned char table_126[32] = {
+static const unsigned char table_126[32] = {
    0x1C, 0x1D, 0x07, 0x12, 0x18, 0x1A, 0x19, 0x09,
    0x0F, 0x14, 0x1F, 0x0B, 0x13, 0x04, 0x0E, 0x1E,
@@ -2747 +2747 @@
    0x15, 0x10, 0x11, 0x08, 0x00, 0x03, 0x06, 0x02 };
 
-unsigned char table_127[256] = {
+static const unsigned char table_127[256] = {
    0xA0, 0x66, 0xD8, 0x08, 0xEA, 0x39, 0x78, 0xAB,
    0x61, 0x4E, 0xC7, 0xD1, 0xA3, 0x1C, 0x9F, 0xCB,
@@ -2781 +2781 @@
    0x70, 0xF8, 0x17, 0xCD, 0xB0, 0xCC, 0x82, 0x2D };
 
-unsigned char table_128[32] = {
+static const unsigned char table_128[32] = {
    0x1A, 0x1C, 0x09, 0x17, 0x1B, 0x0B, 0x16, 0x1E,
    0x14, 0x0C, 0x12, 0x0E, 0x05, 0x03, 0x1F, 0x15,
@@ -2787 +2787 @@
    0x02, 0x08, 0x0F, 0x18, 0x07, 0x04, 0x1D, 0x06 };
 
-unsigned char table_129[256] = {
+static const unsigned char table_129[256] = {
    0x9D, 0x5F, 0xE8, 0x99, 0x57, 0x07, 0x16, 0xA6,
    0x9F, 0xB6, 0xDE, 0xED, 0x2D, 0xB3, 0xC0, 0x8E,
@@ -2821 +2821 @@
    0x09, 0x45, 0x6B, 0xD7, 0x0B, 0x89, 0x4F, 0x2A };
 
-unsigned char table_130[32] = {
+static const unsigned char table_130[32] = {
    0x07, 0x03, 0x15, 0x0B, 0x02, 0x11, 0x17, 0x14,
    0x05, 0x10, 0x0A, 0x0F, 0x01, 0x1C, 0x1D, 0x0E,
@@ -2827 +2827 @@
    0x1B, 0x00, 0x08, 0x0D, 0x0C, 0x1E, 0x04, 0x1F };
 
-unsigned char table_131[32] = {
+static const unsigned char table_131[32] = {
    0x1D, 0x13, 0x1B, 0x10, 0x07, 0x03, 0x0A, 0x02,
    0x00, 0x0C, 0x0E, 0x0B, 0x0D, 0x18, 0x12, 0x1F,
@@ -2833 +2833 @@
    0x19, 0x05, 0x0F, 0x17, 0x06, 0x01, 0x09, 0x16 };
 
-unsigned char table_132[256] = {
+static const unsigned char table_132[256] = {
    0x33, 0x8D, 0x45, 0x6F, 0xFF, 0xF5, 0xB6, 0x53,
    0x3B, 0xF3, 0x07, 0xA4, 0x97, 0xEB, 0x6B, 0xA5,
@@ -2867 +2867 @@
    0xC4, 0x7F, 0xA0, 0xD8, 0xEF, 0x03, 0x70, 0xF6 };
 
-unsigned char table_133[256] = {
+static const unsigned char table_133[256] = {
    0x02, 0xF0, 0xED, 0xC4, 0xE4, 0x67, 0x60, 0x8B,
    0xF3, 0x77, 0x92, 0xE0, 0x85, 0x93, 0x1E, 0x8E,
@@ -2901 +2901 @@
    0x5A, 0x35, 0xB0, 0xAE, 0x82, 0x79, 0x1D, 0x52 };
 
-unsigned char table_134[32] = {
+static const unsigned char table_134[32] = {
    0x09, 0x0F, 0x10, 0x0C, 0x03, 0x15, 0x07, 0x17,
    0x0E, 0x0B, 0x1D, 0x08, 0x19, 0x11, 0x00, 0x0A,
@@ -2907 +2907 @@
    0x02, 0x1B, 0x1A, 0x04, 0x05, 0x1F, 0x1C, 0x1E };
 
-unsigned char table_135[256] = {
+static const unsigned char table_135[256] = {
    0x14, 0x34, 0xEA, 0x02, 0x2B, 0x5A, 0x10, 0x51,
    0xF3, 0x8F, 0x28, 0xB2, 0x50, 0x8B, 0x01, 0xCC,
@@ -2941 +2941 @@
    0x00, 0x63, 0xD9, 0xBE, 0xF2, 0x60, 0x25, 0x62 };
 
-unsigned char table_136[256] = {
+static const unsigned char table_136[256] = {
    0xD3, 0x1A, 0x00, 0xED, 0x59, 0x24, 0xA3, 0xF2,
    0xBA, 0x58, 0x4C, 0x5C, 0x75, 0x48, 0x98, 0xB0,
@@ -2975 +2975 @@
    0x93, 0x1D, 0x9B, 0x5B, 0x40, 0xEE, 0x42, 0x19 };
 
-unsigned char table_137[32] = {
+static const unsigned char table_137[32] = {
    0x0F, 0x09, 0x02, 0x06, 0x18, 0x0B, 0x1E, 0x05,
    0x11, 0x1D, 0x16, 0x01, 0x13, 0x10, 0x0E, 0x1A,
@@ -2981 +2981 @@
    0x03, 0x1F, 0x0A, 0x12, 0x0C, 0x07, 0x04, 0x1C };
 
-unsigned char table_138[32] = {
+static const unsigned char table_138[32] = {
    0x0D, 0x1C, 0x1F, 0x15, 0x0F, 0x14, 0x1B, 0x12,
    0x09, 0x0B, 0x19, 0x07, 0x11, 0x16, 0x0C, 0x04,
@@ -2987 +2987 @@
    0x01, 0x06, 0x18, 0x17, 0x10, 0x1A, 0x02, 0x00 };
 
-unsigned char table_139[32] = {
+static const unsigned char table_139[32] = {
    0x05, 0x15, 0x1D, 0x02, 0x0F, 0x03, 0x17, 0x1A,
    0x0A, 0x00, 0x1F, 0x12, 0x0E, 0x11, 0x1B, 0x13,
@@ -2993 +2993 @@
    0x0C, 0x04, 0x16, 0x19, 0x1C, 0x06, 0x10, 0x01 };
 
-unsigned char table_140[32] = {
+static const unsigned char table_140[32] = {
    0x06, 0x1E, 0x0C, 0x11, 0x13, 0x08, 0x15, 0x01,
    0x1D, 0x03, 0x0F, 0x19, 0x18, 0x04, 0x00, 0x14,
@@ -2999 +2999 @@
    0x1F, 0x17, 0x09, 0x0A, 0x0D, 0x16, 0x10, 0x1C };
 
-unsigned char table_141[256] = {
+static const unsigned char table_141[256] = {
    0xE1, 0x0A, 0x28, 0xCD, 0x8A, 0x1E, 0x26, 0x10,
    0xC0, 0x6F, 0x06, 0x2C, 0xF8, 0x51, 0x6C, 0x8F,
@@ -3033 +3033 @@
    0x98, 0x54, 0xB8, 0xDC, 0x46, 0xDF, 0x87, 0xE5 };
 
-unsigned char table_142[256] = {
+static const unsigned char table_142[256] = {
    0x90, 0x94, 0xBE, 0x14, 0x99, 0xEB, 0x45, 0x0F,
    0x34, 0x4A, 0xE3, 0x79, 0xD2, 0x64, 0x4D, 0x69,
@@ -3067 +3067 @@
    0xCC, 0x1E, 0x87, 0xD7, 0x01, 0x1F, 0x51, 0x95 };
 
-unsigned char table_143[32] = {
+static const unsigned char table_143[32] = {
    0x0E, 0x16, 0x18, 0x11, 0x0C, 0x01, 0x12, 0x1F,
    0x08, 0x15, 0x0A, 0x06, 0x1C, 0x1E, 0x02, 0x1A,
@@ -3073 +3073 @@
    0x0D, 0x14, 0x09, 0x0B, 0x1B, 0x00, 0x1D, 0x04 };
 
-unsigned char table_144[32] = {
+static const unsigned char table_144[32] = {
    0x00, 0x1B, 0x17, 0x19, 0x1D, 0x11, 0x0D, 0x1A,
    0x13, 0x03, 0x1E, 0x09, 0x10, 0x0E, 0x15, 0x05,
@@ -3079 +3079 @@
    0x16, 0x14, 0x02, 0x04, 0x07, 0x18, 0x12, 0x0C };
 
-unsigned char table_145[256] = {
+static const unsigned char table_145[256] = {
    0xF9, 0x2C, 0x38, 0x74, 0xDA, 0x65, 0x85, 0x0E,
    0xBA, 0x64, 0xDB, 0xE3, 0xB6, 0x8B, 0x0B, 0x5E,
@@ -3113 +3113 @@
    0x69, 0xF6, 0xEF, 0xC2, 0xAD, 0x03, 0xB3, 0x1E };
 
-unsigned char table_146[256] = {
+static const unsigned char table_146[256] = {
    0x1C, 0xF5, 0x16, 0xD2, 0xCC, 0xDC, 0x1E, 0x29,
    0xE3, 0x17, 0x3B, 0x66, 0x6A, 0xF7, 0x03, 0xB2,
@@ -3147 +3147 @@
    0x7D, 0x96, 0x76, 0x99, 0xB5, 0x48, 0x98, 0x10 };
 
-unsigned char table_147[32] = {
+static const unsigned char table_147[32] = {
    0x17, 0x07, 0x0D, 0x16, 0x00, 0x1B, 0x1F, 0x09,
    0x10, 0x11, 0x14, 0x0A, 0x02, 0x06, 0x13, 0x0C,
@@ -3153 +3153 @@
    0x1C, 0x1A, 0x03, 0x18, 0x04, 0x0B, 0x1D, 0x0E };
 
-unsigned char table_148[256] = {
+static const unsigned char table_148[256] = {
    0xFB, 0x23, 0xBC, 0x5A, 0x8C, 0x02, 0x42, 0x3B,
    0x95, 0x0C, 0x21, 0x0E, 0x14, 0xDF, 0x11, 0xC0,
@@ -3187 +3187 @@
    0x09, 0x43, 0xBF, 0xD0, 0x55, 0xDD, 0x3F, 0x24 };
 
-unsigned char table_149[32] = {
+static const unsigned char table_149[32] = {
    0x1B, 0x0B, 0x0C, 0x06, 0x1F, 0x17, 0x04, 0x1A,
    0x1E, 0x02, 0x0F, 0x16, 0x0E, 0x09, 0x10, 0x01,
@@ -3193 +3193 @@
    0x18, 0x1D, 0x14, 0x0D, 0x07, 0x08, 0x15, 0x12 };
 
-unsigned char table_150[256] = {
+static const unsigned char table_150[256] = {
    0x57, 0xBC, 0x9D, 0x46, 0x14, 0xD0, 0x94, 0x95,
    0x1B, 0x12, 0xB8, 0xD4, 0x53, 0x73, 0x83, 0xE6,
@@ -3227 +3227 @@
    0x97, 0xC9, 0xF3, 0x04, 0xD8, 0xF4, 0x80, 0x44 };
 
-unsigned char table_151[256] = {
+static const unsigned char table_151[256] = {
    0x78, 0x6C, 0xC5, 0x0C, 0x2D, 0xA7, 0x97, 0x9C,
    0x22, 0x76, 0x3E, 0x81, 0x51, 0x47, 0x59, 0x71,
@@ -3261 +3261 @@
    0x43, 0x3A, 0x53, 0x9E, 0x80, 0x88, 0x07, 0x9D };
 
-unsigned char table_152[32] = {
+static const unsigned char table_152[32] = {
    0x02, 0x1A, 0x17, 0x1D, 0x01, 0x03, 0x13, 0x1E,
    0x05, 0x18, 0x06, 0x0A, 0x0C, 0x04, 0x1B, 0x00,
@@ -3267 +3267 @@
    0x14, 0x12, 0x0D, 0x10, 0x19, 0x11, 0x08, 0x15 };
 
-unsigned char table_153[32] = {
+static const unsigned char table_153[32] = {
    0x0E, 0x14, 0x12, 0x1E, 0x1C, 0x02, 0x06, 0x16,
    0x18, 0x0D, 0x17, 0x0C, 0x1D, 0x11, 0x08, 0x19,
@@ -3273 +3273 @@
    0x1A, 0x0A, 0x05, 0x10, 0x00, 0x01, 0x15, 0x09 };
 
-unsigned char table_154[256] = {
+static const unsigned char table_154[256] = {
    0x27, 0x5A, 0x08, 0x5B, 0xF4, 0x39, 0x13, 0x6F,
    0x67, 0xEA, 0x22, 0xCA, 0x5C, 0xCF, 0x18, 0x7C,
@@ -3307 +3307 @@
    0x53, 0xE1, 0xDD, 0x72, 0x95, 0x52, 0x34, 0xB5 };
 
-unsigned char table_155[256] = {
+static const unsigned char table_155[256] = {
    0x75, 0x58, 0xC5, 0xA5, 0x83, 0x16, 0xF3, 0x7F,
    0x94, 0xDE, 0xA0, 0xF6, 0xFD, 0x89, 0xA8, 0x06,
@@ -3341 +3341 @@
    0x8B, 0x33, 0xFC, 0xBB, 0x00, 0xA2, 0xDF, 0xDA };
 
-unsigned char table_156[256] = {
+static const unsigned char table_156[256] = {
    0x31, 0x25, 0xB1, 0xD3, 0xAF, 0xAE, 0x84, 0x2C,
    0x71, 0x5E, 0xD8, 0x80, 0x6F, 0x3E, 0x48, 0x86,
@@ -3375 +3375 @@
    0xF1, 0x68, 0xBE, 0x35, 0x40, 0x8C, 0xD4, 0x47 };
 
-unsigned char table_157[32] = {
+static const unsigned char table_157[32] = {
    0x00, 0x0D, 0x03, 0x02, 0x11, 0x04, 0x18, 0x0B,
    0x14, 0x1D, 0x1C, 0x13, 0x1B, 0x17, 0x10, 0x15,
@@ -3381 +3381 @@
    0x08, 0x06, 0x0C, 0x0E, 0x1F, 0x0F, 0x0A, 0x05 };
 
-unsigned char table_158[256] = {
+static const unsigned char table_158[256] = {
    0x68, 0x26, 0x80, 0x0B, 0xB8, 0xD5, 0x8C, 0xB7,
    0x65, 0xEF, 0xBC, 0x94, 0x28, 0xB9, 0xB2, 0xD2,
@@ -3415 +3415 @@
    0x9A, 0x57, 0xA2, 0x74, 0xC6, 0xFE, 0x9B, 0x58 };
 
-unsigned char table_159[256] = {
+static const unsigned char table_159[256] = {
    0xE5, 0xBF, 0x84, 0x56, 0xD6, 0x43, 0x3E, 0xA5,
    0x64, 0x87, 0x44, 0x63, 0x4A, 0x4C, 0x8D, 0x24,
@@ -3449 +3449 @@
    0xCB, 0x9B, 0x13, 0x8F, 0xA4, 0x28, 0x23, 0x85 };
 
-unsigned char table_160[256] = {
+static const unsigned char table_160[256] = {
    0x35, 0x44, 0x0E, 0x92, 0x75, 0x83, 0x9D, 0x53,
    0xA5, 0x90, 0xF8, 0xF7, 0x54, 0x74, 0xDF, 0x3D,
@@ -3483 +3483 @@
    0xBB, 0x2C, 0xE5, 0xC3, 0x67, 0xA1, 0x10, 0xB9 };
 
-unsigned char table_161[256] = {
+static const unsigned char table_161[256] = {
    0x8F, 0x1A, 0x81, 0xA2, 0x2C, 0x56, 0x6D, 0xCD,
    0x4A, 0x33, 0x50, 0xE9, 0xE0, 0x12, 0x5A, 0x43,
@@ -3517 +3517 @@
    0xBE, 0x0A, 0x36, 0x41, 0xC0, 0x8C, 0xE4, 0xAA };
 
-unsigned char table_162[256] = {
+static const unsigned char table_162[256] = {
    0xF7, 0x1B, 0xC0, 0x31, 0x5A, 0x23, 0xEA, 0xE9,
    0xFB, 0x14, 0x6A, 0xE8, 0x04, 0x65, 0x5B, 0x2C,
@@ -3551 +3551 @@
    0x38, 0xCC, 0x58, 0x44, 0xBF, 0x93, 0x5D, 0xC7 };
 
-unsigned char table_163[32] = {
+static const unsigned char table_163[32] = {
    0x1B, 0x14, 0x12, 0x15, 0x11, 0x1D, 0x17, 0x19,
    0x10, 0x09, 0x08, 0x06, 0x1A, 0x16, 0x07, 0x13,
@@ -3557 +3557 @@
    0x04, 0x01, 0x03, 0x0C, 0x0D, 0x1E, 0x02, 0x0F };
 
-unsigned char table_164[32] = {
+static const unsigned char table_164[32] = {
    0x15, 0x00, 0x10, 0x0B, 0x1D, 0x0A, 0x06, 0x1C,
    0x0D, 0x1F, 0x17, 0x0F, 0x03, 0x14, 0x13, 0x12,
@@ -3563 +3563 @@
    0x02, 0x0C, 0x0E, 0x01, 0x07, 0x19, 0x11, 0x05 };
 
-unsigned char table_165[256] = {
+static const unsigned char table_165[256] = {
    0x98, 0xF5, 0x1D, 0xFB, 0x13, 0x20, 0x41, 0xA3,
    0xE3, 0x76, 0x49, 0x7E, 0x60, 0xD8, 0x68, 0x30,
@@ -3597 +3597 @@
    0x1A, 0x26, 0xCC, 0xB1, 0xF9, 0xFA, 0x97, 0xE9 };
 
-unsigned char table_166[256] = {
+static const unsigned char table_166[256] = {
    0xCB, 0xEA, 0x2A, 0x36, 0x6D, 0x93, 0x4E, 0xD5,
    0xBC, 0x6A, 0xD4, 0x68, 0xF7, 0x18, 0xAB, 0x8B,
@@ -3631 +3631 @@
    0x1C, 0xE0, 0x51, 0x16, 0x43, 0x07, 0x0A, 0x3F };
 
-unsigned char table_167[256] = {
+static const unsigned char table_167[256] = {
    0x91, 0xEA, 0x4F, 0x6A, 0x6E, 0x2D, 0x27, 0x22,
    0x44, 0xA5, 0x6D, 0xE3, 0x45, 0x06, 0xE2, 0x87,
@@ -3665 +3665 @@
    0x14, 0x15, 0x25, 0x32, 0x6C, 0x69, 0x1A, 0xCF };
 
-unsigned char table_168[256] = {
+static const unsigned char table_168[256] = {
    0x28, 0xEE, 0xB1, 0xFD, 0xB3, 0xEF, 0x36, 0x8E,
    0x85, 0x5D, 0x1C, 0x53, 0x1E, 0xDA, 0xBA, 0x3C,
@@ -3699 +3699 @@
    0x66, 0x2E, 0x08, 0x32, 0x4C, 0x33, 0x7E, 0xE1 };
 
-unsigned char table_169[256] = {
+static const unsigned char table_169[256] = {
    0xA4, 0x31, 0xA9, 0x3F, 0x13, 0x4D, 0x1B, 0x29,
    0x73, 0x43, 0xF1, 0xE7, 0x9C, 0xC2, 0xF6, 0xCD,
@@ -3733 +3733 @@
    0x6B, 0x0A, 0x59, 0x9E, 0x5E, 0x38, 0x45, 0x80 };
 
-unsigned char table_170[256] = {
+static const unsigned char table_170[256] = {
    0xE3, 0x00, 0x99, 0x03, 0xF6, 0xDD, 0xD1, 0x41,
    0x58, 0x7E, 0xD9, 0x46, 0x04, 0xAF, 0x5C, 0x43,
@@ -3767 +3767 @@
    0x48, 0x30, 0x87, 0x83, 0x12, 0x4D, 0x65, 0xDF };
 
-unsigned char table_171[32] = {
+static const unsigned char table_171[32] = {
    0x07, 0x06, 0x11, 0x08, 0x0C, 0x1F, 0x19, 0x02,
    0x14, 0x04, 0x0D, 0x18, 0x1A, 0x05, 0x17, 0x13,
@@ -3773 +3773 @@
    0x1D, 0x10, 0x00, 0x12, 0x0B, 0x0E, 0x09, 0x0A };
 
-unsigned char table_172[32] = {
+static const unsigned char table_172[32] = {
    0x11, 0x01, 0x1F, 0x06, 0x1A, 0x04, 0x02, 0x09,
    0x05, 0x0D, 0x0B, 0x18, 0x0E, 0x12, 0x1B, 0x17,
@@ -3779 +3779 @@
    0x03, 0x0C, 0x00, 0x10, 0x0A, 0x1C, 0x0F, 0x13 };
 
-unsigned char table_173[32] = {
+static const unsigned char table_173[32] = {
    0x1F, 0x0B, 0x13, 0x00, 0x16, 0x15, 0x14, 0x0A,
    0x1D, 0x05, 0x1E, 0x1A, 0x0F, 0x04, 0x0E, 0x01,
@@ -3785 +3785 @@
    0x03, 0x11, 0x18, 0x10, 0x1C, 0x1B, 0x06, 0x0D };
 
-unsigned char table_174[32] = {
+static const unsigned char table_174[32] = {
    0x02, 0x1B, 0x0C, 0x17, 0x1F, 0x05, 0x15, 0x1E,
    0x16, 0x09, 0x1A, 0x12, 0x0F, 0x1C, 0x18, 0x0A,
@@ -3791 +3791 @@
    0x1D, 0x0E, 0x06, 0x00, 0x01, 0x07, 0x0B, 0x03 };
 
-unsigned char table_175[32] = {
+static const unsigned char table_175[32] = {
    0x00, 0x06, 0x0B, 0x08, 0x0C, 0x04, 0x1A, 0x1C,
    0x05, 0x1E, 0x14, 0x03, 0x0A, 0x18, 0x12, 0x1D,
@@ -3797 +3797 @@
    0x11, 0x19, 0x10, 0x0D, 0x1B, 0x02, 0x01, 0x15 };
 
-unsigned char table_176[32] = {
+static const unsigned char table_176[32] = {
    0x12, 0x03, 0x1A, 0x15, 0x04, 0x19, 0x0B, 0x1B,
    0x17, 0x1E, 0x0D, 0x05, 0x11, 0x14, 0x1C, 0x00,
@@ -3803 +3803 @@
    0x13, 0x09, 0x16, 0x1D, 0x0F, 0x0C, 0x01, 0x1F };
 
-unsigned char table_177[256] = {
+static const unsigned char table_177[256] = {
    0x5E, 0x4D, 0x76, 0xFE, 0xB5, 0x50, 0x83, 0x23,
    0x72, 0xDD, 0x93, 0x08, 0x69, 0xAD, 0xEC, 0x3B,
@@ -3837 +3837 @@
    0x5A, 0xC5, 0xE0, 0x58, 0x41, 0x4E, 0x4A, 0xAF };
 
-unsigned char table_178[256] = {
+static const unsigned char table_178[256] = {
    0x33, 0xBA, 0x98, 0xDA, 0x07, 0x2C, 0x22, 0x9B,
    0xE0, 0xED, 0xB7, 0xA1, 0x93, 0xEB, 0xDC, 0x49,
@@ -3871 +3871 @@
    0x95, 0x9E, 0xBF, 0xEF, 0xF8, 0x45, 0x00, 0xB4 };
 
-unsigned char table_179[256] = {
+static const unsigned char table_179[256] = {
    0x50, 0x3D, 0x41, 0x42, 0x06, 0x5B, 0xD6, 0x34,
    0x9D, 0x3C, 0x7B, 0x14, 0xE2, 0x9B, 0x80, 0x15,
@@ -3905 +3905 @@
    0x2A, 0x04, 0x18, 0xA5, 0xA2, 0x6E, 0x07, 0xE3 };
 
-unsigned char table_180[256] = {
+static const unsigned char table_180[256] = {
    0xDA, 0xCC, 0x72, 0xA6, 0xE7, 0x07, 0xFD, 0x25,
    0x92, 0x39, 0x49, 0x02, 0xD6, 0x09, 0xA8, 0x65,
@@ -3939 +3939 @@
    0x62, 0x4F, 0xCF, 0xB2, 0xC2, 0x59, 0xDB, 0x67 };
 
-unsigned char table_181[256] = {
+static const unsigned char table_181[256] = {
    0x2B, 0xED, 0x14, 0x05, 0x80, 0xCC, 0x5A, 0xF8,
    0x43, 0xB7, 0x86, 0xC6, 0xEE, 0xA6, 0xD7, 0xD6,
@@ -3973 +3973 @@
    0x32, 0x24, 0x7D, 0x9B, 0xD2, 0x83, 0x35, 0xCD };
 
-unsigned char table_182[256] = {
+static const unsigned char table_182[256] = {
    0x06, 0x7F, 0x66, 0xB5, 0xBA, 0x1E, 0xFD, 0x51,
    0x81, 0x8D, 0x28, 0xA3, 0x15, 0x37, 0xDC, 0x58,
@@ -4007 +4007 @@
    0x7B, 0x17, 0x0B, 0x0A, 0x41, 0x03, 0xD4, 0x4B };
 
-unsigned char table_183[32] = {
+static const unsigned char table_183[32] = {
    0x1E, 0x1B, 0x11, 0x07, 0x08, 0x06, 0x18, 0x17,
    0x0D, 0x0F, 0x12, 0x03, 0x1D, 0x04, 0x0A, 0x1A,
@@ -4013 +4013 @@
    0x16, 0x05, 0x1C, 0x0E, 0x02, 0x00, 0x09, 0x15 };
 
-unsigned char table_184[32] = {
+static const unsigned char table_184[32] = {
    0x0F, 0x1D, 0x17, 0x16, 0x0D, 0x05, 0x13, 0x1F,
    0x1B, 0x09, 0x1C, 0x1E, 0x15, 0x01, 0x06, 0x08,
@@ -4019 +4019 @@
    0x18, 0x0E, 0x03, 0x11, 0x12, 0x14, 0x19, 0x00 };
 
-unsigned char table_185[256] = {
+static const unsigned char table_185[256] = {
    0xA5, 0xEE, 0x2E, 0x28, 0xA7, 0xAC, 0xD9, 0xB2,
    0x6E, 0x04, 0xB4, 0x03, 0xE8, 0x92, 0x5F, 0x4D,
@@ -4053 +4053 @@
    0x2B, 0xC5, 0x98, 0x18, 0x66, 0x15, 0x9C, 0xBC };
 
-unsigned char table_186[256] = {
+static const unsigned char table_186[256] = {
    0xB7, 0xFA, 0x03, 0x7C, 0x76, 0x43, 0xA7, 0x15,
    0x4B, 0x4F, 0x04, 0xAA, 0x4E, 0xD2, 0x52, 0xC8,
@@ -4087 +4087 @@
    0x11, 0x3B, 0x94, 0xE8, 0x7D, 0x7B, 0xD9, 0x5A };
 
-unsigned char table_187[32] = {
+static const unsigned char table_187[32] = {
    0x0F, 0x04, 0x1D, 0x1B, 0x15, 0x10, 0x01, 0x0B,
    0x00, 0x17, 0x13, 0x07, 0x1E, 0x1F, 0x08, 0x0A,
@@ -4093 +4093 @@
    0x0E, 0x18, 0x03, 0x1C, 0x12, 0x11, 0x0D, 0x02 };
 
-struct yahoo_fn yahoo_fntable[5][96] = 
+static const struct yahoo_fn yahoo_fntable[5][96] = 
    {{{ IDENT, 0, 0 },
      { IDENT, 0, 0 },
@@ -4582 +4582 @@
 int yahoo_xfrm( int table, int depth, int seed )
 {
-   struct yahoo_fn *xfrm;
+   const struct yahoo_fn *xfrm;
    int i, j, z;
    unsigned int n = seed;

protocols/yahoo/yahoo_util.c

@@ -50 +50 @@
 
         return new_string;
-}
-
-char * y_str_to_utf8(const char *in)
-{
-        unsigned int n, i = 0;
-        char *result = NULL;
-
-        if(in == NULL || *in == '\0')
-                return "";
-        
-        result = y_new(char, strlen(in) * 2 + 1);
-
-        /* convert a string to UTF-8 Format */
-        for (n = 0; n < strlen(in); n++) {
-                unsigned char c = (unsigned char)in[n];
-
-                if (c < 128) {
-                        result[i++] = (char) c;
-                } else {
-                        result[i++] = (char) ((c >> 6) | 192);
-                        result[i++] = (char) ((c & 63) | 128);
-                }
-        }
-        result[i] = '\0';
-        return result;
-}
-
-char * y_utf8_to_str(const char *in)
-{
-        int i = 0;
-        unsigned int n;
-        char *result = NULL;
-
-        if(in == NULL || *in == '\0')
-                return "";
-        
-        result = y_new(char, strlen(in) + 1);
-
-        /* convert a string from UTF-8 Format */
-        for (n = 0; n < strlen(in); n++) {
-                unsigned char c = in[n];
-
-                if (c < 128) {
-                        result[i++] = (char) c;
-                } else {
-                        result[i++] = (c << 6) | (in[++n] & 63);
-                }
-        }
-        result[i] = '\0';
-        return result;
 }
 

sock.h

@@ +1 @@
+#include <errno.h>
+#include <fcntl.h>
+
+/* To cut down on the ifdef stuff a little bit in other places */
+#ifdef IPV6
+#define AF_INETx AF_INET6
+#else
+#define AF_INETx AF_INET
+#endif
+
 #ifndef _WIN32
 #include <unistd.h>

storage_text.c

@@ -79 +79 @@
         user_t *ru = user_find( irc, ROOT_NICK );
         
-        if( irc->status == USTATUS_IDENTIFIED )
+        if( irc->status >= USTATUS_IDENTIFIED )
                 return( 1 );
         

unix.c

@@ -32 +32 @@
 #include <unistd.h>
 #include <sys/time.h>
+#include <sys/wait.h>
 
 global_t global;        /* Against global namespace pollution */
@@ -46 +47 @@
         global.loop = g_main_new( FALSE );
         
-        log_init( );
+        log_init();
 
         nogaim_init();
@@ -76 +77 @@
                 log_message( LOGLVL_INFO, "Bitlbee %s starting in daemon mode.", BITLBEE_VERSION );
         }
+        else if( global.conf->runmode == RUNMODE_FORKDAEMON )
+        {
+                i = bitlbee_daemon_init();
+                log_message( LOGLVL_INFO, "Bitlbee %s starting in forking daemon mode.", BITLBEE_VERSION );
+        }
         if( i != 0 )
                 return( i );
 
-        global.storage = storage_init( global.conf->primary_storage, 
-                                                                   global.conf->migrate_storage );
+        global.storage = storage_init( global.conf->primary_storage, global.conf->migrate_storage );
         if ( global.storage == NULL) {
                 log_message( LOGLVL_ERROR, "Unable to load storage backend '%s'", global.conf->primary_storage );
@@ -90 +95 @@
         memset( &sig, 0, sizeof( sig ) );
         sig.sa_handler = sighandler;
+        sigaction( SIGCHLD, &sig, &old );
         sigaction( SIGPIPE, &sig, &old );
         sig.sa_flags = SA_RESETHAND;
@@ -113 +119 @@
 static void sighandler( int signal )
 {
-        /* FIXME: In fact, calling log_message() here can be dangerous. But well, let's take the risk for now. */
+        /* FIXME: Calling log_message() here is not a very good idea! */
         
         if( signal == SIGTERM )
@@ -139 +145 @@
                 }
         }
+        else if( signal == SIGCHLD )
+        {
+                pid_t pid;
+                int st;
+                
+                while( ( pid = waitpid( 0, &st, WNOHANG ) ) > 0 )
+                {
+                        if( WIFSIGNALED( st ) )
+                                log_message( LOGLVL_INFO, "Client %d terminated normally. (status = %d)", pid, WEXITSTATUS( st ) );
+                        else if( WIFEXITED( st ) )
+                                log_message( LOGLVL_INFO, "Client %d killed by signal %d.", pid, WTERMSIG( st ) );
+                }
+        }
         else if( signal != SIGPIPE )
         {

url.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2001-2004 Wilmer van der Gaast and others                *
+  * Copyright 2001-2005 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -30 +30 @@
 {
         char s[MAX_STRING];
-        char *i, *j;
+        char *i;
         
         /* protocol://                                                  */
@@ -40 +40 @@
         else
         {
-                if( g_strncasecmp( set_url, "http", i - set_url ) == 0 )
+                if( g_strncasecmp( set_url, "https", i - set_url ) == 0 )
+                        url->proto = PROTO_HTTPS;
+                else if( g_strncasecmp( set_url, "http", i - set_url ) == 0 )
                         url->proto = PROTO_HTTP;
                 else if( g_strncasecmp( set_url, "socks4", i - set_url ) == 0 )
@@ -56 +58 @@
         if( ( i = strchr( s, '/' ) ) == NULL )
         {
-                strcpy( url->dir, "/" );
+                strcpy( url->file, "/" );
         }
         else
         {
+                strncpy( url->file, i, MAX_STRING );
                 *i = 0;
-                g_snprintf( url->dir, MAX_STRING, "/%s", i + 1 );
-                if( url->proto == PROTO_HTTP )
-                        http_encode( url->dir );
         }
         strncpy( url->host, s, MAX_STRING );
-        j = strchr( url->dir, '?' );
-        if( j != NULL )
-                *j = 0;
-        i = strrchr( url->dir, '/' );
-        *i = 0;
-        if( j != NULL )
-                *j = '?';
-        if( i == NULL )
-        {
-                strcpy( url->file, url->dir );
-                strcpy( url->dir, "/" );
-        }
-        else
-        {
-                strcpy( url->file, i + 1 );
-                strcat( url->dir, "/" );
-        }
         
         /* Check for username in host field                             */
@@ -96 +79 @@
         else
         {
-                if( url->proto == PROTO_FTP )
-                {
-                        strcpy( url->user, "anonymous" );
-                        strcpy( url->pass, "-p.artmaps@lintux.cx" );
-                }
-                else
-                {
-                        *url->user = *url->pass = 0;
-                }
+                *url->user = *url->pass = 0;
         }
         
@@ -117 +92 @@
         {
                 *i = 0;
-                sscanf( i + 1, "%i", &url->port );
+                sscanf( i + 1, "%d", &url->port );
         }
-        /* Take default port numbers from /etc/services                 */
         else
         {
                 if( url->proto == PROTO_HTTP )
-                        url->port = 8080;
+                        url->port = 80;
+                else if( url->proto == PROTO_HTTPS )
+                        url->port = 443;
                 else if( url->proto == PROTO_SOCKS4 || url->proto == PROTO_SOCKS4 )
                         url->port = 1080;

url.h

@@ -26 +26 @@
 #include "bitlbee.h"
 
-#define PROTO_FTP               1
 #define PROTO_HTTP              2
+#define PROTO_HTTPS             5
 #define PROTO_SOCKS4    3
 #define PROTO_SOCKS5    4
@@ -37 +37 @@
         int port;
         char host[MAX_STRING];
-        char dir[MAX_STRING];
         char file[MAX_STRING];
         char user[MAX_STRING];