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

Fix numeric IPv6 address handling

Browse source 
This patch fix a issue with numeric IPv6 addresses in the
tftpd -a address[:port] option.

Since IPv6 addresses use colon ':' in differnt counts itself, we cannot detect,
if the last colon is a seperator, so it is needed to put the IPv6 address into
square brackets, e.g. [2001:db8::1], so a optional port assignment is
unambiguous.
The patch also allows to specify numeric IPv6 addresses in other places enclosed
in [], but in these cases it accept these also without [].

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-07-30 16:15:10 +02:00 • committed by H. Peter Anvin
parent c3a5c712e2
commit cfb85d4dec
4 changed files with 102 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

56
common/tftpsubs.c
View file

@ -309,7 +309,7 @@ set_sock_addr(char *host,union sock_addr *s, char **name)
memset(&hints, 0, sizeof(hints));
hints.ai_family = s->sa.sa_family;
hints.ai_flags = AI_CANONNAME;
err = getaddrinfo(host, NULL, &hints, &addrResult);
err = getaddrinfo(strip_address(host), NULL, &hints, &addrResult);
if (err) {
printf("Error : %s\n", gai_strerror(err));
printf("%s: unknown host\n", host);
@ -329,3 +329,57 @@ set_sock_addr(char *host,union sock_addr *s, char **name)
freeaddrinfo(addrResult);
return 0;
}
#ifdef HAVE_IPV6
int is_numeric_ipv6(char *addr)
{
/* A numeric IPv6 address consist at least of 2 ':' and
* it may have sequences of hex-digits and maybe contain
* a '.' from a IPv4 mapped address and maybe is enclosed in []
* we do not check here, if it is a valid IPv6 address
* only if is something like a numeric IPv6 address or something else
*/
size_t l;
char *p, s = 0;
if (!addr)
return 0;
p = strrchr(addr, ']');
if (p) {
s = *p;
*p = 0;
}
l = strlen(addr);
if (p)
*p = s;
if (l<2)
return 0;
if (l != strspn(addr, "0123456789ABCDEFabcdef:.["))
return 0;
p = strchr(addr, ':');
if (p) {
p++;
p = strchr(addr, ':');
if (p)
return 1;
}
return 0;
}
/* strip [] from numeric IPv6 addreses */
char *strip_address(char *addr)
{
char *p;
if (is_numeric_ipv6(addr) && (*addr == '[')) {
p = addr + strlen(addr);
p--;
if (*p == ']') {
*p = 0;
addr++;
}
}
return addr;
}
#endif