Changes in / [8efa2f4:7989fcf3]

Files:

• crypting.c (modified) (3 diffs)
• crypting.h (modified) (1 diff)
• irc.c (modified) (2 diffs)
• nick.c (modified) (6 diffs)
• nick.h (modified) (1 diff)
• protocols/proxy.c (modified) (7 diffs)
• protocols/proxy.h (modified) (1 diff)

crypting.c

@@ -46 +46 @@
 } irc_t;
 
+#define set_add( a, b, c, d )
+#define set_find( a, b ) NULL
+
 #include "md5.h"
 #include "crypting.h"
@@ -66 +69 @@
 void setpassnc (irc_t *irc, const char *pass) 
 {
+        if (!set_find (irc, "password"))
+                set_add (irc, "password", NULL, passchange);
+        
         if (irc->password) g_free (irc->password);
         
@@ -76 +82 @@
 }
 
-int setpass (irc_t *irc, const char *pass, const char* md5sum) 
-{
+char *passchange (irc_t *irc, void *set, char *value) {
+        setpassnc (irc, value);
+        return (NULL);
+}
+
+int setpass (irc_t *irc, const char *pass, char* md5sum) {
         md5_state_t md5state;
         md5_byte_t digest[16];

crypting.h

@@ -25 +25 @@
 
 void setpassnc (irc_t *irc, const char *pass); /* USE WITH CAUTION! */
-int setpass (irc_t *irc, const char *pass, const char* md5sum);
+char *passchange (irc_t *irc, void *set, char *value);
+int setpass (irc_t *irc, const char *pass, char* md5sum);
 char *hashpass (irc_t *irc);
 char *obfucrypt (irc_t *irc, char *line);

irc.c

@@ -31 +31 @@
 
 GSList *irc_connection_list = NULL;
-
-char *passchange (irc_t *irc, void *set, char *value) 
-{
-        setpassnc (irc, value);
-        return (NULL);
-}
 
 irc_t *irc_new( int fd )
@@ -135 +129 @@
         set_add( irc, "to_char", ": ", set_eval_to_char );
         set_add( irc, "typing_notice", "false", set_eval_bool );
-        set_add( irc, "password", NULL, passchange);
         
         conf_loaddefaults( irc );

nick.c

@@ -27 +27 @@
 #include "bitlbee.h"
 
-void nick_set( irc_t *irc, const char *handle, int proto, const char *nick )
+void nick_set( irc_t *irc, char *handle, int proto, char *nick )
 {
         nick_t *m = NULL, *n = irc->nicks;
@@ -56 +56 @@
 }
 
-char *nick_get( irc_t *irc, const char *handle, int proto, const char *realname )
+char *nick_get( irc_t *irc, char *handle, int proto, const char *realname )
 {
         static char nick[MAX_NICK_LENGTH+1];
@@ -129 +129 @@
 }
 
-void nick_del( irc_t *irc, const char *nick )
+void nick_del( irc_t *irc, char *nick )
 {
         nick_t *l = NULL, *n = irc->nicks;
@@ -176 +176 @@
 }
 
-int nick_ok( const char *nick )
-{
-        const char *s;
+int nick_ok( char *nick )
+{
+        char *s;
         
         /* Empty/long nicks are not allowed */
@@ -237 +237 @@
 }
 
-int nick_cmp( const char *a, const char *b )
+int nick_cmp( char *a, char *b )
 {
         char aa[1024] = "", bb[1024] = "";
@@ -253 +253 @@
 }
 
-char *nick_dup( const char *nick )
-{
-        return g_strndup( nick, MAX_NICK_LENGTH );
-}
+char *nick_dup( char *nick )
+{
+        char *cp;
+        
+        cp = g_new0 ( char, MAX_NICK_LENGTH + 1 );
+        strncpy( cp, nick, MAX_NICK_LENGTH );
+        
+        return( cp );
+}

nick.h

@@ -32 +32 @@
 } nick_t;
 
-void nick_set( irc_t *irc, const char *handle, int proto, const char *nick );
-char *nick_get( irc_t *irc, const char *handle, int proto, const char *realname );
-void nick_del( irc_t *irc, const char *nick );
+void nick_set( irc_t *irc, char *handle, int proto, char *nick );
+char *nick_get( irc_t *irc, char *handle, int proto, const char *realname );
+void nick_del( irc_t *irc, char *nick );
 void nick_strip( char *nick );
 
-int nick_ok( const char *nick );
+int nick_ok( char *nick );
 int nick_lc( char *nick );
 int nick_uc( char *nick );
-int nick_cmp( const char *a, const char *b );
-char *nick_dup( const char *nick );
+int nick_cmp( char *a, char *b );
+char *nick_dup( char *nick );

protocols/proxy.c

@@ -50 +50 @@
 #define GAIM_ERR_COND   (G_IO_HUP | G_IO_ERR | G_IO_NVAL)
 
+/*FIXME*                
+        #ifndef _WIN32
+                if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
+                        closesocket(fd);
+                        g_free(phb);
+                        return -1;
+                }
+                fcntl(fd, F_SETFL, 0);
+#endif*/
+
 char proxyhost[128] = "";
 int proxyport = 0;
@@ -73 +83 @@
 
 
-static struct sockaddr_in *gaim_gethostbyname(const char *host, int port)
+static struct sockaddr_in *gaim_gethostbyname(char *host, int port)
 {
         static struct sockaddr_in sin;
@@ -144 +154 @@
 }
 
-static int proxy_connect_none(const char *host, unsigned short port, struct PHB *phb)
+static int proxy_connect_none(char *host, unsigned short port, struct PHB *phb)
 {
         struct sockaddr_in *sin;
@@ -271 +281 @@
 }
 
-static int proxy_connect_http(const char *host, unsigned short port, struct PHB *phb)
+static int proxy_connect_http(char *host, unsigned short port, struct PHB *phb)
 {
         phb->host = g_strdup(host);
@@ -355 +365 @@
 }
 
-static int proxy_connect_socks4(const char *host, unsigned short port, struct PHB *phb)
+static int proxy_connect_socks4(char *host, unsigned short port, struct PHB *phb)
 {
         phb->host = g_strdup(host);
@@ -537 +547 @@
 }
 
-static int proxy_connect_socks5(const char *host, unsigned short port, struct PHB *phb)
+static int proxy_connect_socks5(char *host, unsigned short port, struct PHB *phb)
 {
         phb->host = g_strdup(host);
@@ -578 +588 @@
 }
 
-int proxy_connect(const char *host, int port, GaimInputFunction func, gpointer data)
+int proxy_connect(char *host, int port, GaimInputFunction func, gpointer data)
 {
         struct PHB *phb;

protocols/proxy.h

@@ -56 +56 @@
 G_MODULE_EXPORT void gaim_input_remove(gint);
 
-G_MODULE_EXPORT int proxy_connect(const char *host, int port, GaimInputFunction func, gpointer data);
+G_MODULE_EXPORT int proxy_connect(char *host, int port, GaimInputFunction func, gpointer data);
 
 #endif /* _PROXY_H_ */