Skip to content

Commit 14a01ff

Browse files
mrmondaymrmonday
authored
Merge pull request #584 from Martichou/raw_socket
datalink(linux): add feature to pass the fd (socket) to ::channel()
2 parents 28e9de4 + bd4c8b0 commit 14a01ff

4 files changed

Lines changed: 100 additions & 39 deletions

File tree

‎pnet_datalink/src/lib.rs‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,9 @@ pub struct Config {
156156
pub linux_fanout: Option<FanoutOption>,
157157

158158
pub promiscuous: bool,
159+
160+
/// Linux only: The socket's file descriptor that pnet will use
161+
pub socket_fd: Option<i32>,
159162
}
160163

161164
impl Default for Config {
@@ -169,6 +172,7 @@ impl Default for Config {
169172
bpf_fd_attempts: 1000,
170173
linux_fanout: None,
171174
promiscuous: true,
175+
socket_fd: None,
172176
}
173177
}
174178
}
@@ -185,8 +189,14 @@ impl Default for Config {
185189
/// When matching on the returned channel, make sure to include a catch-all so that code doesn't
186190
/// break when new channel types are added.
187191
#[inline]
188-
pub fn channel(network_interface: &NetworkInterface, configuration: Config) -> io::Result<Channel> {
189-
backend::channel(network_interface, (&configuration).into())
192+
pub fn channel(
193+
network_interface: &NetworkInterface,
194+
configuration: Config,
195+
) -> io::Result<Channel> {
196+
backend::channel(
197+
network_interface,
198+
(&configuration).into()
199+
)
190200
}
191201

192202
/// Trait to enable sending `$packet` packets.

‎pnet_datalink/src/linux.rs‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ pub struct Config {
6565

6666
/// Promiscuous mode.
6767
pub promiscuous: bool,
68+
69+
pub socket_fd: Option<i32>,
6870
}
6971

7072
impl<'a> From<&'a super::Config> for Config {
@@ -77,6 +79,7 @@ impl<'a> From<&'a super::Config> for Config {
7779
write_timeout: config.write_timeout,
7880
fanout: config.linux_fanout,
7981
promiscuous: config.promiscuous,
82+
socket_fd: config.socket_fd,
8083
}
8184
}
8285
}
@@ -91,25 +94,32 @@ impl Default for Config {
9194
channel_type: super::ChannelType::Layer2,
9295
fanout: None,
9396
promiscuous: true,
97+
socket_fd: None,
9498
}
9599
}
96100
}
97101

98102
/// Create a data link channel using the Linux's `AF_PACKET` socket type.
99103
#[inline]
100-
pub fn channel(network_interface: &NetworkInterface, config: Config) -> io::Result<super::Channel> {
101-
let eth_p_all = 0x0003;
102-
let (typ, proto) = match config.channel_type {
103-
super::ChannelType::Layer2 => (libc::SOCK_RAW, eth_p_all),
104-
super::ChannelType::Layer3(proto) => (libc::SOCK_DGRAM, proto),
104+
pub fn channel(
105+
network_interface: &NetworkInterface,
106+
config: Config,
107+
) -> io::Result<super::Channel> {
108+
let (_typ, proto) = match config.channel_type {
109+
super::ChannelType::Layer2 => (libc::SOCK_RAW, libc::ETH_P_ALL),
110+
super::ChannelType::Layer3(proto) => (libc::SOCK_DGRAM, proto as i32),
105111
};
106-
let socket = unsafe { libc::socket(libc::AF_PACKET, typ, proto.to_be() as i32) };
107-
if socket == -1 {
108-
return Err(io::Error::last_os_error());
109-
}
110-
let mut addr: libc::sockaddr_storage = unsafe { mem::zeroed() };
111-
let len = network_addr_to_sockaddr(network_interface, &mut addr, proto as i32);
112112

113+
let socket = match config.socket_fd {
114+
Some(sock) => sock,
115+
None => match unsafe { libc::socket(libc::AF_PACKET, _typ, proto.to_be()) } {
116+
-1 => return Err(io::Error::last_os_error()),
117+
fd => fd
118+
}
119+
};
120+
121+
let mut addr: libc::sockaddr_storage = unsafe { mem::zeroed() };
122+
let len = network_addr_to_sockaddr(network_interface, &mut addr, proto);
113123
let send_addr = (&addr as *const libc::sockaddr_storage) as *const libc::sockaddr;
114124

115125
// Bind to interface

‎src/lib.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
#![deny(missing_docs)]
1010
#![deny(warnings)]
11-
1211
#![cfg_attr(not(feature = "std"), no_std)]
1312
#![cfg_attr(feature = "nightly", feature(custom_attribute, plugin))]
1413
#![cfg_attr(feature = "nightly", plugin(pnet_macros_plugin))]

‎src/pnettest.rs‎

Lines changed: 67 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ use crate::packet::ipv6::MutableIpv6Packet;
1717
use crate::packet::udp;
1818
use crate::packet::udp::{MutableUdpPacket, UdpPacket};
1919
use crate::packet::Packet;
20-
use std::iter::Iterator;
21-
use pnet_base::core_net::{IpAddr, Ipv4Addr, Ipv6Addr};
22-
use std::sync::mpsc::channel;
23-
use std::thread;
2420
use crate::transport::TransportProtocol::{Ipv4, Ipv6};
2521
use crate::transport::{
2622
ipv4_packet_iter, transport_channel, udp_packet_iter, TransportChannelType, TransportProtocol,
2723
};
24+
use pnet_base::core_net::{IpAddr, Ipv4Addr, Ipv6Addr};
25+
use std::iter::Iterator;
26+
use std::sync::mpsc::channel;
27+
use std::thread;
2828

2929
const IPV4_HEADER_LEN: usize = 20;
3030
const IPV6_HEADER_LEN: usize = 40;
@@ -51,7 +51,8 @@ fn ipv6_destination() -> Ipv6Addr {
5151
const TEST_PROTO: IpNextHeaderProtocol = IpNextHeaderProtocols::Test1;
5252

5353
fn build_ipv4_header(packet: &mut [u8], offset: usize) {
54-
let mut ip_header = MutableIpv4Packet::new(&mut packet[offset..]).expect("could not create MutableIpv4Packet");
54+
let mut ip_header =
55+
MutableIpv4Packet::new(&mut packet[offset..]).expect("could not create MutableIpv4Packet");
5556

5657
let total_len = (IPV4_HEADER_LEN + UDP_HEADER_LEN + TEST_DATA_LEN) as u16;
5758

@@ -67,7 +68,8 @@ fn build_ipv4_header(packet: &mut [u8], offset: usize) {
6768
}
6869

6970
fn build_ipv6_header(packet: &mut [u8], offset: usize) {
70-
let mut ip_header = MutableIpv6Packet::new(&mut packet[offset..]).expect("could not create MutableIpv6Packet");
71+
let mut ip_header =
72+
MutableIpv6Packet::new(&mut packet[offset..]).expect("could not create MutableIpv6Packet");
7173

7274
ip_header.set_version(6);
7375
ip_header.set_payload_length((UDP_HEADER_LEN + TEST_DATA_LEN) as u16);
@@ -78,7 +80,8 @@ fn build_ipv6_header(packet: &mut [u8], offset: usize) {
7880
}
7981

8082
fn build_udp_header(packet: &mut [u8], offset: usize) {
81-
let mut udp_header = MutableUdpPacket::new(&mut packet[offset..]).expect("could not create MutableUdpPacket");
83+
let mut udp_header =
84+
MutableUdpPacket::new(&mut packet[offset..]).expect("could not create MutableUdpPacket");
8285

8386
udp_header.set_source(1234); // Arbitrary port number
8487
udp_header.set_destination(1234);
@@ -126,8 +129,14 @@ fn build_udp4_packet(
126129
};
127130

128131
let slice = &mut packet[(start + IPV4_HEADER_LEN as usize)..];
129-
let checksum = udp::ipv4_checksum(&UdpPacket::new(slice).expect("could not create UdpPacket"), &source, &dest);
130-
MutableUdpPacket::new(slice).expect("could not create MutableUdpPacket").set_checksum(checksum);
132+
let checksum = udp::ipv4_checksum(
133+
&UdpPacket::new(slice).expect("could not create UdpPacket"),
134+
&source,
135+
&dest,
136+
);
137+
MutableUdpPacket::new(slice)
138+
.expect("could not create MutableUdpPacket")
139+
.set_checksum(checksum);
131140
}
132141

133142
fn build_udp6_packet(packet: &mut [u8], start: usize, msg: &str) {
@@ -148,7 +157,9 @@ fn build_udp6_packet(packet: &mut [u8], start: usize, msg: &str) {
148157
&ipv6_source(),
149158
&ipv6_destination(),
150159
);
151-
MutableUdpPacket::new(slice).expect("could not create MutableUdpPacket").set_checksum(checksum);
160+
MutableUdpPacket::new(slice)
161+
.expect("could not create MutableUdpPacket")
162+
.set_checksum(checksum);
152163
}
153164

154165
// OSes have a nasty habit of tweaking IP fields, so we only check
@@ -204,7 +215,8 @@ fn layer4(ip: IpAddr, header_len: usize) {
204215
assert_eq!(addr, ip);
205216
assert_eq!(
206217
header,
207-
UdpPacket::new(&packet[header_len..packet_len]).expect("could not create UdpPacket")
218+
UdpPacket::new(&packet[header_len..packet_len])
219+
.expect("could not create UdpPacket")
208220
);
209221
break;
210222
}
@@ -215,7 +227,8 @@ fn layer4(ip: IpAddr, header_len: usize) {
215227
}
216228
});
217229

218-
rx.recv().expect("failed to receive message through channel");
230+
rx.recv()
231+
.expect("failed to receive message through channel");
219232
match ttx.send_to(udp, ip) {
220233
Ok(res) => assert_eq!(res as usize, UDP_HEADER_LEN + TEST_DATA_LEN),
221234
Err(e) => panic!("layer4_test failed: {}", e),
@@ -281,7 +294,8 @@ fn layer3_ipv4() {
281294
.expect("could not create UdpPacket");
282295
assert_eq!(
283296
udp_header,
284-
UdpPacket::new(&packet[IPV4_HEADER_LEN..]).expect("could not create UdpPacket")
297+
UdpPacket::new(&packet[IPV4_HEADER_LEN..])
298+
.expect("could not create UdpPacket")
285299
);
286300

287301
assert_eq!(
@@ -297,8 +311,12 @@ fn layer3_ipv4() {
297311
}
298312
});
299313

300-
rx.recv().expect("unable to receive message through channel");
301-
match ttx.send_to(Ipv4Packet::new(&packet[..]).expect("could not create Ipv4Packet"), send_addr) {
314+
rx.recv()
315+
.expect("unable to receive message through channel");
316+
match ttx.send_to(
317+
Ipv4Packet::new(&packet[..]).expect("could not create Ipv4Packet"),
318+
send_addr,
319+
) {
302320
Ok(res) => assert_eq!(res as usize, packet.len()),
303321
Err(e) => panic!("layer3_ipv4_test failed: {}", e),
304322
}
@@ -355,9 +373,18 @@ fn layer2() {
355373
let mut packet = [0u8; ETHERNET_HEADER_LEN + IPV4_HEADER_LEN + UDP_HEADER_LEN + TEST_DATA_LEN];
356374

357375
{
358-
let mut ethernet_header = MutableEthernetPacket::new(&mut packet[..]).expect("could not create MutableEthernetPacket");
359-
ethernet_header.set_source(interface.mac.expect("could not find mac address for test interface"));
360-
ethernet_header.set_destination(interface.mac.expect("could not find mac address for test interface"));
376+
let mut ethernet_header = MutableEthernetPacket::new(&mut packet[..])
377+
.expect("could not create MutableEthernetPacket");
378+
ethernet_header.set_source(
379+
interface
380+
.mac
381+
.expect("could not find mac address for test interface"),
382+
);
383+
ethernet_header.set_destination(
384+
interface
385+
.mac
386+
.expect("could not find mac address for test interface"),
387+
);
361388
ethernet_header.set_ethertype(EtherTypes::Ipv4);
362389
}
363390

@@ -394,8 +421,12 @@ fn layer2() {
394421
if i == 10_000 {
395422
panic!("layer2: did not find matching packet after 10_000 iterations");
396423
}
397-
if EthernetPacket::new(&packet[..]).expect("failed to create EthernetPacket").payload()
398-
== EthernetPacket::new(eh).expect("failed to create EthernetPacket").payload()
424+
if EthernetPacket::new(&packet[..])
425+
.expect("failed to create EthernetPacket")
426+
.payload()
427+
== EthernetPacket::new(eh)
428+
.expect("failed to create EthernetPacket")
429+
.payload()
399430
{
400431
return;
401432
}
@@ -408,7 +439,8 @@ fn layer2() {
408439
}
409440
});
410441

411-
rx.recv().expect("failed to receive message through channel");
442+
rx.recv()
443+
.expect("failed to receive message through channel");
412444
match dltx.send_to(&packet[..], None) {
413445
Some(Ok(())) => (),
414446
Some(Err(e)) => panic!("layer2_test failed: {}", e),
@@ -434,9 +466,18 @@ fn layer2_timeouts() {
434466
let mut packet = [0u8; ETHERNET_HEADER_LEN + IPV4_HEADER_LEN + UDP_HEADER_LEN + TEST_DATA_LEN];
435467

436468
{
437-
let mut ethernet_header = MutableEthernetPacket::new(&mut packet[..]).expect("failed to create MutableEthernetPacket");
438-
ethernet_header.set_source(interface.mac.expect("missing mac address for test interface"));
439-
ethernet_header.set_destination(interface.mac.expect("missing mac address for test interface"));
469+
let mut ethernet_header = MutableEthernetPacket::new(&mut packet[..])
470+
.expect("failed to create MutableEthernetPacket");
471+
ethernet_header.set_source(
472+
interface
473+
.mac
474+
.expect("missing mac address for test interface"),
475+
);
476+
ethernet_header.set_destination(
477+
interface
478+
.mac
479+
.expect("missing mac address for test interface"),
480+
);
440481
ethernet_header.set_ethertype(EtherTypes::Ipv4);
441482
}
442483

@@ -487,7 +528,8 @@ fn layer2_timeouts() {
487528
}
488529
}
489530
});
490-
rx.recv().expect("failed to receive message through channel");
531+
rx.recv()
532+
.expect("failed to receive message through channel");
491533

492534
// Wait a while
493535
thread::sleep(Duration::from_millis(1000));

0 commit comments

Comments
 (0)