ishan/multicaster
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed unused code, only generate trace message on errors

Browse Source
This commit is contained in:
Ishan Jain 2023-11-22 02:40:29 +05:30
parent 23d7abc6ce
commit 939fdc61cb
Signed by: ishan
GPG Key ID: 0506DB2A1CC75C27
2 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mdns/mod.rs
View File

@ -50,8 +50,9 @@ impl Mdns {
pub fn process_packet(&self, msg: crate::socket::Message) { pub fn process_packet(&self, msg: crate::socket::Message) {
// TODO: Generalize this to parse any type of supported packet // TODO: Generalize this to parse any type of supported packet
trace!("{:0x?}", msg.data);
let packet = Packet::parse(&msg.data).unwrap_or_else(|e| { let packet = Packet::parse(&msg.data).unwrap_or_else(|e| {
trace!("{:0x?}", msg.data);
panic!( panic!(
"failed to parse packet as a dns packet. origin = {:?} interface = {:?} error = {:?}, loose_string = {:02x?}", "failed to parse packet as a dns packet. origin = {:?} interface = {:?} error = {:?}, loose_string = {:02x?}",
msg.origin_address,msg.interface, e, msg.data, msg.origin_address,msg.interface, e, msg.data,

42
src/socket.rs
View File

@ -4,7 +4,7 @@ use log::trace;
// This code has been adapted from multicast_socket crate // This code has been adapted from multicast_socket crate
use nix::sys::{ use nix::sys::{
self, self,
socket::{self as sock, AddressFamily, SockAddr, SockaddrIn, SockaddrLike, SockaddrStorage}, socket::{self as sock, AddressFamily, SockaddrIn, SockaddrLike, SockaddrStorage},
}; };
use serde::de::value; use serde::de::value;
use socket2::{Domain, Protocol, Socket, Type}; use socket2::{Domain, Protocol, Socket, Type};
@ -194,45 +194,5 @@ impl MulticastSocket {
Some(&SockaddrIn::from(self.multicast_group)), Some(&SockaddrIn::from(self.multicast_group)),
) )
.map_err(nix_to_io_error) .map_err(nix_to_io_error)
// match interface {
// Interface::Default => todo!(),
// Interface::Index(index) => {
// // TODO: Send over ipv4 and ipv6
// pkt_info.ipi_ifindex = *index as _;
// }
// Interface::Ip(IpAddr::V4(v4)) => {
// let mut pkt_info: libc::in_pktinfo = unsafe { mem::zeroed() };
// pkt_info.ipi_spec_dst = libc::in_addr {
// s_addr: (*v4).into(),
// };
// }
// Interface::Ip(IpAddr::V6(v6)) => {
// let mut pkt_info: libc::in6_pktinfo = unsafe { mem::zeroed() };
// }
// }
// match interface {
// Interface::Default => {}
// Interface::Ipv6(address) => {}
// Interface::Ipv4(address) => {
// pkt_info.ipi_spec_dst = libc::in_addr {
// s_addr: (*address).into(),
// }
// }
// Interface::Index(index) => pkt_info.ipi_ifindex = *index as _,
// };
// let destination = SockaddrIn::from(self.multicast_group);
// sock::sendmsg(
// self.socket.as_raw_fd(),
// &[IoSlice::new(buf)],
// &[sock::ControlMessage::Ipv4PacketInfo(&pkt_info)],
// sock::MsgFlags::empty(),
// Some(&destination),
// )
// .map_err(nix_to_io_error)
} }
} }