philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass the right socket address length to bind() in client connections with

Browse Source 
IPv6 enabled.  This fixes an issue reported by packet, where IPv4 conections
don't work on FreeBSD when the client is built with IPv6 support and you
have a local hostname set (with /hostname, -H or IRCHOST).

Also ensure we clear the full size of the 'server' address structure - doesn't
fix a known problem but is a defensive measure.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@181 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2012-05-13 14:06:53 +00:00
parent 35f0400e1f
commit f035eceb72
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@@ -1,7 +1,7 @@
[Changes 1.2c01] [Changes 1.2c01]
* Fix known problem with IPv6 on FreeBSD and enable IPv6 on all supporting * Fix known problem with IPv6 on FreeBSD and enable IPv6 on all supporting
platforms. Thanks to brabes and snadge. (caf) platforms. Thanks to brabes, snadge and packet. (caf)
* Improve connect() error handling. (caf) * Improve connect() error handling. (caf)

4
source/network.c
View File

@@ -520,7 +520,7 @@ int BX_connect_by_number(char *hostn, unsigned short *portnum, int service, int
} }
#endif #endif
memset(&server, 0, sizeof(struct sockaddr_in)); memset(&server, 0, sizeof server);
#ifndef WINNT #ifndef WINNT
#ifdef IPV6 #ifdef IPV6
@@ -554,7 +554,7 @@ int BX_connect_by_number(char *hostn, unsigned short *portnum, int service, int
if (LocalHostName && !getaddrinfo(LocalHostName, NULL, &hints, &res) && res) if (LocalHostName && !getaddrinfo(LocalHostName, NULL, &hints, &res) && res)
{ {
if (bind(fd, (struct sockaddr *) res->ai_addr, sizeof(struct sockaddr_foobar))) if (bind(fd, (struct sockaddr *) res->ai_addr, res->ai_addrlen))
return close(fd), -2; return close(fd), -2;
freeaddrinfo(res); freeaddrinfo(res);
} }