From 1157bfe91babd15cb5c8f93fe3e2498bad513fef Mon Sep 17 00:00:00 2001
From: Nadja Reitzenstein <me@dequbed.space>
Date: Sat, 5 Nov 2022 17:57:17 +0100
Subject: [PATCH] Small improvements

---
 .../common/blockentity/VxlanBlockEntity.java  | 22 +++++++++++++++++--
 .../cil/oc2/common/vxlan/TunnelManager.java   | 14 +++++-------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/main/java/li/cil/oc2/common/blockentity/VxlanBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/VxlanBlockEntity.java
index ac2323ff..4b97fd52 100644
--- a/src/main/java/li/cil/oc2/common/blockentity/VxlanBlockEntity.java
+++ b/src/main/java/li/cil/oc2/common/blockentity/VxlanBlockEntity.java
@@ -1,6 +1,7 @@
 package li.cil.oc2.common.blockentity;
 
 import li.cil.oc2.api.capabilities.NetworkInterface;
+import li.cil.oc2.common.Config;
 import li.cil.oc2.common.Constants;
 import li.cil.oc2.common.capabilities.Capabilities;
 import li.cil.oc2.common.util.LazyOptionalUtils;
@@ -16,7 +17,6 @@ import net.minecraftforge.common.util.LazyOptional;
 import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.Objects;
-import java.util.Queue;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.stream.Stream;
@@ -25,7 +25,8 @@ public final class VxlanBlockEntity extends ModBlockEntity implements NetworkInt
     private static final int TTL_COST = 1;
     //private int vti = ((int) (Math.random() * Integer.MAX_VALUE)) & 0x00ff_ffff;
     private int vti = 4037973;
-    private boolean initialized = false;
+    private int frameCount;
+    private long lastGameTime;
 
     private BlockingQueue<byte[]> packetQueue = new ArrayBlockingQueue<byte[]>(32);
 
@@ -55,6 +56,20 @@ public final class VxlanBlockEntity extends ModBlockEntity implements NetworkInt
 
     @Override
     public void writeEthernetFrame(final NetworkInterface source, final byte[] frame, final int timeToLive) {
+        if (level == null) {
+            return;
+        }
+
+        final long gameTime = level.getGameTime();
+        if (gameTime > lastGameTime) {
+            lastGameTime = gameTime;
+            frameCount = 1;
+        } else if (frameCount > Config.hubEthernetFramesPerTick) {
+            return;
+        } else {
+            frameCount++;
+        }
+
         getAdjacentInterfaces().forEach(adjacentInterface -> {
             if (adjacentInterface != source) {
                 adjacentInterface.writeEthernetFrame(this, frame, timeToLive - TTL_COST);
@@ -81,6 +96,9 @@ public final class VxlanBlockEntity extends ModBlockEntity implements NetworkInt
     @Override
     public void load(CompoundTag tag) {
         super.load(tag);
+        if (!level.isClientSide() && tag.contains("vti")) {
+            vti = tag.getInt("vti");
+        }
     }
 
     @Override
diff --git a/src/main/java/li/cil/oc2/common/vxlan/TunnelManager.java b/src/main/java/li/cil/oc2/common/vxlan/TunnelManager.java
index af3eae92..3e875e02 100644
--- a/src/main/java/li/cil/oc2/common/vxlan/TunnelManager.java
+++ b/src/main/java/li/cil/oc2/common/vxlan/TunnelManager.java
@@ -61,7 +61,7 @@ public class TunnelManager {
         if (Config.enable) {
             socket = new DatagramSocket(bindPort, bindHost);
         } else {
-            socket = null;
+            return;
         }
         LOGGER.printf(Level.INFO, "Bind successful: connected=%s bound=%s\n", socket.isConnected(), socket.isBound());
 
@@ -83,7 +83,7 @@ public class TunnelManager {
                 continue;
             }
 
-            System.out.println(vni);
+            LOGGER.debug("recv on vti " + vni);
 
             TunnelInterface iface = tunnels.get(vni);
 
@@ -91,11 +91,8 @@ public class TunnelManager {
                 byte[] inner = new byte[packet.getLength() - 8];
                 System.arraycopy(packet.getData(), 8, inner, 0, packet.getLength() - 8);
 
-                try {
-                    iface.packetQueue.add(inner);
-                } catch (IllegalStateException ignored) {
-                    LOGGER.error("Queue full");
-                }
+                // Ignore failed inserts
+                iface.packetQueue.offer(inner);
             }
         }
     }
@@ -147,10 +144,9 @@ public class TunnelManager {
             this.packetQueue = packetQueue;
         }
 
-
         @Override
         public byte[] readEthernetFrame() {
-            return new byte[0];
+            return null;
         }
 
         @Override