diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-07-25 00:50:23 +0200 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-07-25 00:50:23 +0200 |
| commit | f1f7b5e5d7f99419fc9b1a3d3ee3bce6e8602b10 (patch) | |
| tree | 9dba333dc27dcab877420e945c54067155ae973b /lib | |
| parent | 2945c6ff5d1848f6d8e51a0d804a2d769e6894a7 (diff) | |
Take the local address from the IM/IRC connection when setting up a listening
socket for file transfers.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ftutil.c | 12 | ||||
| -rw-r--r-- | lib/ftutil.h | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/lib/ftutil.c b/lib/ftutil.c index d59dd4e0..71c09b50 100644 --- a/lib/ftutil.c +++ b/lib/ftutil.c @@ -35,7 +35,7 @@ /* * 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; struct addrinfo hints, *rp; @@ -82,6 +82,15 @@ int ft_listen( struct sockaddr_storage *saddr_ptr, char *host, char *port, int f strncpy( port, colon + 1, 5 ); } } + 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 { ASSERTSOCKOP( gethostname( host, HOST_NAME_MAX + 1 ), "gethostname()" ); @@ -116,6 +125,7 @@ int ft_listen( struct sockaddr_storage *saddr_ptr, char *host, char *port, int f return -1; } + ssize = sizeof( struct sockaddr_storage ); ASSERTSOCKOP( getsockname( fd, ( struct sockaddr *)saddr, &ssize ), "Getting socket name" ); if( saddr->ss_family == AF_INET ) diff --git a/lib/ftutil.h b/lib/ftutil.h index c4a5b02b..09c1104e 100644 --- a/lib/ftutil.h +++ b/lib/ftutil.h @@ -37,4 +37,4 @@ /* 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 ); |