nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

r13850@catbus: nickm | 2007-07-20 12:25:24 -0400

Browse Source 
Fix some bugs in ntop/pton.


svn:r10891
This commit is contained in:
Nick Mathewson 2007-07-20 16:25:27 +00:00
parent 6223160ab7
commit 8ba42a3bde
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/compat.c
View File

@ -834,7 +834,8 @@ tor_inet_ntop(int af, const void *src, char *dst, size_t len)
words[i] = (((uint16_t)addr->s6_addr[2*i])<<8) + addr->s6_addr[2*i+1];
}
if (words[0] == 0 && words[1] == 0 && words[2] == 0 && words[3] == 0 &&
words[4] == 0 && (words[5] == 0 || words[5] == 0xffff) && words[6]) {
words[4] == 0 && ((words[5] == 0 && (words[6] || words[7])) ||
(words[5] == 0xffff))) {
/* This is an IPv4 address. */
if (words[5] == 0) {
tor_snprintf(buf, sizeof(buf), "::%d.%d.%d.%d",
@ -965,7 +966,7 @@ tor_inet_pton(int af, const char *src, void *dst)
} else if (*src == ':' && i > 0 && gapPos==-1) {
gapPos = i;
++src;
} else if (*src == ':' && i == 0 && src[1] == ':') {
} else if (*src == ':' && i == 0 && src[1] == ':' && gapPos==-1) {
gapPos = i;
src += 2;
} else {
@ -973,7 +974,9 @@ tor_inet_pton(int af, const char *src, void *dst)
}
}
if (setWords > 8 || (setWords < 8 && gapPos == -1))
if (setWords > 8 ||
(setWords == 8 && gapPos != -1) ||
(setWords < 8 && gapPos == -1))
return 0;
if (gapPos >= 0) {