From e2a33e69e360e2f08cda21f88218cd3b89eebe94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Thu, 30 May 2019 15:31:57 +0200
Subject: [PATCH] Handle empty ip and vif_type

---
 network/vif-route-qubes | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/network/vif-route-qubes b/network/vif-route-qubes
index 72b950a..81313c4 100755
--- a/network/vif-route-qubes
+++ b/network/vif-route-qubes
@@ -26,6 +26,26 @@ dir=$(dirname "$0")
 
 #main_ip=$(dom0_ip)
 
+# Network Hooks for triggering supplementary actions on AppVM connect
+network_hooks() {
+    local command="$1"
+    local vif="$2"
+    local addr="$3"
+
+    local vif_type
+    vif_type="$(xenstore-read "${XENBUS_PATH}/type")"
+
+    if [ -d /rw/config/network-hooks.d ]; then
+        for hook in /rw/config/network-hooks.d/*
+        do
+            if [ -x "$hook" ]; then
+                log debug "Executing network-hook $(basename "$hook")..."
+                do_without_error "${hook}" "${command}" "${vif}" "${vif_type}" "${addr}"
+            fi
+        done
+    fi
+}
+
 ipt_arg=
 if "iptables-restore" --help 2>&1 | grep -q wait=; then
     # 'wait' must be last on command line if secs not specified
@@ -109,14 +129,7 @@ if [ "${ip}" ]; then
         echo -e "*raw\\n$iptables_cmd -i ${vif} ! -s ${addr} -j DROP\\nCOMMIT" | \
             ${cmdprefix} $ipt --noflush $ipt_arg
 
-        # Network Hooks for triggering supplementary actions on AppVM connect
-        if [ -d /rw/config/network-hooks.d ]; then
-            for hook in /rw/config/network-hooks.d/*
-            do
-                log debug "Executing network-hook $(basename "$hook")..."
-                do_without_error "${hook}" "${command}" "${vif}" "${addr}"
-            done
-        fi
+        network_hooks "${command}" "${vif}" "${addr}"
     done
     # if no IPv6 is assigned, block all IPv6 traffic on that interface
     if ! [[ "$ip" = *:* ]]; then
@@ -127,6 +140,8 @@ if [ "${ip}" ]; then
     if [ "${back_ip6}" ] && [[ "${back_ip6}" != "fe80:"* ]]; then
         ${cmdprefix} ip addr "${ipcmd}" "${back_ip6}/128" dev "${vif}"
     fi
+else
+    network_hooks "${command}" "${vif}"
 fi
 
 log debug "Successful vif-route-qubes $command for $vif."