Test to remove

NordSecurity · Jan 16, 2025 · 30fb670 · 30fb670
1 parent 81e7dfd
commit 30fb670
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 51 deletions.
diff --git a/neptun/src/device/mod.rs b/neptun/src/device/mod.rs
@@ -1068,18 +1068,19 @@ impl Device {
                                 {
                                     break;
                                 }
-                                tracing::error!(
-                                    message="Fatal read error on tun interface: errno", error=?e
+                                println!(
+                                    "Fatal read error on tun interface {e}"
                                 );
                                 return Action::Exit;
                             }
                             Err(e) => {
-                                tracing::error!(
-                                    message="Unexpected error on tun interface", error=?e
+                                println!(
+                                    "Unexpected error on tun interface {e}"
                                 );
                                 return Action::Exit;
                             }
                         };
+                        println!("got data");
 
                         let dst_addr = match Tunn::dst_address(
                             &element.data[DATA_OFFSET..len + DATA_OFFSET],
@@ -1103,6 +1104,7 @@ impl Device {
                         }
 
                         let res = {
+                            println!("queueing for encap");
                             let mut tun = peer.tunnel.lock();
                             tun.queue_encapsulate(len, element, iter, peer.endpoint_ref(), &mut t.dst_buf[..])
                         };
@@ -1179,6 +1181,7 @@ fn send_to_network(
     udp6: Arc<Socket>,
 ) {
     while let Ok(msg) = network_rx.recv() {
+        println!("send_to_network");
         match &msg.res {
             NeptunResult::Done => {}
             NeptunResult::Err(e) => {

diff --git a/xtask/perf/left.sh b/xtask/perf/left.sh
@@ -1,24 +1,24 @@
 #!/bin/bash
 
-wireguard-go wg0
-wg set wg0 \
-    listen-port 51820 \
-    private-key <(echo AH7jKt6M0RS21MkRG+URrfgmwvJqdhVvqtKeF4WR+E8=) \
-    peer mqrc8+LD+6zvMeCtyCcIBPEYuXT74lq1Hros0Np8ZgA= \
-    allowed-ips 10.0.0.2/32 \
-    endpoint 176.0.0.3:51820
-ip address add dev wg0 10.0.0.1/24
-ip link set up dev wg0
+# wireguard-go wg0
+# wg set wg0 \
+#     listen-port 51820 \
+#     private-key <(echo AH7jKt6M0RS21MkRG+URrfgmwvJqdhVvqtKeF4WR+E8=) \
+#     peer mqrc8+LD+6zvMeCtyCcIBPEYuXT74lq1Hros0Np8ZgA= \
+#     allowed-ips 10.0.0.2/32 \
+#     endpoint 176.0.0.3:51820
+# ip address add dev wg0 10.0.0.1/24
+# ip link set up dev wg0
 
-/neptun/base/neptun-cli --disable-drop-privileges wg1
-wg set wg1 \
-    listen-port 51821 \
-    private-key <(echo sKZoT3qgxDm1bWny+1ttoi00qS2KXvo1L4Zb265wr3c=) \
-    peer CMWokCGH+YPN7CL2C2aAkDlnhw1blH0tKPOnEOgzrxM= \
-    allowed-ips 10.0.1.2/32 \
-    endpoint 176.0.0.3:51821
-ip address add dev wg1 10.0.1.1/24
-ip link set up dev wg1
+# /neptun/base/neptun-cli --disable-drop-privileges wg1
+# wg set wg1 \
+#     listen-port 51821 \
+#     private-key <(echo sKZoT3qgxDm1bWny+1ttoi00qS2KXvo1L4Zb265wr3c=) \
+#     peer CMWokCGH+YPN7CL2C2aAkDlnhw1blH0tKPOnEOgzrxM= \
+#     allowed-ips 10.0.1.2/32 \
+#     endpoint 176.0.0.3:51821
+# ip address add dev wg1 10.0.1.1/24
+# ip link set up dev wg1
 
 /neptun/current/neptun-cli --disable-drop-privileges wg2
 wg set wg2 \
@@ -30,17 +30,17 @@ wg set wg2 \
 ip address add dev wg2 10.0.2.1/24
 ip link set up dev wg2
 
-echo
-echo "Raw network:"
-iperf3 -i 10 -t  10 --bidir -c 176.0.0.3
+# echo
+# echo "Raw network:"
+# iperf3 -i 10 -t  10 --bidir -c 176.0.0.3
 
-echo
-echo "Wireguard-go:"
-iperf3 -i 60 -t 120 --bidir -c 10.0.0.2
+# echo
+# echo "Wireguard-go:"
+# iperf3 -i 60 -t 120 --bidir -c 10.0.0.2
 
-echo
-echo "Base NepTUN:"
-iperf3 -i 60 -t 120 --bidir -c 10.0.1.2
+# echo
+# echo "Base NepTUN:"
+# iperf3 -i 60 -t 120 --bidir -c 10.0.1.2
 
 echo
 echo "Current NepTUN:"

diff --git a/xtask/perf/right.sh b/xtask/perf/right.sh
@@ -1,24 +1,24 @@
 #!/bin/bash
 
-wireguard-go wg0
-wg set wg0 \
-    listen-port 51820 \
-    private-key <(echo MLBFYI9O69v8WdVodp4YucqnvW+onpD/R5kF/GE18F8=) \
-    peer 7gr2QZyPpaIdlsPcZcQozgpjDdCkefZtxz12Dmpj/3Y= \
-    allowed-ips 10.0.0.1/32 \
-    endpoint 176.0.0.2:51820
-ip address add dev wg0 10.0.0.2/24
-ip link set up dev wg0
+# wireguard-go wg0
+# wg set wg0 \
+#     listen-port 51820 \
+#     private-key <(echo MLBFYI9O69v8WdVodp4YucqnvW+onpD/R5kF/GE18F8=) \
+#     peer 7gr2QZyPpaIdlsPcZcQozgpjDdCkefZtxz12Dmpj/3Y= \
+#     allowed-ips 10.0.0.1/32 \
+#     endpoint 176.0.0.2:51820
+# ip address add dev wg0 10.0.0.2/24
+# ip link set up dev wg0
 
-/neptun/base/neptun-cli --disable-drop-privileges wg1
-wg set wg1 \
-    listen-port 51821 \
-    private-key <(echo WAoFbPJ6QaXXltwLqBADFkMG6qLZuivSlkIUv2Sc3lY=) \
-    peer HcDZRTIcI3Yok4XTwhAScKoNkb9MIZ2wyjS1oQvZnic= \
-    allowed-ips 10.0.1.1/32 \
-    endpoint 176.0.0.2:51821
-ip address add dev wg1 10.0.1.2/24
-ip link set up dev wg1
+# /neptun/base/neptun-cli --disable-drop-privileges wg1
+# wg set wg1 \
+#     listen-port 51821 \
+#     private-key <(echo WAoFbPJ6QaXXltwLqBADFkMG6qLZuivSlkIUv2Sc3lY=) \
+#     peer HcDZRTIcI3Yok4XTwhAScKoNkb9MIZ2wyjS1oQvZnic= \
+#     allowed-ips 10.0.1.1/32 \
+#     endpoint 176.0.0.2:51821
+# ip address add dev wg1 10.0.1.2/24
+# ip link set up dev wg1
 
 /neptun/current/neptun-cli --disable-drop-privileges wg2
 wg set wg2 \

diff --git a/xtask/src/perf.rs b/xtask/src/perf.rs
@@ -43,9 +43,9 @@ fn build_neptun_cli(dir: &str) {
 
 impl Cmd {
     pub fn run(&self) {
-        let worktree = GitWorktree::new("base", &self.base);
+        // let worktree = GitWorktree::new("base", &self.base);
         build_neptun_cli(".");
-        build_neptun_cli(&worktree.name);
+        // build_neptun_cli(&worktree.name);
 
         let sh = Shell::new().expect("Failed to create shell object");
         cmd!(