move ethernet, tcp, udp mods

drunkirishcoder · drunkirishcoder · commit 36ff6aee035e · 2021-03-31T16:44:14.000-04:00
diff --git a/bench/packets.rs b/bench/packets.rs
@@ -18,9 +18,11 @@
 
 use anyhow::Result;
 use capsule::fieldmap;
+use capsule::packets::ethernet::Ethernet;
 use capsule::packets::ip::v4::Ipv4;
 use capsule::packets::ip::v6::{Ipv6, SegmentRouting};
-use capsule::packets::{Ethernet, Mbuf, Packet, Udp4};
+use capsule::packets::udp::Udp4;
+use capsule::packets::{Mbuf, Packet};
 use capsule::testils::criterion::BencherExt;
 use capsule::testils::proptest::*;
 use capsule::testils::{PacketExt, Rvg};
diff --git a/core/src/packets/arp.rs b/core/src/packets/arp.rs
@@ -20,8 +20,9 @@
 
 use crate::ensure;
 use crate::net::MacAddr;
+use crate::packets::ethernet::{EtherTypes, Ethernet};
 use crate::packets::types::u16be;
-use crate::packets::{EtherTypes, Ethernet, Internal, Packet, SizeOf};
+use crate::packets::{Internal, Packet, SizeOf};
 use anyhow::{anyhow, Result};
 use std::fmt;
 use std::net::Ipv4Addr;
diff --git a/core/src/packets/ethernet.rs b/core/src/packets/ethernet.rs
@@ -16,6 +16,8 @@
 * SPDX-License-Identifier: Apache-2.0
 */
 
+//! Ethernet Protocol.
+
 use crate::ensure;
 use crate::net::MacAddr;
 use crate::packets::types::u16be;
diff --git a/core/src/packets/icmp/v4/echo_reply.rs b/core/src/packets/icmp/v4/echo_reply.rs
@@ -218,8 +218,9 @@ struct EchoReplyBody {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::ip::v4::Ipv4;
-    use crate::packets::{Ethernet, Mbuf};
+    use crate::packets::Mbuf;
 
     #[test]
     fn size_of_echo_reply_body() {
diff --git a/core/src/packets/icmp/v4/echo_request.rs b/core/src/packets/icmp/v4/echo_request.rs
@@ -219,8 +219,9 @@ struct EchoRequestBody {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::ip::v4::Ipv4;
-    use crate::packets::{Ethernet, Mbuf};
+    use crate::packets::Mbuf;
 
     #[test]
     fn size_of_echo_request_body() {
diff --git a/core/src/packets/icmp/v4/mod.rs b/core/src/packets/icmp/v4/mod.rs
@@ -446,8 +446,9 @@ pub trait Icmpv4Packet {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::ip::v4::Ipv4;
-    use crate::packets::{Ethernet, Mbuf};
+    use crate::packets::Mbuf;
     use crate::testils::byte_arrays::{ICMPV4_PACKET, IPV4_UDP_PACKET};
 
     #[test]
diff --git a/core/src/packets/icmp/v4/redirect.rs b/core/src/packets/icmp/v4/redirect.rs
@@ -215,8 +215,9 @@ impl Default for RedirectBody {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::ip::v4::Ipv4;
-    use crate::packets::{Ethernet, Mbuf};
+    use crate::packets::Mbuf;
     use crate::testils::byte_arrays::IPV4_TCP_PACKET;
 
     #[test]
diff --git a/core/src/packets/icmp/v4/time_exceeded.rs b/core/src/packets/icmp/v4/time_exceeded.rs
@@ -179,8 +179,9 @@ struct TimeExceededBody {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::ip::v4::Ipv4;
-    use crate::packets::{Ethernet, Mbuf};
+    use crate::packets::Mbuf;
     use crate::testils::byte_arrays::IPV4_TCP_PACKET;
 
     #[test]
diff --git a/core/src/packets/icmp/v6/echo_reply.rs b/core/src/packets/icmp/v6/echo_reply.rs
@@ -217,8 +217,9 @@ struct EchoReplyBody {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::ip::v6::Ipv6;
-    use crate::packets::{Ethernet, Mbuf};
+    use crate::packets::Mbuf;
 
     #[test]
     fn size_of_echo_reply_body() {
diff --git a/core/src/packets/icmp/v6/echo_request.rs b/core/src/packets/icmp/v6/echo_request.rs
@@ -218,8 +218,9 @@ struct EchoRequestBody {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::ip::v6::Ipv6;
-    use crate::packets::{Ethernet, Mbuf};
+    use crate::packets::Mbuf;
 
     #[test]
     fn size_of_echo_request_body() {
diff --git a/core/src/packets/icmp/v6/mod.rs b/core/src/packets/icmp/v6/mod.rs
@@ -498,9 +498,10 @@ pub trait Icmpv6Packet {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::icmp::v6::ndp::RouterAdvertisement;
     use crate::packets::ip::v6::Ipv6;
-    use crate::packets::{Ethernet, Mbuf};
+    use crate::packets::Mbuf;
     use crate::testils::byte_arrays::{ICMPV6_PACKET, IPV6_TCP_PACKET, ROUTER_ADVERT_PACKET};
 
     #[test]
diff --git a/core/src/packets/icmp/v6/ndp/mod.rs b/core/src/packets/icmp/v6/ndp/mod.rs
@@ -551,8 +551,8 @@ pub trait NdpOption<'a> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::ip::v6::Ipv6;
-    use crate::packets::Ethernet;
     use crate::testils::byte_arrays::ROUTER_ADVERT_PACKET;
 
     #[capsule::test]
diff --git a/core/src/packets/icmp/v6/ndp/neighbor_advert.rs b/core/src/packets/icmp/v6/ndp/neighbor_advert.rs
@@ -270,8 +270,9 @@ impl Default for NeighborAdvertisementBody {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::ip::v6::Ipv6;
-    use crate::packets::{Ethernet, Mbuf};
+    use crate::packets::Mbuf;
 
     #[test]
     fn size_of_neighbor_advertisement_body() {
diff --git a/core/src/packets/icmp/v6/ndp/neighbor_solicit.rs b/core/src/packets/icmp/v6/ndp/neighbor_solicit.rs
@@ -185,8 +185,9 @@ impl Default for NeighborSolicitationBody {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::ip::v6::Ipv6;
-    use crate::packets::{Ethernet, Mbuf};
+    use crate::packets::Mbuf;
 
     #[test]
     fn size_of_neighbor_solicitation_body() {
diff --git a/core/src/packets/icmp/v6/ndp/options/link_layer_addr.rs b/core/src/packets/icmp/v6/ndp/options/link_layer_addr.rs
@@ -190,9 +190,10 @@ impl Default for LinkLayerAddressFields {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::icmp::v6::ndp::{NdpPacket, RouterAdvertisement};
     use crate::packets::ip::v6::Ipv6;
-    use crate::packets::{Ethernet, Packet};
+    use crate::packets::Packet;
     use crate::testils::byte_arrays::ROUTER_ADVERT_PACKET;
 
     #[test]
diff --git a/core/src/packets/icmp/v6/ndp/options/mtu.rs b/core/src/packets/icmp/v6/ndp/options/mtu.rs
@@ -170,9 +170,10 @@ impl Default for MtuFields {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::icmp::v6::ndp::{NdpPacket, RouterAdvertisement};
     use crate::packets::ip::v6::Ipv6;
-    use crate::packets::{Ethernet, Packet};
+    use crate::packets::Packet;
     use crate::testils::byte_arrays::ROUTER_ADVERT_PACKET;
 
     #[test]
diff --git a/core/src/packets/icmp/v6/ndp/options/prefix_info.rs b/core/src/packets/icmp/v6/ndp/options/prefix_info.rs
@@ -308,9 +308,10 @@ impl Default for PrefixInformationFields {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::icmp::v6::ndp::{NdpPacket, RouterAdvertisement};
     use crate::packets::ip::v6::Ipv6;
-    use crate::packets::{Ethernet, Packet};
+    use crate::packets::Packet;
     use crate::testils::byte_arrays::ROUTER_ADVERT_PACKET;
 
     #[test]
diff --git a/core/src/packets/icmp/v6/ndp/options/redirected.rs b/core/src/packets/icmp/v6/ndp/options/redirected.rs
@@ -232,9 +232,10 @@ impl Default for RedirectedHeaderFields {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::icmp::v6::ndp::{NdpPacket, Redirect};
     use crate::packets::ip::v6::Ipv6;
-    use crate::packets::{Ethernet, Packet};
+    use crate::packets::Packet;
 
     #[test]
     fn size_of_redirected_header_fields() {
diff --git a/core/src/packets/icmp/v6/ndp/redirect.rs b/core/src/packets/icmp/v6/ndp/redirect.rs
@@ -241,8 +241,9 @@ impl Default for RedirectBody {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::ip::v6::Ipv6;
-    use crate::packets::{Ethernet, Mbuf};
+    use crate::packets::Mbuf;
 
     #[test]
     fn size_of_redirect_body() {
diff --git a/core/src/packets/icmp/v6/ndp/router_advert.rs b/core/src/packets/icmp/v6/ndp/router_advert.rs
@@ -301,8 +301,9 @@ struct RouterAdvertisementBody {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::ip::v6::Ipv6;
-    use crate::packets::{Ethernet, Mbuf};
+    use crate::packets::Mbuf;
 
     #[test]
     fn size_of_router_advertisement_body() {
diff --git a/core/src/packets/icmp/v6/ndp/router_solicit.rs b/core/src/packets/icmp/v6/ndp/router_solicit.rs
@@ -143,8 +143,9 @@ struct RouterSolicitationBody {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::ip::v6::Ipv6;
-    use crate::packets::{Ethernet, Mbuf};
+    use crate::packets::Mbuf;
 
     #[test]
     fn size_of_router_solicitation_body() {
diff --git a/core/src/packets/icmp/v6/time_exceeded.rs b/core/src/packets/icmp/v6/time_exceeded.rs
@@ -163,8 +163,9 @@ struct TimeExceededBody {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::ip::v6::Ipv6;
-    use crate::packets::{Ethernet, Mbuf};
+    use crate::packets::Mbuf;
     use crate::testils::byte_arrays::IPV6_TCP_PACKET;
 
     #[test]
diff --git a/core/src/packets/icmp/v6/too_big.rs b/core/src/packets/icmp/v6/too_big.rs
@@ -188,8 +188,9 @@ struct PacketTooBigBody {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::ip::v6::Ipv6;
-    use crate::packets::{Ethernet, Mbuf};
+    use crate::packets::Mbuf;
     use crate::testils::byte_arrays::IPV6_TCP_PACKET;
 
     #[test]
diff --git a/core/src/packets/icmp/v6/unreachable.rs b/core/src/packets/icmp/v6/unreachable.rs
@@ -163,8 +163,9 @@ struct DestinationUnreachableBody {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::ip::v6::Ipv6;
-    use crate::packets::{Ethernet, Mbuf};
+    use crate::packets::Mbuf;
     use crate::testils::byte_arrays::IPV6_TCP_PACKET;
 
     #[test]
diff --git a/core/src/packets/ip/v4.rs b/core/src/packets/ip/v4.rs
@@ -20,9 +20,10 @@
 
 use crate::ensure;
 use crate::packets::checksum::{self, PseudoHeader};
+use crate::packets::ethernet::{EtherTypes, Ethernet};
 use crate::packets::ip::{IpPacket, ProtocolNumber, DEFAULT_IP_TTL};
 use crate::packets::types::u16be;
-use crate::packets::{EtherTypes, Ethernet, Internal, Packet, SizeOf};
+use crate::packets::{Internal, Packet, SizeOf};
 use anyhow::{anyhow, Result};
 use std::fmt;
 use std::net::{IpAddr, Ipv4Addr};
diff --git a/core/src/packets/ip/v6/fragment.rs b/core/src/packets/ip/v6/fragment.rs
@@ -329,8 +329,9 @@ struct FragmentHeader {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::ip::v6::Ipv6;
-    use crate::packets::{Ethernet, Mbuf};
+    use crate::packets::Mbuf;
     use crate::testils::byte_arrays::{IPV6_FRAGMENT_PACKET, IPV6_TCP_PACKET};
 
     #[test]
diff --git a/core/src/packets/ip/v6/mod.rs b/core/src/packets/ip/v6/mod.rs
@@ -26,9 +26,10 @@ pub use self::srh::*;
 
 use crate::ensure;
 use crate::packets::checksum::PseudoHeader;
+use crate::packets::ethernet::{EtherTypes, Ethernet};
 use crate::packets::ip::{IpPacket, ProtocolNumber, DEFAULT_IP_TTL};
 use crate::packets::types::{u16be, u32be};
-use crate::packets::{EtherTypes, Ethernet, Internal, Packet, SizeOf};
+use crate::packets::{Internal, Packet, SizeOf};
 use anyhow::{anyhow, Result};
 use std::fmt;
 use std::net::{IpAddr, Ipv6Addr};
diff --git a/core/src/packets/ip/v6/srh.rs b/core/src/packets/ip/v6/srh.rs
@@ -523,9 +523,11 @@ impl Default for SegmentRoutingHeader {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::ip::v6::Ipv6;
     use crate::packets::ip::ProtocolNumbers;
-    use crate::packets::{Ethernet, Mbuf, Tcp, Tcp6};
+    use crate::packets::tcp::{Tcp, Tcp6};
+    use crate::packets::Mbuf;
     use crate::testils::byte_arrays::{IPV6_TCP_PACKET, SR_TCP_PACKET};
 
     #[test]
diff --git a/core/src/packets/mbuf.rs b/core/src/packets/mbuf.rs
@@ -16,8 +16,8 @@
 * SPDX-License-Identifier: Apache-2.0
 */
 
-use super::{Internal, Packet, SizeOf};
 use crate::ffi::dpdk::{self, MbufPtr};
+use crate::packets::{Internal, Packet, SizeOf};
 use crate::runtime::Mempool;
 use crate::{ensure, trace};
 use anyhow::Result;
diff --git a/core/src/packets/mod.rs b/core/src/packets/mod.rs
@@ -20,20 +20,17 @@
 
 pub mod arp;
 pub mod checksum;
-mod ethernet;
+pub mod ethernet;
 pub mod icmp;
 pub mod ip;
 mod mbuf;
 mod size_of;
-mod tcp;
+pub mod tcp;
 pub mod types;
-mod udp;
+pub mod udp;
 
-pub use self::ethernet::*;
 pub use self::mbuf::*;
 pub use self::size_of::*;
-pub use self::tcp::*;
-pub use self::udp::*;
 pub use capsule_macros::SizeOf;
 
 use anyhow::{Context, Result};
@@ -358,7 +355,9 @@ pub enum Postmark {
 mod tests {
     use super::*;
     use crate::net::MacAddr;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::ip::v4::Ipv4;
+    use crate::packets::udp::Udp4;
     use crate::testils::byte_arrays::IPV4_UDP_PACKET;
 
     #[capsule::test]
diff --git a/core/src/packets/tcp.rs b/core/src/packets/tcp.rs
@@ -16,6 +16,8 @@
 * SPDX-License-Identifier: Apache-2.0
 */
 
+//! Transmission Control Protocol.
+
 use crate::ensure;
 use crate::packets::ip::v4::Ipv4;
 use crate::packets::ip::v6::Ipv6;
@@ -664,8 +666,9 @@ impl Default for TcpHeader {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::packets::ethernet::Ethernet;
     use crate::packets::ip::v6::SegmentRouting;
-    use crate::packets::{Ethernet, Mbuf};
+    use crate::packets::Mbuf;
     use crate::testils::byte_arrays::{IPV4_TCP_PACKET, IPV4_UDP_PACKET, SR_TCP_PACKET};
     use std::net::{Ipv4Addr, Ipv6Addr};
 
diff --git a/core/src/packets/udp.rs b/core/src/packets/udp.rs
@@ -16,6 +16,8 @@
 * SPDX-License-Identifier: Apache-2.0
 */
 
+//! User Datagram Protocol.
+
 use crate::ensure;
 use crate::packets::ip::v4::Ipv4;
 use crate::packets::ip::v6::Ipv6;
@@ -386,7 +388,8 @@ struct UdpHeader {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::packets::{Ethernet, Mbuf};
+    use crate::packets::ethernet::Ethernet;
+    use crate::packets::Mbuf;
     use crate::testils::byte_arrays::{IPV4_TCP_PACKET, IPV4_UDP_PACKET};
     use std::net::{Ipv4Addr, Ipv6Addr};
 
diff --git a/core/src/testils/packet.rs b/core/src/testils/packet.rs
diff --git a/core/src/testils/proptest/strategy.rs b/core/src/testils/proptest/strategy.rs
diff --git a/examples/kni/main.rs b/examples/kni/main.rs
diff --git a/examples/nat64/main.rs b/examples/nat64/main.rs
diff --git a/examples/ping4d/main.rs b/examples/ping4d/main.rs
diff --git a/examples/pktdump/main.rs b/examples/pktdump/main.rs
diff --git a/examples/syn-flood/main.rs b/examples/syn-flood/main.rs
