Add NAT settings.

Author: twittner

scripts/deploy-test-contract

@@ -13,7 +13,7 @@ DEPLOYMENT_FILE=$(mktemp -t timeboost-deployment-XXXXX)
 
 # Fund manager account && create deployment file
 cast send --value 1ether -r "$URL" --private-key "$FAUCET_PRIVATE_KEY" "$MANAGER_ADDRESS"
-env RUST_LOG=info cargo run --release --bin deploy -- \
+env RUST_LOG=info target/release/deploy \
     -m "$MANAGER_MNEMONIC" \
     -i "$MANAGER_ACCOUNT_INDEX" \
     -u "$URL" \
@@ -23,7 +23,7 @@ env RUST_LOG=info cargo run --release --bin deploy -- \
 km_addr=$(sed -nr 's/^key_manager.*=.*"(.+)"/\1/p' "$DEPLOYMENT_FILE")
 
 # Update the contract
-env RUST_LOG=info cargo run --release --bin register -- \
+env RUST_LOG=info target/release/register \
     -m "$MANAGER_MNEMONIC" \
     -i "$MANAGER_ACCOUNT_INDEX" \
     -u "$URL" \

test-configs/linux/net.toml

@@ -1,3 +1,8 @@
+[nat]
+table  = "nat"
+device = "eth0"
+cidr   = "10.0.0.0/8"
+
 [bridge]
 name = "bridge"
 cidr = "10.0.1.0/16"

test-utils/src/binaries/net-setup.rs

@@ -1,3 +1,5 @@
+#![cfg_attr(rustfmt, rustfmt_skip)]
+
 use std::{fs, path::PathBuf};
 
 use anyhow::{Result, ensure};
@@ -45,6 +47,15 @@ fn main() -> Result<()> {
                     dev.delay(&d.delay, &d.jitter)?
                 }
             }
+            if let Some(nat) = c.nat {
+                run_command(TRACE, ["iptables",
+                    "-t", &nat.table,
+                    "-A", "POSTROUTING",
+                    "-s", &nat.cidr.to_string(),
+                    "-o", &nat.device,
+                    "-j", "MASQUERADE"
+                ])?
+            }
         }
         Command::Delete { config } => {
             let t = fs::read(&config)?;
@@ -53,7 +64,10 @@ fn main() -> Result<()> {
             for d in c.device {
                 Device::new(&d).delete()?
             }
-            b.delete()?
+            b.delete()?;
+            if let Some(nat) = c.nat {
+                run_command(TRACE, ["iptables", "-t", &nat.table, "-F"])?
+            }
         }
     }
     Ok(())
@@ -77,7 +91,6 @@ impl Device {
         }
     }
 
-    #[rustfmt::skip]
     fn create(&self, b: &Bridge) -> Result<()> {
         ensure!(b.net.contains(&self.cidr));
         run_command(TRACE, ["ip", "netns", "add", &self.space])?;
@@ -91,7 +104,6 @@ impl Device {
         run_command(TRACE, ["ip", "netns", "exec", &self.space, "ip", "route", "add", "default",  "via",  &b.net.addr().to_string()])
     }
 
-    #[rustfmt::skip]
     fn delay(&self, delay: &Span, jitter: &Span) -> Result<()> {
         let d = format!("{}ms", delay.get_milliseconds());
         let j = format!("{}ms", jitter.get_milliseconds());
@@ -113,7 +125,6 @@ struct Bridge {
     net: Ipv4Net,
 }
 
-#[rustfmt::skip]
 impl Bridge {
     fn new(name: &str, ip: Ipv4Net) -> Self {
         Self { name: name.to_string(), net: ip }

test-utils/src/net.rs

@@ -6,6 +6,7 @@ use serde::Deserialize;
 pub struct Config {
     pub bridge: BridgeConfig,
     pub device: Vec<DeviceConfig>,
+    pub nat: Option<NatConfig>,
 }
 
 #[derive(Deserialize)]
@@ -27,6 +28,13 @@ pub struct DeviceConfig {
     pub jitter: Span,
 }
 
+#[derive(Deserialize)]
+pub struct NatConfig {
+    pub table: String,
+    pub device: String,
+    pub cidr: Ipv4Net,
+}
+
 impl DeviceConfig {
     pub fn namespace(&self) -> String {
         format!("ns-{}", self.name)