Adding upstream version 115.7.0esr.upstream/115.7.0esr

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 169 insertions, 0 deletions

diff --git a/third_party/rust/net2/src/sys/windows/impls.rs b/third_party/rust/net2/src/sys/windows/impls.rs
new file mode 100644
index 0000000000..48e787ca20
--- /dev/null
+++ b/third_party/rust/net2/src/sys/windows/impls.rs
@@ -0,0 +1,44 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use std::os::windows::io::{FromRawSocket, RawSocket, AsRawSocket};
+use winapi::um::winsock2::SOCKET;
+
+use {TcpBuilder, UdpBuilder, FromInner, AsInner};
+use socket::Socket;
+use sys;
+
+impl FromRawSocket for TcpBuilder {
+    unsafe fn from_raw_socket(fd: RawSocket) -> TcpBuilder {
+        let sock = sys::Socket::from_inner(fd as SOCKET);
+        TcpBuilder::from_inner(Socket::from_inner(sock))
+    }
+}
+
+impl AsRawSocket for TcpBuilder {
+    fn as_raw_socket(&self) -> RawSocket {
+        // TODO: this unwrap() is very bad
+        self.as_inner().borrow().as_ref().unwrap().as_inner().raw() as RawSocket
+    }
+}
+
+impl FromRawSocket for UdpBuilder {
+    unsafe fn from_raw_socket(fd: RawSocket) -> UdpBuilder {
+        let sock = sys::Socket::from_inner(fd as SOCKET);
+        UdpBuilder::from_inner(Socket::from_inner(sock))
+    }
+}
+
+impl AsRawSocket for UdpBuilder {
+    fn as_raw_socket(&self) -> RawSocket {
+        // TODO: this unwrap() is very bad
+        self.as_inner().borrow().as_ref().unwrap().as_inner().raw() as RawSocket
+    }
+}
diff --git a/third_party/rust/net2/src/sys/windows/mod.rs b/third_party/rust/net2/src/sys/windows/mod.rs
new file mode 100644
index 0000000000..7086bec9dc
--- /dev/null
+++ b/third_party/rust/net2/src/sys/windows/mod.rs
@@ -0,0 +1,125 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![allow(bad_style)]
+
+use std::io;
+use std::mem;
+use std::net::{TcpListener, TcpStream, UdpSocket};
+use std::os::windows::io::{RawSocket, FromRawSocket};
+use std::sync::{Once, ONCE_INIT};
+
+const HANDLE_FLAG_INHERIT: DWORD = 0x00000001;
+
+pub mod c {
+    pub use winapi::ctypes::*;
+    pub use winapi::um::handleapi::*;
+    pub use winapi::um::winbase::*;
+    pub use winapi::um::winsock2::*;
+    pub use winapi::um::ws2tcpip::*;
+    
+    pub use winapi::shared::inaddr::*;
+    pub use winapi::shared::in6addr::*;
+    pub use winapi::shared::minwindef::*;
+    pub use winapi::shared::ntdef::*;
+    pub use winapi::shared::ws2def::*;
+    pub use winapi::shared::ws2def::{SOCK_STREAM, SOCK_DGRAM};
+    pub use winapi::shared::ws2def::SOCKADDR as sockaddr;
+    pub use winapi::shared::ws2def::SOCKADDR_STORAGE as sockaddr_storage;
+    pub use winapi::shared::ws2def::SOCKADDR_IN as sockaddr_in;
+    pub use winapi::shared::ws2def::ADDRESS_FAMILY as sa_family_t;
+    pub use winapi::shared::ws2ipdef::*;
+    pub use winapi::shared::ws2ipdef::SOCKADDR_IN6_LH as sockaddr_in6;
+    pub use winapi::shared::ws2ipdef::IP_MREQ as ip_mreq;
+    pub use winapi::shared::ws2ipdef::IPV6_MREQ as ipv6_mreq;
+
+    pub fn sockaddr_in_u32(sa: &sockaddr_in) -> u32 {
+        ::ntoh(unsafe { *sa.sin_addr.S_un.S_addr() })
+    }
+
+    pub fn in_addr_to_u32(addr: &in_addr) -> u32 {
+        ::ntoh(unsafe { *addr.S_un.S_addr() })
+    }
+}
+
+use self::c::*;
+
+mod impls;
+
+fn init() {
+    static INIT: Once = ONCE_INIT;
+
+    INIT.call_once(|| {
+        // Initialize winsock through the standard library by just creating a
+        // dummy socket. Whether this is successful or not we drop the result as
+        // libstd will be sure to have initialized winsock.
+        let _ = UdpSocket::bind("127.0.0.1:34254");
+    });
+}
+
+pub struct Socket {
+    socket: SOCKET,
+}
+
+impl Socket {
+    pub fn new(family: c_int, ty: c_int) -> io::Result<Socket> {
+        init();
+        let socket = try!(unsafe {
+            match WSASocketW(family, ty, 0, 0 as *mut _, 0,
+                             WSA_FLAG_OVERLAPPED) {
+                INVALID_SOCKET => Err(io::Error::last_os_error()),
+                n => Ok(Socket { socket: n }),
+            }
+        });
+        try!(socket.set_no_inherit());
+        Ok(socket)
+    }
+
+    pub fn raw(&self) -> SOCKET { self.socket }
+
+    fn into_socket(self) -> SOCKET {
+        let socket = self.socket;
+        mem::forget(self);
+        socket
+    }
+
+    pub fn into_tcp_listener(self) -> TcpListener {
+        unsafe { TcpListener::from_raw_socket(self.into_socket() as RawSocket) }
+    }
+
+    pub fn into_tcp_stream(self) -> TcpStream {
+        unsafe { TcpStream::from_raw_socket(self.into_socket() as RawSocket) }
+    }
+
+    pub fn into_udp_socket(self) -> UdpSocket {
+        unsafe { UdpSocket::from_raw_socket(self.into_socket() as RawSocket) }
+    }
+
+    fn set_no_inherit(&self) -> io::Result<()> {
+        ::cvt_win(unsafe {
+            SetHandleInformation(self.socket as HANDLE, HANDLE_FLAG_INHERIT, 0)
+        }).map(|_| ())
+    }
+}
+
+impl ::FromInner for Socket {
+    type Inner = SOCKET;
+    fn from_inner(socket: SOCKET) -> Socket {
+        Socket { socket: socket }
+    }
+}
+
+impl Drop for Socket {
+    fn drop(&mut self) {
+        unsafe {
+            let _ = closesocket(self.socket);
+        }
+    }
+}