Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//!
//! # Examples
//!
//! ```
//! ```no_run
//! use std::net::{Ipv4Addr, SocketAddrV4};
//! use socket2::{Domain, SockAddr};
//! use socket_pktinfo::PktInfoUdpSocket;
Expand Down
8 changes: 8 additions & 0 deletions src/unix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@ impl PktInfoUdpSocket {
self.socket.set_multicast_loop_v4(loop_v4)
}

pub fn set_multicast_ttl_v4(&self, ttl: u32) -> io::Result<()> {
self.socket.set_multicast_ttl_v4(ttl)
}

pub fn join_multicast_v6(&self, addr: &Ipv6Addr, interface: u32) -> io::Result<()> {
self.socket.join_multicast_v6(addr, interface)
}
Expand All @@ -108,6 +112,10 @@ impl PktInfoUdpSocket {
self.socket.set_multicast_loop_v6(loop_v6)
}

pub fn set_multicast_hops_v6(&self, hops: u32) -> io::Result<()> {
self.socket.set_multicast_hops_v6(hops)
}

pub fn set_nonblocking(&self, reuse: bool) -> io::Result<()> {
self.socket.set_nonblocking(reuse)
}
Expand Down
8 changes: 8 additions & 0 deletions src/win.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@ impl PktInfoUdpSocket {
self.socket.set_multicast_loop_v4(loop_v4)
}

pub fn set_multicast_ttl_v4(&self, ttl: u32) -> io::Result<()> {
self.socket.set_multicast_ttl_v4(ttl)
}

pub fn join_multicast_v6(&self, addr: &Ipv6Addr, interface: u32) -> io::Result<()> {
self.socket.join_multicast_v6(addr, interface)
}
Expand All @@ -156,6 +160,10 @@ impl PktInfoUdpSocket {
self.socket.set_multicast_loop_v6(loop_v6)
}

pub fn set_multicast_hops_v6(&self, hops: u32) -> io::Result<()> {
self.socket.set_multicast_hops_v6(hops)
}

pub fn set_nonblocking(&self, reuse: bool) -> io::Result<()> {
self.socket.set_nonblocking(reuse)
}
Expand Down
1 change: 1 addition & 0 deletions tests/ipv4_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ fn ipv4_test() -> io::Result<()> {
socket.set_multicast_if_v4(&local_ip)?;
socket.join_multicast_v4(&multicast_addr, &local_ip)?;
socket.set_multicast_loop_v4(true)?;
socket.set_multicast_ttl_v4(255)?;
socket.bind(&SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), port).into())?;

{
Expand Down
10 changes: 7 additions & 3 deletions tests/ipv6_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use network_interface::{NetworkInterface, NetworkInterfaceConfig};
use socket2::{Domain, Protocol, SockAddr, Socket, Type};
use socket_pktinfo::PktInfoUdpSocket;
use std::io;
use std::net::{Ipv6Addr, SocketAddr};
use std::net::{IpAddr, Ipv6Addr, SocketAddr, SocketAddrV6};
use std::str::FromStr;

#[test]
Expand Down Expand Up @@ -31,14 +31,18 @@ fn ipv6_test() -> io::Result<()> {

let port = 8000;
let multicast_addr = Ipv6Addr::from_str("ff12::1").unwrap();
let local_addr: SockAddr = SocketAddr::new(local_ip, port).into();
let IpAddr::V6(local_ipv6) = local_ip else {
panic!("Expected IPv6");
};
let local_addr: SockAddr = SocketAddrV6::new(local_ipv6, port, 0, interface.index).into();
let multicast_socket_addr: SockAddr = SocketAddr::new(multicast_addr.into(), port).into();

let mut buf = [0; 8972];
let socket = PktInfoUdpSocket::new(Domain::IPV6)?;
socket.set_reuse_address(true)?;
socket.join_multicast_v6(&multicast_addr, 0)?;
socket.join_multicast_v6(&multicast_addr, interface.index)?;
socket.set_multicast_loop_v6(true)?;
socket.set_multicast_hops_v6(255)?;
socket.bind(&local_addr)?;

{
Expand Down
Loading