Mirror/masscanned
1
0
Fork 0
mirror of https://github.com/ivre/masscanned.git synced 2025-10-02 06:38:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

et -> eth_type and cargo fmt

Browse source
This commit is contained in:
Unactive 2022-10-06 10:07:00 +02:00
parent 1f02849656
commit e5bbd08d49
2 changed files with 37 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/logger/logfmt.rs
View file

@ -164,17 +164,17 @@ impl Logger for LogfmtLogger {
fn eth_recv(&self, p: &EthernetPacket, c: &ClientInfo) { fn eth_recv(&self, p: &EthernetPacket, c: &ClientInfo) {
self.prolog("eth", "recv", false); self.prolog("eth", "recv", false);
self.client_info(c); self.client_info(c);
println!(" et={:}", p.get_ethertype(),); println!(" eth_type={:}", p.get_ethertype(),);
} }
fn eth_drop(&self, p: &EthernetPacket, c: &ClientInfo) { fn eth_drop(&self, p: &EthernetPacket, c: &ClientInfo) {
self.prolog("eth", "drop", false); self.prolog("eth", "drop", false);
self.client_info(c); self.client_info(c);
println!(" et={:}", p.get_ethertype(),); println!(" eth_type={:}", p.get_ethertype(),);
} }
fn eth_send(&self, p: &MutableEthernetPacket, c: &ClientInfo) { fn eth_send(&self, p: &MutableEthernetPacket, c: &ClientInfo) {
self.prolog("eth", "send", false); self.prolog("eth", "send", false);
self.client_info(c); self.client_info(c);
println!(" et={:}", p.get_ethertype(),); println!(" eth_type={:}", p.get_ethertype(),);
} }
/* IPv4 */ /* IPv4 */
fn ipv4_enabled(&self) -> bool { fn ipv4_enabled(&self) -> bool {
@ -221,17 +221,29 @@ impl Logger for LogfmtLogger {
fn icmpv4_recv(&self, p: &IcmpPacket, c: &ClientInfo) { fn icmpv4_recv(&self, p: &IcmpPacket, c: &ClientInfo) {
self.prolog("icmpv4", "recv", false); self.prolog("icmpv4", "recv", false);
self.client_info(c); self.client_info(c);
println!(" icmp_type={:?} icmp_code={:?}", p.get_icmp_type(), p.get_icmp_code(),); println!(
" icmp_type={:?} icmp_code={:?}",
p.get_icmp_type(),
p.get_icmp_code(),
);
} }
fn icmpv4_drop(&self, p: &IcmpPacket, c: &ClientInfo) { fn icmpv4_drop(&self, p: &IcmpPacket, c: &ClientInfo) {
self.prolog("icmpv4", "drop", false); self.prolog("icmpv4", "drop", false);
self.client_info(c); self.client_info(c);
println!(" icmp_type={:?} icmp_code={:?}", p.get_icmp_type(), p.get_icmp_code(),); println!(
" icmp_type={:?} icmp_code={:?}",
p.get_icmp_type(),
p.get_icmp_code(),
);
} }
fn icmpv4_send(&self, p: &MutableIcmpPacket, c: &ClientInfo) { fn icmpv4_send(&self, p: &MutableIcmpPacket, c: &ClientInfo) {
self.prolog("icmpv4", "send", false); self.prolog("icmpv4", "send", false);
self.client_info(c); self.client_info(c);
println!(" icmp_type={:?} icmp_code={:?}", p.get_icmp_type(), p.get_icmp_code(),); println!(
" icmp_type={:?} icmp_code={:?}",
p.get_icmp_type(),
p.get_icmp_code(),
);
} }
/* ICMPv6 */ /* ICMPv6 */
fn icmpv6_enabled(&self) -> bool { fn icmpv6_enabled(&self) -> bool {
@ -240,17 +252,29 @@ impl Logger for LogfmtLogger {
fn icmpv6_recv(&self, p: &Icmpv6Packet, c: &ClientInfo) { fn icmpv6_recv(&self, p: &Icmpv6Packet, c: &ClientInfo) {
self.prolog("icmpv6", "recv", false); self.prolog("icmpv6", "recv", false);
self.client_info(c); self.client_info(c);
println!(" icmpv6_type={:?} icmpv6_code={:?}", p.get_icmpv6_type(), p.get_icmpv6_code(),); println!(
" icmpv6_type={:?} icmpv6_code={:?}",
p.get_icmpv6_type(),
p.get_icmpv6_code(),
);
} }
fn icmpv6_drop(&self, p: &Icmpv6Packet, c: &ClientInfo) { fn icmpv6_drop(&self, p: &Icmpv6Packet, c: &ClientInfo) {
self.prolog("icmpv6", "drop", false); self.prolog("icmpv6", "drop", false);
self.client_info(c); self.client_info(c);
println!(" icmpv6_type={:?} icmpv6_code={:?}", p.get_icmpv6_type(), p.get_icmpv6_code(),); println!(
" icmpv6_type={:?} icmpv6_code={:?}",
p.get_icmpv6_type(),
p.get_icmpv6_code(),
);
} }
fn icmpv6_send(&self, p: &MutableIcmpv6Packet, c: &ClientInfo) { fn icmpv6_send(&self, p: &MutableIcmpv6Packet, c: &ClientInfo) {
self.prolog("icmpv6", "send", false); self.prolog("icmpv6", "send", false);
self.client_info(c); self.client_info(c);
println!(" icmpv6_type={:?} icmpv6_code={:?}", p.get_icmpv6_type(), p.get_icmpv6_code(),); println!(
" icmpv6_type={:?} icmpv6_code={:?}",
p.get_icmpv6_type(),
p.get_icmpv6_code(),
);
} }
/* TCP */ /* TCP */
fn tcp_enabled(&self) -> bool { fn tcp_enabled(&self) -> bool {

9
src/masscanned.rs
View file

@ -24,10 +24,7 @@ use std::fs::File;
use std::net::IpAddr; use std::net::IpAddr;
use std::str::FromStr; use std::str::FromStr;
use clap::{ use clap::{builder::PossibleValuesParser, Arg, ArgAction, Command};
Arg, ArgAction, Command,
builder::PossibleValuesParser,
};
use log::*; use log::*;
use pnet::{ use pnet::{
datalink::{self, Channel::Ethernet, DataLinkReceiver, DataLinkSender, NetworkInterface}, datalink::{self, Channel::Ethernet, DataLinkReceiver, DataLinkSender, NetworkInterface},
@ -38,7 +35,7 @@ use pnet::{
util::MacAddr, util::MacAddr,
}; };
use crate::logger::{Logger, ConsoleLogger, LogfmtLogger, MetaLogger}; use crate::logger::{ConsoleLogger, LogfmtLogger, Logger, MetaLogger};
use crate::utils::IpAddrParser; use crate::utils::IpAddrParser;
mod client; mod client;
@ -234,7 +231,7 @@ fn main() {
"logfmt" => Box::new(LogfmtLogger::new()), "logfmt" => Box::new(LogfmtLogger::new()),
// clap should already ensure we're using a valid format // clap should already ensure we're using a valid format
_ => panic!("illegal format") _ => panic!("illegal format"),
}; };
masscanned.log.add(chosen_logger); masscanned.log.add(chosen_logger);
} else { } else {