Skip to content

Bump dependencies to new versions #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump dependencies to new versions #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ keywords = ['multicast']
get_if_addrs = '0.5.3'

[dependencies.socket2]
version = '0.3.19'
features = ['reuseport']
version = '0.4.0'
features = ['all']

[target.'cfg(windows)'.dependencies.winapi]
version = '0.3.9'
features = ['mswsock', 'iphlpapi']

[target.'cfg(not(windows))'.dependencies.nix]
version = '0.19.1'
version = '0.20.0'

[target.'cfg(not(windows))'.dependencies.libc]
version = '0.2.85'
2 changes: 1 addition & 1 deletion src/unix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fn create_on_interfaces(
interfaces: Vec<Ipv4Addr>,
multicast_address: SocketAddrV4,
) -> io::Result<MulticastSocket> {
let socket = Socket::new(Domain::ipv4(), Type::dgram(), Some(Protocol::udp()))?;
let socket = Socket::new(Domain::IPV4, Type::DGRAM, Some(Protocol::UDP))?;
socket.set_read_timeout(Some(options.read_timeout))?;
socket.set_multicast_loop_v4(options.loopback)?;
socket.set_reuse_address(true)?;
Expand Down
50 changes: 22 additions & 28 deletions src/win.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ fn create_on_interfaces(
interfaces: Vec<Ipv4Addr>,
multicast_address: SocketAddrV4,
) -> io::Result<MulticastSocket> {
let socket = Socket::new(Domain::ipv4(), Type::dgram(), Some(Protocol::udp()))?;
let socket = Socket::new(Domain::IPV4, Type::DGRAM, Some(Protocol::UDP))?;
socket.set_read_timeout(Some(options.read_timeout))?;
socket.set_multicast_loop_v4(options.loopback)?;
socket.set_reuse_address(true)?;
Expand Down Expand Up @@ -290,41 +290,35 @@ impl MulticastSocket {
len: control_buffer.len() as u32,
};

let mut origin_address: SOCKADDR = unsafe { mem::zeroed() };
let mut wsa_msg = WSAMSG {
name: &mut origin_address,
namelen: mem::size_of_val(&origin_address) as i32,
lpBuffers: &mut data,
Control: control,
dwBufferCount: 1,
dwFlags: 0,
};

let mut read_bytes = 0;
let r = {
unsafe {
(self.wsarecvmsg)(
let (_, origin_address) = unsafe {
socket2::SockAddr::init(|addr_storage, len| {
let mut wsa_msg = WSAMSG {
name: addr_storage.cast(),
namelen: *len,
lpBuffers: &mut data,
Control: control,
dwBufferCount: 1,
dwFlags: 0,
};

let r = (self.wsarecvmsg)(
self.socket.as_raw_socket() as _,
&mut wsa_msg,
&mut read_bytes,
ptr::null_mut(),
None,
)
}
};

if r != 0 {
return Err(io::Error::last_os_error());
}
);

let origin_address = unsafe {
socket2::SockAddr::from_raw_parts(
&origin_address,
mem::size_of_val(&origin_address) as i32,
)
}
.as_std();
if r != 0 {
Err(io::Error::last_os_error())
} else {
Ok(())
}
})
}?;

let origin_address = origin_address.as_socket();
let origin_address = match origin_address {
Some(SocketAddr::V4(v4)) => v4,
_ => SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, 0),
Expand Down