Missing npcap message prompt

This commit is contained in:
Wiktor Mazur
2019-11-11 16:54:41 +01:00
parent b0c8340b9f
commit ea72a56a20
8 changed files with 135 additions and 59 deletions
+69 -29
View File
@@ -1,9 +1,9 @@
extern crate pnet;
use std::sync::{Arc, Mutex};
use std::net::IpAddr;
use std::panic;
use std::sync::mpsc::Sender;
use std::sync::{Arc, Mutex};
use std::thread;
use pnet::datalink::{self, NetworkInterface};
@@ -25,23 +25,32 @@ pub struct UdpPacket {
pub destination_address: IpAddr,
pub destination_port: u16,
pub length: u16,
pub payload: Vec<u8>
pub payload: Vec<u8>,
}
pub fn receive(tx: Sender<UdpPacket>) {
pub type NetworkInterfaces = Vec<pnet::datalink::NetworkInterface>;
pub fn network_interfaces() -> Result<NetworkInterfaces, &'static str> {
let result = panic::catch_unwind(|| {
datalink::interfaces()
.into_iter()
.filter(|i| !i.is_loopback())
.collect::<NetworkInterfaces>()
});
match result {
Ok(interfaces) => Ok(interfaces),
Err(_) => Err("Unable to get interface list"),
}
}
pub fn receive(interfaces: NetworkInterfaces, tx: Sender<UdpPacket>) {
let shared_tx = Arc::new(Mutex::new(tx));
use pnet::datalink::Channel::Ethernet;
let interfaces = datalink::interfaces()
.into_iter()
.filter(|i| !i.is_loopback());
info!("Found interfaces: {:?}", interfaces);
for interface in interfaces {
let tx = shared_tx.clone();
let config = pnet::datalink::Config{
let config = pnet::datalink::Config {
write_buffer_size: 65536,
read_buffer_size: 65536,
..Default::default()
@@ -49,15 +58,15 @@ pub fn receive(tx: Sender<UdpPacket>) {
// Create a channel to receive on
let (_, mut rx) = match datalink::channel(&interface, config) {
Ok(Ethernet(tx, rx)) => (tx, rx),
Ok(pnet::datalink::Channel::Ethernet(tx, rx)) => (tx, rx),
Ok(_) => {
warn!("packetdump: unhandled channel type");
continue;
},
Err(e) => {
}
Err(e) => {
warn!("packetdump: unable to create channel: {}", e);
continue;
},
}
};
thread::spawn(move || {
@@ -79,18 +88,30 @@ pub fn receive(tx: Sender<UdpPacket>) {
fake_ethernet_frame.set_source(MacAddr(0, 0, 0, 0, 0, 0));
fake_ethernet_frame.set_ethertype(EtherTypes::Ipv4);
fake_ethernet_frame.set_payload(&packet);
handle_ethernet_frame(&interface, &fake_ethernet_frame.to_immutable(), &tx);
handle_ethernet_frame(
&interface,
&fake_ethernet_frame.to_immutable(),
&tx,
);
continue;
} else if version == 6 {
fake_ethernet_frame.set_destination(MacAddr(0, 0, 0, 0, 0, 0));
fake_ethernet_frame.set_source(MacAddr(0, 0, 0, 0, 0, 0));
fake_ethernet_frame.set_ethertype(EtherTypes::Ipv6);
fake_ethernet_frame.set_payload(&packet);
handle_ethernet_frame(&interface, &fake_ethernet_frame.to_immutable(), &tx);
handle_ethernet_frame(
&interface,
&fake_ethernet_frame.to_immutable(),
&tx,
);
continue;
}
}
handle_ethernet_frame(&interface, &EthernetPacket::new(packet).unwrap(), &tx);
handle_ethernet_frame(
&interface,
&EthernetPacket::new(packet).unwrap(),
&tx,
);
}
Err(e) => warn!("packetdump: unable to receive packet: {}", e),
}
@@ -99,7 +120,11 @@ pub fn receive(tx: Sender<UdpPacket>) {
}
}
fn handle_ethernet_frame(interface: &NetworkInterface, ethernet: &EthernetPacket, tx: &Arc<Mutex<Sender<UdpPacket>>>) {
fn handle_ethernet_frame(
interface: &NetworkInterface,
ethernet: &EthernetPacket,
tx: &Arc<Mutex<Sender<UdpPacket>>>,
) {
let interface_name = &interface.name[..];
match ethernet.get_ethertype() {
EtherTypes::Ipv4 => handle_ipv4_packet(interface_name, ethernet, &tx),
@@ -108,7 +133,11 @@ fn handle_ethernet_frame(interface: &NetworkInterface, ethernet: &EthernetPacket
}
}
fn handle_ipv4_packet(interface_name: &str, ethernet: &EthernetPacket, tx: &Arc<Mutex<Sender<UdpPacket>>>) {
fn handle_ipv4_packet(
interface_name: &str,
ethernet: &EthernetPacket,
tx: &Arc<Mutex<Sender<UdpPacket>>>,
) {
let header = Ipv4Packet::new(ethernet.payload());
if let Some(header) = header {
handle_transport_protocol(
@@ -117,12 +146,16 @@ fn handle_ipv4_packet(interface_name: &str, ethernet: &EthernetPacket, tx: &Arc<
IpAddr::V4(header.get_destination()),
header.get_next_level_protocol(),
header.payload(),
&tx
&tx,
);
}
}
fn handle_ipv6_packet(interface_name: &str, ethernet: &EthernetPacket, tx: &Arc<Mutex<Sender<UdpPacket>>>) {
fn handle_ipv6_packet(
interface_name: &str,
ethernet: &EthernetPacket,
tx: &Arc<Mutex<Sender<UdpPacket>>>,
) {
let header = Ipv6Packet::new(ethernet.payload());
if let Some(header) = header {
handle_transport_protocol(
@@ -131,7 +164,7 @@ fn handle_ipv6_packet(interface_name: &str, ethernet: &EthernetPacket, tx: &Arc<
IpAddr::V6(header.get_destination()),
header.get_next_header(),
header.payload(),
&tx
&tx,
);
}
}
@@ -142,7 +175,7 @@ fn handle_transport_protocol(
destination: IpAddr,
protocol: IpNextHeaderProtocol,
packet: &[u8],
tx: &Arc<Mutex<Sender<UdpPacket>>>
tx: &Arc<Mutex<Sender<UdpPacket>>>,
) {
match protocol {
IpNextHeaderProtocols::Udp => {
@@ -152,18 +185,25 @@ fn handle_transport_protocol(
}
}
fn handle_udp_packet(interface_name: &str, source: IpAddr, destination: IpAddr, packet: &[u8], tx: &Arc<Mutex<Sender<UdpPacket>>>) {
fn handle_udp_packet(
interface_name: &str,
source: IpAddr,
destination: IpAddr,
packet: &[u8],
tx: &Arc<Mutex<Sender<UdpPacket>>>,
) {
let udp = udp::UdpPacket::new(packet);
let tx = tx.lock().unwrap();
if let Some(udp) = udp {
tx.send(UdpPacket{
tx.send(UdpPacket {
interface_name: String::from(interface_name),
source_address: source,
source_port: udp.get_source(),
destination_address: destination,
destination_port: udp.get_destination(),
length: udp.get_length(),
payload: Vec::from(udp.payload())
}).unwrap();
payload: Vec::from(udp.payload()),
})
.unwrap();
}
}