From 2f4be7a6cd6b105f252b193f5998e79e422f98c0 Mon Sep 17 00:00:00 2001
From: "B. Blechschmidt" <github@blechschmidt.pw>
Date: Mon, 20 Mar 2023 17:56:54 +0100
Subject: [PATCH] Run cargo fmt

---
 src/main.rs       |  2 +-
 src/tun2proxy.rs  | 29 +++++++++++++++++++++--------
 src/virtdevice.rs |  6 +++---
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index d7e24f7..f2b680b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,7 @@
-use tun2proxy::{ProxyType, main_entry};
 use clap::{Parser, ValueEnum};
 use env_logger::Env;
 use std::net::SocketAddr;
+use tun2proxy::{main_entry, ProxyType};
 
 /// Tunnel interface to proxy
 #[derive(Parser)]
diff --git a/src/tun2proxy.rs b/src/tun2proxy.rs
index 1f82cf6..77667f9 100644
--- a/src/tun2proxy.rs
+++ b/src/tun2proxy.rs
@@ -6,15 +6,17 @@ use mio::unix::SourceFd;
 use mio::{Events, Interest, Poll, Token};
 use smoltcp::iface::{Config, Interface, SocketHandle, SocketSet};
 use smoltcp::phy::{Device, Medium, RxToken, TunTapInterface, TxToken};
+use smoltcp::socket::tcp;
 use smoltcp::time::Instant;
-use smoltcp::wire::{IpAddress, IpCidr, Ipv4Address, Ipv4Packet, Ipv6Address, Ipv6Packet, TcpPacket, UdpPacket};
-use std::collections::{HashMap};
+use smoltcp::wire::{
+    IpAddress, IpCidr, Ipv4Address, Ipv4Packet, Ipv6Address, Ipv6Packet, TcpPacket, UdpPacket,
+};
+use std::collections::HashMap;
 use std::convert::From;
 use std::io::{Read, Write};
 use std::net::Shutdown::Both;
 use std::net::{IpAddr, Shutdown, SocketAddr};
 use std::os::unix::io::AsRawFd;
-use smoltcp::socket::tcp;
 
 pub struct ProxyError {
     message: String,
@@ -205,11 +207,21 @@ impl<'a> TunToProxy<'a> {
         let mut virt = VirtualTunDevice::new(tun.capabilities());
         let mut iface = Interface::new(config, &mut virt);
         iface.update_ip_addrs(|ip_addrs| {
-            ip_addrs.push(IpCidr::new(IpAddress::v4(0, 0, 0, 1), 0)).unwrap();
-            ip_addrs.push(IpCidr::new(IpAddress::v6(0, 0, 0, 0, 0, 0, 0, 1), 0)).unwrap()
+            ip_addrs
+                .push(IpCidr::new(IpAddress::v4(0, 0, 0, 1), 0))
+                .unwrap();
+            ip_addrs
+                .push(IpCidr::new(IpAddress::v6(0, 0, 0, 0, 0, 0, 0, 1), 0))
+                .unwrap()
         });
-        iface.routes_mut().add_default_ipv4_route(Ipv4Address::new(0, 0, 0, 1)).unwrap();
-        iface.routes_mut().add_default_ipv6_route(Ipv6Address::new(0, 0, 0, 0, 0, 0, 0, 1)).unwrap();
+        iface
+            .routes_mut()
+            .add_default_ipv4_route(Ipv4Address::new(0, 0, 0, 1))
+            .unwrap();
+        iface
+            .routes_mut()
+            .add_default_ipv6_route(Ipv6Address::new(0, 0, 0, 0, 0, 0, 0, 1))
+            .unwrap();
         iface.set_any_ip(true);
 
         Self {
@@ -232,7 +244,8 @@ impl<'a> TunToProxy<'a> {
     }
 
     fn expect_smoltcp_send(&mut self) {
-        self.iface.poll(Instant::now(), &mut self.device, &mut self.sockets);
+        self.iface
+            .poll(Instant::now(), &mut self.device, &mut self.sockets);
 
         while let Some(vec) = self.device.exfiltrate_packet() {
             let slice = vec.as_slice();
diff --git a/src/virtdevice.rs b/src/virtdevice.rs
index 04391a3..0a8f63e 100644
--- a/src/virtdevice.rs
+++ b/src/virtdevice.rs
@@ -6,7 +6,7 @@ use smoltcp::time::Instant;
 pub struct VirtualTunDevice {
     capabilities: DeviceCapabilities,
     inbuf: Vec<Vec<u8>>,
-    outbuf: Vec<Vec<u8>>
+    outbuf: Vec<Vec<u8>>,
 }
 
 impl VirtualTunDevice {
@@ -51,7 +51,7 @@ impl Device for VirtualTunDevice {
     type RxToken<'a> = VirtRxToken;
     type TxToken<'a> = VirtTxToken<'a>;
 
-    fn receive(&mut self,  _timestamp: Instant) -> Option<(Self::RxToken<'_>, Self::TxToken<'_>)> {
+    fn receive(&mut self, _timestamp: Instant) -> Option<(Self::RxToken<'_>, Self::TxToken<'_>)> {
         if let Some(buffer) = self.inbuf.pop() {
             let rx = Self::RxToken { buffer };
             let tx = VirtTxToken(self);
@@ -60,7 +60,7 @@ impl Device for VirtualTunDevice {
         None
     }
 
-    fn transmit(&mut self,  _timestamp: Instant) -> Option<Self::TxToken<'_>> {
+    fn transmit(&mut self, _timestamp: Instant) -> Option<Self::TxToken<'_>> {
         return Some(VirtTxToken(self));
     }