update for DPDK 20.11-rc4, using rte_flow API

README.md

@@ -8,11 +8,12 @@ As a positive side effect the code becomes more compact as a lot of type paramet
 
 After parsing we specialize the parsed generic Header type to a specific Rust struct type, e.g. a struct IpHeader. Therefore we still utilize the full type checking capabilities of Rust at compile time and we lose nothing compared to the original code. 
 
-## following additional packages are needed to build NetBricks:
+## Some additional packages for building this branch:
+
+```
+dnf install jq
+```
 
-dnf install numactl-devel
-dnf install libpcap-devel
-dnf install kernel-devel
 
 ## The original NetBricks ReadMe:
 

build.sh

@@ -130,6 +130,7 @@ case $TASK in
         ;;
 
     test)
+        native
         pushd $BASE_DIR/framework
         export LD_LIBRARY_PATH="${NATIVE_LIB_PATH}:${DPDK_LD_PATH}:${TOOLS_BASE}:${LD_LIBRARY_PATH}"
 #        sudo -E env "PATH=$PATH" ${CARGO} test --release

framework/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "e2d2"
-version = "1.0.5"
+version = "1.0.6"
 authors = ["Aurojit Panda <[email protected]>", "rainer <[email protected]>"]
 build = "build.rs"
 

framework/src/interface/pdu.rs

@@ -428,44 +428,44 @@ impl<'a> Pdu<'a> {
     pub fn tcp_checksum_tx_offload(&self) -> bool {
         unsafe { (*self.mbuf).tcp_checksum_tx_offload() }
     }
-    /*
-        /// functions for tx offload
-        #[inline]
-        pub fn l2_len(&self) -> u64 {
-            unsafe { (*self.mbuf).l2_len() }
-        }
 
-        #[inline]
-        pub fn set_l2_len(&mut self, val: u64) {
-            unsafe {
-                (*self.mbuf).set_l2_len(val);
-            }
-        }
+    /// functions for tx offload
+    #[inline]
+    pub fn l2_len(&self) -> u64 {
+        unsafe { (*self.mbuf).l2_len() }
+    }
 
-        #[inline]
-        pub fn l3_len(&self) -> u64 {
-            unsafe { (*self.mbuf).l3_len() }
+    #[inline]
+    pub fn set_l2_len(&mut self, val: u64) {
+        unsafe {
+            (*self.mbuf).set_l2_len(val);
         }
+    }
 
-        #[inline]
-        pub fn set_l3_len(&mut self, val: u64) {
-            unsafe {
-                (*self.mbuf).set_l3_len(val);
-            }
-        }
+    #[inline]
+    pub fn l3_len(&self) -> u64 {
+        unsafe { (*self.mbuf).l3_len() }
+    }
 
-        #[inline]
-        pub fn l4_len(&self) -> u64 {
-            unsafe { (*self.mbuf).l4_len() }
+    #[inline]
+    pub fn set_l3_len(&mut self, val: u64) {
+        unsafe {
+            (*self.mbuf).set_l3_len(val);
         }
+    }
 
-        #[inline]
-        pub fn set_l4_len(&mut self, val: u64) {
-            unsafe {
-                (*self.mbuf).set_l4_len(val);
-            }
+    #[inline]
+    pub fn l4_len(&self) -> u64 {
+        unsafe { (*self.mbuf).l4_len() }
+    }
+
+    #[inline]
+    pub fn set_l4_len(&mut self, val: u64) {
+        unsafe {
+            (*self.mbuf).set_l4_len(val);
         }
-    */
+    }
+
     #[inline]
     pub fn ol_flags(&self) -> u64 {
         unsafe { (*self.mbuf).ol_flags }