Changeset f1f7b5e

Timestamp:

2010-07-24T22:50:23Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

8b01217

Parents:

2945c6f

Message:

Take the local address from the IM/IRC connection when setting up a listening
socket for file transfers.

Files:

• dcc.c (modified) (1 diff)
• lib/ftutil.c (modified) (3 diffs)
• lib/ftutil.h (modified) (1 diff)
• protocols/jabber/s5bytestream.c (modified) (1 diff)

dcc.c

@@ -104 +104 @@
         /* listen and request */
 
-        if( ( df->fd = ft_listen( &saddr, host, port, TRUE, &errmsg ) ) == -1 )
+        if( ( df->fd = ft_listen( &saddr, host, port, irc->fd, TRUE, &errmsg ) ) == -1 )
         {
                 dcc_abort( df, "Failed to listen locally, check your ft_listen setting in bitlbee.conf: %s", errmsg );

lib/ftutil.c

@@ -36 +36 @@
  * Creates a listening socket and returns it in saddr_ptr.
  */
-int ft_listen( struct sockaddr_storage *saddr_ptr, char *host, char *port, int for_bitlbee_client, char **errptr )
+int ft_listen( struct sockaddr_storage *saddr_ptr, char *host, char *port, int copy_fd, int for_bitlbee_client, char **errptr )
 {
         int fd, gret, saddrlen;
@@ -83 +83 @@
                 }
         }
+        else if( copy_fd >= 0 && getsockname( copy_fd, (struct sockaddr*) &saddrs, &ssize ) == 0 &&
+                 ( saddrs.ss_family == AF_INET || saddrs.ss_family == AF_INET6 ) &&
+                 getnameinfo( (struct sockaddr*) &saddrs, ssize, host, HOST_NAME_MAX,
+                              NULL, 0, NI_NUMERICHOST ) == 0 )
+        {
+                /* We just took our local address on copy_fd, which is likely to be a
+                   sensible address from which we can do a file transfer now - the
+                   most sensible we can get easily. */
+        }
         else
         {
@@ -117 +126 @@
         }
 
+        ssize = sizeof( struct sockaddr_storage );
         ASSERTSOCKOP( getsockname( fd, ( struct sockaddr *)saddr, &ssize ), "Getting socket name" );
 

lib/ftutil.h

@@ -38 +38 @@
 /* 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 );
+int ft_listen( struct sockaddr_storage *saddr_ptr, char *host, char *port, int copy_fd, int for_bitlbee_client, char **errptr );

protocols/jabber/s5bytestream.c

@@ -911 +911 @@
                 
                 if( strcmp( proxy, "<local>" ) == 0 ) {
-                        if( ( tf->fd = ft_listen( &tf->saddr, host, port, FALSE, &errmsg ) ) != -1 ) {
+                        if( ( tf->fd = ft_listen( &tf->saddr, host, port, jd->fd, FALSE, &errmsg ) ) != -1 ) {
                                 sh = g_new0( jabber_streamhost_t, 1 );
                                 sh->jid = g_strdup( tf->ini_jid );