Commit 4f2978bb authored by Manuel Schölling's avatar Manuel Schölling
Browse files

Adjust sin_len/sin6_len for non-linux platforms 

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

Fixing errors
parent efbd4eee

openssl/src/ssl/connected_socket.rs

+2 −1
Original line number Diff line number Diff line
@@ -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,

openssl/src/ssl/tests.rs

+1 −1
Original line number Diff line number Diff line
@@ -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;