Changeset 4358b10

Timestamp:

2008-05-04T13:32:15Z (17 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

29c1456

Parents:

0cab388

Message:

ulibc support, fixes "Invalid SOCKS5 Connect message" problem

Files:

• dcc.c (modified) (1 diff)
• irc.c (modified) (1 diff)
• protocols/jabber/iq.c (modified) (3 diffs)
• protocols/jabber/s5bytestream.c (modified) (2 diffs)

dcc.c

@@ -29 +29 @@
 #include <netinet/tcp.h>
 #include <regex.h>
+
+/* Some ifdefs for ulibc (Thanks to Whoopie) */
+#ifndef HOST_NAME_MAX
+#include <sys/param.h>
+#ifdef MAXHOSTNAMELEN
+#define HOST_NAME_MAX MAXHOSTNAMELEN
+#else
+#define HOST_NAME_MAX 255
+#endif
+#endif
+
+#ifndef AI_NUMERICSERV
+#define AI_NUMERICSERV 0x0400   /* Don't use name resolution.  */
+#endif
 
 /* 

irc.c

@@ -29 +29 @@
 #include "ipc.h"
 #include "dcc.h"
-
-#include <regex.h>
-#include <netinet/in.h>
 
 static gboolean irc_userping( gpointer _irc, int fd, b_input_condition cond );

protocols/jabber/iq.c

@@ -612 +612 @@
         {
                 /* Who cares about the unknown... */
-                imcb_log( ic, "Couldnt find the man: %s", bare_jid);
+                imcb_log( ic, "Couldn't find buddy: %s", bare_jid);
                 return 0;
         }
@@ -626 +626 @@
                 imcb_log( ic, "WARNING: Couldn't generate feature query" );
                 xt_free_node( node );
+                return 0;
         }
 
@@ -648 +649 @@
         {
                 /* Who cares about the unknown... */
-                imcb_log( ic, "Couldnt find the man: %s", xt_find_attr( node, "from"));
+                imcb_log( ic, "Couldn't find buddy: %s", xt_find_attr( node, "from"));
                 return 0;
         }

protocols/jabber/s5bytestream.c

@@ -26 +26 @@
 #include <poll.h>
 
+/* Some ifdefs for ulibc (Thanks to Whoopie) */
+#ifndef HOST_NAME_MAX
+#include <sys/param.h>
+#ifdef MAXHOSTNAMELEN
+#define HOST_NAME_MAX MAXHOSTNAMELEN
+#else
+#define HOST_NAME_MAX 255
+#endif
+#endif
+
 struct bs_transfer {
 
@@ -1048 +1058 @@
                         struct socks5_message socks5_connect;
                         int msgsize = sizeof( struct socks5_message );
-
-                        if( !jabber_bs_peek( bt, &socks5_connect, msgsize ) )
+                        int ret;
+
+                        if( !( ret = jabber_bs_peek( bt, &socks5_connect, msgsize ) ) )
                                 return FALSE;
+
+                        if( ret < msgsize )
+                                return TRUE;
 
                         if( !( socks5_connect.ver == 5) ||