Changeset 60e4df3

Timestamp:

2010-03-17T23:23:27Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c1a3c27

Parents:

e8c8d00

Message:

Small cleanup. The max_packet_size variable doesn't seem to be read
anywhere, and reworked string handling in ft_listen() a little bit.

Files:

• dcc.c (modified) (5 diffs)
• lib/ftutil.c (modified) (6 diffs)
• lib/ftutil.h (modified) (1 diff)
• protocols/jabber/s5bytestream.c (modified) (1 diff)
• protocols/msn/invitation.c (modified) (1 diff)

dcc.c

@@ -61 +61 @@
  */
 unsigned int receivedchunks=0, receiveddata=0;
-
-int max_packet_size = 0;
 
 static void dcc_finish( file_transfer_t *file );
@@ -133 +131 @@
         struct sockaddr_storage saddr;
         char *errmsg;
-        char host[INET6_ADDRSTRLEN];
+        char host[HOST_NAME_MAX];
         char port[6];
 
@@ -290 +288 @@
 
 /*
- * fills max_packet_size with twice the TCP maximum segment size
- */
-gboolean  dcc_check_maxseg( dcc_file_transfer_t *df, int fd )
-{
-        /* 
-         * use twice the maximum segment size as a maximum for calls to send().
-         */
-        if( max_packet_size == 0 )
-        {
-                unsigned int mpslen = sizeof( max_packet_size );
-                if( getsockopt( fd, IPPROTO_TCP, TCP_MAXSEG, &max_packet_size, &mpslen ) )
-                        return dcc_abort( df, "getsockopt() failed" );
-                max_packet_size *= 2;
-        }
-        return TRUE;
-}
-
-/*
  * After setup, the transfer itself is handled entirely by this function.
  * There are basically four things to handle: connect, receive, send, and error.
@@ -334 +314 @@
                 file->status = FT_STATUS_TRANSFERRING;
                 sock_make_nonblocking( fd );
-
-                if ( !dcc_check_maxseg( df, fd ) )
-                        return FALSE;
 
                 /* IM protocol callback */
@@ -446 +423 @@
         {
                 ft->status = FT_STATUS_TRANSFERRING;
-                if ( !dcc_check_maxseg( df, fd ) )
-                        return FALSE;
 
                 //df->watch_in = b_input_add( df->fd, GAIM_INPUT_READ, dccs_recv_proto, df );

lib/ftutil.c

@@ -28 +28 @@
 #include "lib/ftutil.h"
 
-/* Some ifdefs for ulibc and apparently also BSD (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
-
 #define ASSERTSOCKOP(op, msg) \
         if( (op) == -1 ) {\
-                sprintf( errmsg , msg ": %s", strerror( errno ) ); \
+                g_snprintf( errmsg, sizeof( errmsg ), msg ": %s", strerror( errno ) ); \
                 return -1; }
 
@@ -46 +36 @@
  * Creates a listening socket and returns it in saddr_ptr.
  */
-int ft_listen( struct sockaddr_storage *saddr_ptr, char *hostp, char *port, int for_bitlbee_client, char **errptr )
+int ft_listen( struct sockaddr_storage *saddr_ptr, char *host, char *port, int for_bitlbee_client, char **errptr )
 {
-        int fd,gret,saddrlen;
+        int fd, gret, saddrlen;
         struct addrinfo hints, *rp;
         socklen_t ssize = sizeof( struct sockaddr_storage );
         struct sockaddr_storage saddrs, *saddr = &saddrs;
         static char errmsg[1024];
-        char host[ HOST_NAME_MAX + 1 ];
         char *ftlisten = global.conf->ft_listen;
 
-        *errptr = errmsg;
+        if( errptr )
+                *errptr = errmsg;
 
-        sprintf( port, "0" );
+        strcpy( port, "0" );
 
         /* Format is <IP-A>[:<Port-A>];<IP-B>[:<Port-B>] where
@@ -64 +54 @@
          * and B is for connections with IM peers.
          */
-        if( ftlisten ) {
+        if( ftlisten )
+        {
                 char *scolon = strchr( ftlisten, ';' );
                 char *colon;
 
-                if( scolon ) {
-                        if( for_bitlbee_client ) {
+                if( scolon )
+                {
+                        if( for_bitlbee_client )
+                        {
                                 *scolon = '\0';
-                                sprintf( host, ftlisten );
+                                strncpy( host, ftlisten, HOST_NAME_MAX );
                                 *scolon = ';';
-                        } else {
-                                sprintf( host, scolon + 1 );
                         }
-                } else {
-                        sprintf( host, ftlisten );
+                        else
+                        {
+                                strncpy( host, scolon + 1, HOST_NAME_MAX );
+                        }
+                }
+                else
+                {
+                        strncpy( host, ftlisten, HOST_NAME_MAX );
                 }
 
-                if( ( colon = strchr( host, ':' ) ) ) {
+                if( ( colon = strchr( host, ':' ) ) )
+                {
                         *colon = '\0';
-                        sprintf( port, colon + 1 );
+                        strncpy( port, colon + 1, 5 );
                 }
-        } else {
+        }
+        else
+        {
                 ASSERTSOCKOP( gethostname( host, HOST_NAME_MAX + 1 ), "gethostname()" );
         }
@@ -92 +92 @@
         hints.ai_flags = AI_NUMERICSERV;
 
-        if ( ( gret = getaddrinfo( host, port, &hints, &rp ) ) != 0 ) {
+        if ( ( gret = getaddrinfo( host, port, &hints, &rp ) ) != 0 )
+        {
                 sprintf( errmsg, "getaddrinfo() failed: %s", gai_strerror( gret ) );
                 return -1;
@@ -104 +105 @@
 
         ASSERTSOCKOP( fd = socket( saddr->ss_family, SOCK_STREAM, 0 ), "Opening socket" );
-
         ASSERTSOCKOP( bind( fd, ( struct sockaddr *)saddr, saddrlen ), "Binding socket" );
-        
         ASSERTSOCKOP( listen( fd, 1 ), "Making socket listen" );
 
         if ( !inet_ntop( saddr->ss_family, saddr->ss_family == AF_INET ?
-                        ( void * )&( ( struct sockaddr_in * ) saddr )->sin_addr.s_addr : ( void * )&( ( struct sockaddr_in6 * ) saddr )->sin6_addr.s6_addr
-                        , host, INET6_ADDRSTRLEN ) ) {
-                sprintf( errmsg, "inet_ntop failed on listening socket" );
+                        ( void * )&( ( struct sockaddr_in * ) saddr )->sin_addr.s_addr :
+                        ( void * )&( ( struct sockaddr_in6 * ) saddr )->sin6_addr.s6_addr,
+                        host, HOST_NAME_MAX ) )
+        {
+                strcpy( errmsg, "inet_ntop failed on listening socket" );
                 return -1;
         }
@@ -119 +120 @@
 
         if( saddr->ss_family == AF_INET )
-                sprintf( port, "%d", ntohs( ( ( struct sockaddr_in *) saddr )->sin_port ) );
+                g_snprintf( port, 6, "%d", ntohs( ( (struct sockaddr_in *) saddr )->sin_port ) );
         else
-                sprintf( port, "%d", ntohs( ( ( struct sockaddr_in6 *) saddr )->sin6_port ) );
+                g_snprintf( port, 6, "%d", ntohs( ( (struct sockaddr_in6 *) saddr )->sin6_port ) );
 
         if( saddr_ptr )
                 memcpy( saddr_ptr, saddr, saddrlen );
 
-        strcpy( hostp, host );
-
+        /* I hate static-length strings.. */
+        host[HOST_NAME_MAX] = '\0';
+        port[5] = '\0';
+        
         return fd;
 }

lib/ftutil.h

@@ -26 +26 @@
 #endif
 
+/* Some ifdefs for ulibc and apparently also BSD (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
+
+/* This function should be used with care. host should be AT LEAST a
+   char[HOST_NAME_MAX+1] and port AT LEAST a char[6]. */
 int ft_listen( struct sockaddr_storage *saddr_ptr, char *host, char *port, int for_bitlbee_client, char **errptr );

protocols/jabber/s5bytestream.c

@@ -890 +890 @@
         char *proxy, *next, *errmsg = NULL;
         char port[6];
-        char host[INET6_ADDRSTRLEN];
+        char host[HOST_NAME_MAX+1];
         jabber_streamhost_t *sh, *sh2;
         GSList *streamhosts = jd->streamhosts;

protocols/msn/invitation.c

@@ -219 +219 @@
         char buf[1024];
         unsigned int acookie = time ( NULL );
-        char host[INET6_ADDRSTRLEN];
+        char host[HOST_NAME_MAX+1];
         char port[6];
         char *errmsg;