aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-09-22 04:35:58 -04:00
Code

If dcc_own_ip contains IPv4 address, listen only in IPv4.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4228 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2006-01-28 16:04:44 +00:00 committed by cras
parent f517f0cd46
commit a975788d15
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/irc/dcc/dcc.c
View File

@ -198,22 +198,31 @@ void dcc_str2ip(const char *str, IPADDR *ip)
GIOChannel *dcc_listen(GIOChannel *iface, IPADDR *ip, int *port)
{
GIOChannel *handle;
const char *dcc_port, *p;
IPADDR *listen_ip = NULL;
const char *dcc_port, *p, *own_ip;
int first, last;
if (net_getsockname(iface, ip, NULL) == -1)
return NULL;
/* figure out if we want to listen in IPv4 address or in "any" address,
which may mean IPv4+IPv6 or just IPv6 depending on OS. */
own_ip = settings_get_str("dcc_own_ip");
if (*own_ip != '\0') {
if (is_ipv4_address(own_ip))
listen_ip = &ip4_any;
} else {
if (!IPADDR_IS_V6(ip))
listen_ip = &ip4_any;
}
/* get first port */
dcc_port = settings_get_str("dcc_port");
first = atoi(dcc_port);
if (first == 0) {
/* random port */
*port = 0;
if (IPADDR_IS_V6(ip))
return net_listen(NULL, port);
else
return net_listen(&ip4_any, port);
return net_listen(listen_ip, port);
}
/* get last port */
@ -231,10 +240,7 @@ GIOChannel *dcc_listen(GIOChannel *iface, IPADDR *ip, int *port)
/* use the first available port */
for (*port = first; *port <= last; (*port)++) {
if (IPADDR_IS_V6(ip))
handle = net_listen(NULL, port);
else
handle = net_listen(&ip4_any, port);
handle = net_listen(listen_ip, port);
if (handle != NULL)
return handle;
}