From ebbe72fc19d0d8b14d9fd79c6ce6e1b019016767 Mon Sep 17 00:00:00 2001
From: Evan Pratten <ewpratten@gmail.com>
Date: Wed, 2 Aug 2023 14:54:30 -0400
Subject: [PATCH] Fix clippy errors and create new package

---
 Cargo.toml                 |  2 +-
 libs/fast-nat/README.md    |  5 +++++
 libs/fast-nat/src/cpnat.rs | 15 +++++++++++----
 libs/fast-nat/src/lib.rs   |  4 ++++
 libs/fast-nat/src/nat.rs   | 15 +++++++++++----
 libs/interproto/Cargo.toml | 17 +++++++++++++++++
 libs/interproto/README.md  |  0
 libs/interproto/src/lib.rs |  5 +++++
 8 files changed, 54 insertions(+), 9 deletions(-)
 create mode 100644 libs/interproto/Cargo.toml
 create mode 100644 libs/interproto/README.md
 create mode 100644 libs/interproto/src/lib.rs

diff --git a/Cargo.toml b/Cargo.toml
index 5904fc1..348c03e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -56,4 +56,4 @@
 # systemd-units = { enable = false }
 
 [workspace]
-members = ["libs/easy-tun", "libs/fast-nat"]
+members = ["libs/easy-tun", "libs/fast-nat", "libs/interproto"]
diff --git a/libs/fast-nat/README.md b/libs/fast-nat/README.md
index e69de29..2144c63 100644
--- a/libs/fast-nat/README.md
+++ b/libs/fast-nat/README.md
@@ -0,0 +1,5 @@
+# Fast Network Address Table
+
+`fast-nat` is an OSI layer 3 Network Address Table built for speed.
+
+While this library can be used on its own just fine, it was designed for use in `protomask`.
diff --git a/libs/fast-nat/src/cpnat.rs b/libs/fast-nat/src/cpnat.rs
index 7d67f4b..e467013 100644
--- a/libs/fast-nat/src/cpnat.rs
+++ b/libs/fast-nat/src/cpnat.rs
@@ -15,11 +15,9 @@ pub struct CrossProtocolNetworkAddressTable {
 
 impl CrossProtocolNetworkAddressTable {
     /// Construct a new empty `CrossProtocolNetworkAddressTable`
+    #[must_use]
     pub fn new() -> Self {
-        Self {
-            addr_map: BiHashMap::new(),
-            timeouts: FxHashMap::default(),
-        }
+        Self::default()
     }
 
     /// Prune all old mappings
@@ -90,3 +88,12 @@ impl CrossProtocolNetworkAddressTable {
         self.addr_map.get_left(&ipv6.into()).copied()
     }
 }
+
+impl Default for CrossProtocolNetworkAddressTable {
+    fn default() -> Self {
+        Self {
+            addr_map: BiHashMap::new(),
+            timeouts: FxHashMap::default(),
+        }
+    }
+}
diff --git a/libs/fast-nat/src/lib.rs b/libs/fast-nat/src/lib.rs
index e0bc1f4..5a0e3fd 100644
--- a/libs/fast-nat/src/lib.rs
+++ b/libs/fast-nat/src/lib.rs
@@ -1,4 +1,8 @@
 #![doc = include_str!("../README.md")]
+#![deny(clippy::pedantic)]
+#![allow(clippy::module_name_repetitions)]
+#![allow(clippy::missing_errors_doc)]
+#![allow(clippy::missing_panics_doc)]
 
 mod bimap;
 mod cpnat;
diff --git a/libs/fast-nat/src/nat.rs b/libs/fast-nat/src/nat.rs
index d6bc175..e29263a 100644
--- a/libs/fast-nat/src/nat.rs
+++ b/libs/fast-nat/src/nat.rs
@@ -15,11 +15,9 @@ pub struct NetworkAddressTable {
 
 impl NetworkAddressTable {
     /// Construct a new empty `NetworkAddressTable`
+    #[must_use]
     pub fn new() -> Self {
-        Self {
-            addr_map: BiHashMap::new(),
-            timeouts: FxHashMap::default(),
-        }
+        Self::default()
     }
 
     /// Prune all old mappings
@@ -85,3 +83,12 @@ impl NetworkAddressTable {
         self.addr_map.get_left(&right.into()).copied()
     }
 }
+
+impl Default for NetworkAddressTable {
+    fn default() -> Self {
+        Self {
+            addr_map: BiHashMap::new(),
+            timeouts: FxHashMap::default(),
+        }
+    }
+}
\ No newline at end of file
diff --git a/libs/interproto/Cargo.toml b/libs/interproto/Cargo.toml
new file mode 100644
index 0000000..323d828
--- /dev/null
+++ b/libs/interproto/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "interproto"
+version = "0.1.0"
+authors = ["Evan Pratten <ewpratten@gmail.com>"]
+edition = "2021"
+description = "Utilities for translating packets between IPv4 and IPv6"
+readme = "README.md"
+homepage = "https://github.com/ewpratten/protomask/tree/master/libs/interproto"
+documentation = "https://docs.rs/interproto"
+repository = "https://github.com/ewpratten/protomask"
+license = "GPL-3.0"
+keywords = []
+categories = []
+
+[dependencies]
+log = "^0.4"
+pnet = "^0.34.0"
\ No newline at end of file
diff --git a/libs/interproto/README.md b/libs/interproto/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/libs/interproto/src/lib.rs b/libs/interproto/src/lib.rs
new file mode 100644
index 0000000..44f5417
--- /dev/null
+++ b/libs/interproto/src/lib.rs
@@ -0,0 +1,5 @@
+#![doc = include_str!("../README.md")]
+#![deny(clippy::pedantic)]
+#![allow(clippy::module_name_repetitions)]
+#![allow(clippy::missing_errors_doc)]
+#![allow(clippy::missing_panics_doc)]
\ No newline at end of file