From 4f2978bbd312985bee7220ba26e2b6280734c5c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Sch=C3=B6lling?= <manuel.schoelling@gmx.de>
Date: Thu, 12 Mar 2015 19:38:45 +0100
Subject: [PATCH] Adjust sin_len/sin6_len for non-linux platforms

Fixing errors for platforms you don't own is really annoying ;)

Fixing errors
---
 openssl/src/ssl/connected_socket.rs | 3 ++-
 openssl/src/ssl/tests.rs            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/openssl/src/ssl/connected_socket.rs b/openssl/src/ssl/connected_socket.rs
index ce4f990b..825e29ca 100644
--- a/openssl/src/ssl/connected_socket.rs
+++ b/openssl/src/ssl/connected_socket.rs
@@ -71,7 +71,7 @@ fn new_sockaddr_in() -> sockaddr_in {
 	target_os = "windows")))]
 fn new_sockaddr_in() -> sockaddr_in {
 	sockaddr_in {
-		sin_len:    0,
+		sin_len:    mem::size_of::<sockaddr_in>(),
 		sin_family: AF_INET as sa_family_t,
 		sin_port:   0,
 		sin_zero:   [0; 8],
@@ -99,6 +99,7 @@ fn new_sockaddr_in6() -> sockaddr_in6 {
 	target_os = "windows")))]
 fn new_sockaddr_in6() -> sockaddr_in6 {
 	sockaddr_in6 {
+		sin6_len:      mem::size_of::<sockaddr_in6>(),
 		sin6_family:   AF_INET6 as sa_family_t,
 		sin6_port:     0,
 		sin6_flowinfo: 0,
diff --git a/openssl/src/ssl/tests.rs b/openssl/src/ssl/tests.rs
index dcdc3c05..fd587e30 100644
--- a/openssl/src/ssl/tests.rs
+++ b/openssl/src/ssl/tests.rs
@@ -52,7 +52,7 @@ macro_rules! run_test(
     ($module:ident, $blk:expr) => (
         #[cfg(test)]
         mod $module {
-            use ssl::tests::udp;
+            use super::udp;
             use std::io;
             use std::io::prelude::*;
             use std::path::Path;