Changeset a02f34f for dcc.c

Timestamp:

2008-08-11T23:07:12Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

5d550c5

Parents:

66be784

Message:

Added conf entries and lib/ftutil.[ch].

ft_listen = <IP-A>:<Port-A>;<IP-B>:<Port-B> to specify listening addresses for
the bitlbee<->client connection and the bitlbee<->IM peer connection,
respectively.

ft_max_size should be obvious. ft_max_kbps should limit the kilobits per second
per transfer (not implemented yet).

File:

• dcc.c (modified) (6 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
+#include "lib/ftutil.h"
 
 /* 
@@ -80 +67 @@
 static void dcc_close( file_transfer_t *file );
 gboolean dccs_send_proto( gpointer data, gint fd, b_input_condition cond );
-gboolean dcc_listen( dcc_file_transfer_t *df, struct sockaddr_storage **saddr_ptr );
 int dccs_send_request( struct dcc_file_transfer *df, char *user_nick, struct sockaddr_storage *saddr );
 gboolean dccs_recv_start( file_transfer_t *ft );
@@ -86 +72 @@
 gboolean dccs_recv_write_request( file_transfer_t *ft );
 gboolean dcc_progress( gpointer data, gint fd, b_input_condition cond );
+gboolean dcc_abort( dcc_file_transfer_t *df, char *reason, ... );
 
 /* As defined in ft.h */
@@ -143 +130 @@
         file_transfer_t *file;
         dcc_file_transfer_t *df;
-        struct sockaddr_storage *saddr;
-
-        if( file_size > global.conf->max_filetransfer_size )
+        struct sockaddr_storage saddr;
+        char *errmsg;
+        char host[INET6_ADDRSTRLEN];
+        char port[6];
+
+        if( file_size > global.conf->ft_max_size )
                 return NULL;
         
@@ -153 +143 @@
 
         /* listen and request */
-        if( !dcc_listen( df, &saddr ) ||
-            !dccs_send_request( df, user_nick, saddr ) )
+
+        if( ( df->fd = ft_listen( &saddr, host, port, TRUE, &errmsg ) ) == -1 ) {
+                dcc_abort( df, "Failed to listen locally, check your ft_listen setting in bitlbee.conf: %s", errmsg );
                 return NULL;
-
-        g_free( saddr );
+        }
+
+        file->status = FT_STATUS_LISTENING;
+
+        if( !dccs_send_request( df, user_nick, &saddr ) )
+                return NULL;
 
         /* watch */
@@ -258 +253 @@
 
         g_free( cmd );
-
-        return TRUE;
-}
-
-/*
- * Creates a listening socket and returns it in saddr_ptr.
- */
-gboolean dcc_listen( dcc_file_transfer_t *df, struct sockaddr_storage **saddr_ptr )
-{
-        file_transfer_t *file = df->ft;
-        struct sockaddr_storage *saddr;
-        int fd,gret;
-        char hostname[ HOST_NAME_MAX + 1 ];
-        struct addrinfo hints, *rp;
-        socklen_t ssize = sizeof( struct sockaddr_storage );
-
-        /* won't be long till someone asks for this to be configurable :) */
-
-        ASSERTSOCKOP( gethostname( hostname, sizeof( hostname ) ), "gethostname()" );
-
-        memset( &hints, 0, sizeof( struct addrinfo ) );
-        hints.ai_socktype = SOCK_STREAM;
-        hints.ai_flags = AI_NUMERICSERV;
-
-        if ( ( gret = getaddrinfo( hostname, "0", &hints, &rp ) != 0 ) )
-                return dcc_abort( df, "getaddrinfo(): %s", gai_strerror( gret ) );
-
-        saddr = g_new( struct sockaddr_storage, 1 );
-
-        *saddr_ptr = saddr;
-
-        memcpy( saddr, rp->ai_addr, rp->ai_addrlen );
-
-        ASSERTSOCKOP( fd = df->fd = socket( saddr->ss_family, SOCK_STREAM, 0 ), "Opening socket" );
-
-        ASSERTSOCKOP( bind( fd, ( struct sockaddr *)saddr, rp->ai_addrlen ), "Binding socket" );
-        
-        freeaddrinfo( rp );
-
-        ASSERTSOCKOP( getsockname( fd, ( struct sockaddr *)saddr, &ssize ), "Getting socket name" );
-
-        ASSERTSOCKOP( listen( fd, 1 ), "Making socket listen" );
-
-        file->status = FT_STATUS_LISTENING;
 
         return TRUE;