[or-cvs] r10888: Use our own version of inet_ntop and inet_pton everywhere, t (in tor/trunk: . src/common src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-07-19 16:47:18 -0400 (Thu, 19 Jul 2007)
New Revision: 10888

Modified:
   tor/trunk/
   tor/trunk/src/common/compat.c
   tor/trunk/src/or/test.c
Log:
 r13848 at catbus:  nickm | 2007-07-19 16:47:16 -0400
 Use our own version of inet_ntop and inet_pton everywhere, to avoid partitioning attacks.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r13848] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/common/compat.c
===================================================================
--- tor/trunk/src/common/compat.c	2007-07-19 20:31:43 UTC (rev 10887)
+++ tor/trunk/src/common/compat.c	2007-07-19 20:47:18 UTC (rev 10888)
@@ -819,9 +819,6 @@
 const char *
 tor_inet_ntop(int af, const void *src, char *dst, size_t len)
 {
-#ifdef HAVE_INET_NTOP
-  return inet_ntop(af,src,dst,(socklen_t)len);
-#else
   if (af == AF_INET) {
     if (tor_inet_ntoa(src, dst, len) < 0)
       return NULL;
@@ -896,7 +893,6 @@
   } else {
     return NULL;
   }
-#endif
 }
 
 /** Given <b>af</b>==AF_INET or <b>af</b>==AF_INET6, and a string <b>src</b>
@@ -911,9 +907,6 @@
 int
 tor_inet_pton(int af, const char *src, void *dst)
 {
-#ifdef HAVE_INET_PTON
-  return inet_pton(af, src, dst);
-#else
   if (af == AF_INET) {
     return tor_inet_aton(src, dst);
   } else if (af == AF_INET6) {
@@ -1000,7 +993,6 @@
   } else {
     return -1;
   }
-#endif
 }
 
 /** Similar behavior to Unix gethostbyname: resolve <b>name</b>, and set

Modified: tor/trunk/src/or/test.c
===================================================================
--- tor/trunk/src/or/test.c	2007-07-19 20:31:43 UTC (rev 10887)
+++ tor/trunk/src/or/test.c	2007-07-19 20:47:18 UTC (rev 10888)
@@ -1243,13 +1243,10 @@
   test_assert(r == -1);
   r=tor_addr_parse_mask_ports("efef::/112", &t1, NULL, NULL, NULL);
   test_assert(r == -1);
-#if 0
-  /* These two are okay on OSX and some BSDs. */
   r=tor_addr_parse_mask_ports("[f:f:f:f:f:f:f:f::]", &t1, NULL, NULL, NULL);
   test_assert(r == -1);
   r=tor_addr_parse_mask_ports("[::f:f:f:f:f:f:f:f]", &t1, NULL, NULL, NULL);
   test_assert(r == -1);
-#endif
   r=tor_addr_parse_mask_ports("[f:f:f:f:f:f:f:f:f]", &t1, NULL, NULL, NULL);
   test_assert(r == -1);
   /* Test for V4-mapped address with mask < 96.  (arguably not valid) */