bump vpnguin to support pcap;change external pcap filename to boolean

Author: zestrada

Dockerfile

@@ -7,7 +7,7 @@ ARG LINUX_VERSION="2.4.26"
 ARG LIBNVRAM_VERSION="0.0.16"
 ARG CONSOLE_VERSION="1.0.5"
 ARG PENGUIN_PLUGINS_VERSION="1.5.15"
-ARG VPN_VERSION="1.0.20"
+ARG VPN_VERSION="1.0.23"
 ARG HYPERFS_VERSION="0.0.38"
 ARG GUESTHOPPER_VERSION="1.0.15"
 ARG GLOW_VERSION="1.5.1"

docs/schema_doc.md

@@ -1175,9 +1175,9 @@ MAC Address for external network interface
 
 |||
 |-|-|
-|__Type__|string or null|
+|__Type__|boolean or null|
 |__Default__|`null`|
 
-Name of pcap file for capturing traffic over external net. Capture disabled if unset.
+Whether to capture traffic over the external net in a pcap file. The file will be called 'ext.pcap' in the output directory. Capture disabled if unset.
 
 

src/penguin/penguin_config/structure.py

@@ -780,10 +780,10 @@ class ExternalNetwork(BaseModel):
     #     description="Net for external interface (e.g., 10.0.2.0/24). Host will accessible via .2"
     # )
 
-    pcap: Optional[str] = Field(
+    pcap: Optional[bool] = Field(
         title="pcap file name",
         default=None,
-        description="Name of pcap file for capturing traffic over external net. Capture disabled if unset."
+        description="Whether to capture traffic over the external net in a pcap file. The file will be called 'ext.pcap' in the output directory. Capture disabled if unset."
     )
 
 

src/penguin/penguin_run.py

@@ -389,8 +389,8 @@ def run_config(
             # Supported in future versions of QEMU
             # if net := network["external"].get("net", None):
             #     arg_str += ",net={net}"
-            if pcap := network["external"].get("pcap", None):
-                pcap_path = os.path.join(out_dir, pcap)
+            if network["external"].get("pcap"):
+                pcap_path = os.path.join(out_dir, "ext.pcap")
                 arg_str += f" -object filter-dump,id=fext,netdev=ext,file={pcap_path}"
             args += shlex.split(arg_str)
             conf["env"]["IGLOO_EXT_MAC"] = mac