forks/tftp-hpa-google
1
0
Fork 0
forked from mirrors/tftp-hpa-google
Code Pull requests Releases 1 Activity

Add error messages if address types mismatch

Browse source 
If a user does supply a IPv4 or IPv6 address
but force the other type with -4 or -6, give an error.
The patch also fix the special [::ffff:127.0.1]
address handling, it work now if you bind to this
address but only if you not force IPv6 only, it seems
that the kernel does not signal connections to a
IPv6 socket listen on [::ffff:127.0.0.1], if it was bound
IPv6 only.
I think we can live with it and do not need a special test
for this address.

Signed-off-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Karsten Keil 2008-08-01 16:31:06 +02:00 • committed by H. Peter Anvin
parent 18fd18bd5c
commit 544abd789e
1 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tftpd/tftpd.c
View file

@ -327,6 +327,7 @@ int main(int argc, char **argv)
struct sockaddr_in bindaddr4; struct sockaddr_in bindaddr4;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
struct sockaddr_in6 bindaddr6; struct sockaddr_in6 bindaddr6;
int force_ipv6 = 0;
#endif #endif
int n; int n;
int fd = -1; int fd = -1;
@ -367,6 +368,7 @@ int main(int argc, char **argv)
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
case '6': case '6':
ai_fam = AF_INET6; ai_fam = AF_INET6;
force_ipv6 = 1;
break; break;
#endif #endif
case 'c': case 'c':
@ -561,6 +563,12 @@ int main(int argc, char **argv)
if (fd6 >= 0) { if (fd6 >= 0) {
close(fd6); close(fd6);
fd6 = -1; fd6 = -1;
if (ai_fam == AF_INET6) {
syslog(LOG_ERR,
"Address %s is not in address family AF_INET6",
address);
exit(EX_USAGE);
}
ai_fam = AF_INET; ai_fam = AF_INET;
} }
break; break;
@ -568,6 +576,12 @@ int main(int argc, char **argv)
if (fd4 >= 0) { if (fd4 >= 0) {
close(fd4); close(fd4);
fd4 = -1; fd4 = -1;
if (ai_fam == AF_INET) {
syslog(LOG_ERR,
"Address %s is not in address family AF_INET",
address);
exit(EX_USAGE);
}
ai_fam = AF_INET6; ai_fam = AF_INET6;
} }
break; break;
@ -655,12 +669,12 @@ int main(int argc, char **argv)
} }
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (fd6 >= 0) { if (fd6 >= 0) {
int on = 1;
#if defined(IPV6_V6ONLY) #if defined(IPV6_V6ONLY)
int on = 1;
if (fd4 >= 0 || force_ipv6)
if (setsockopt(fd6, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&on, if (setsockopt(fd6, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&on,
sizeof(on))) { sizeof(on)))
syslog(LOG_ERR, "cannot setsockopt IPV6_V6ONLY %m"); syslog(LOG_ERR, "cannot setsockopt IPV6_V6ONLY %m");
}
#endif #endif
if (bind(fd6, (struct sockaddr *)&bindaddr6, if (bind(fd6, (struct sockaddr *)&bindaddr6,
sizeof(bindaddr6)) < 0) { sizeof(bindaddr6)) < 0) {