[or-cvs] r16436: {tor} Oops. Remove code to set (nonportable) sin_len fields. Added (in tor/trunk: . src/common)

nickm at seul.org nickm at seul.org
Tue Aug 5 20:18:28 UTC 2008


Author: nickm
Date: 2008-08-05 16:18:28 -0400 (Tue, 05 Aug 2008)
New Revision: 16436

Modified:
   tor/trunk/
   tor/trunk/src/common/address.c
Log:
 r17643 at 31-33-44:  nickm | 2008-08-05 16:18:25 -0400
 Oops.  Remove code to set (nonportable) sin_len fields.  Added it to try to fix a bug that turned out to be something else.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r17643] on 49666b30-7950-49c5-bedf-9dc8f3168102

Modified: tor/trunk/src/common/address.c
===================================================================
--- tor/trunk/src/common/address.c	2008-08-05 20:08:19 UTC (rev 16435)
+++ tor/trunk/src/common/address.c	2008-08-05 20:18:28 UTC (rev 16436)
@@ -72,7 +72,6 @@
     if (len < sizeof(struct sockaddr_in))
       return -1;
     sin = (struct sockaddr_in *)sa_out;
-    sin->sin_len = sizeof(*sin);
     sin->sin_family = AF_INET;
     sin->sin_port = htons(port);
     sin->sin_addr.s_addr = tor_addr_to_ipv4n(a);
@@ -83,7 +82,6 @@
       return -1;
     sin6 = (struct sockaddr_in6 *)sa_out;
     memset(sin6, 0, sizeof(struct sockaddr_in6));
-    sin6->sin6_len = sizeof(sin6);
     sin6->sin6_family = AF_INET6;
     sin6->sin6_port = htons(port);
     memcpy(&sin6->sin6_addr, &a->addr.in6_addr, sizeof(struct in6_addr));



More information about the tor-commits mailing list