From 30f1fdd36559899dcd53d0620b1a0c4e7cebdc29 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackware.com>
Date: Thu, 9 Mar 2017 16:14:46 -0600
Subject: rc.inet1{,.conf}: Allow create/destroy of virtual tun/tap devices

---
 rc.inet1 | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'rc.inet1')

diff --git a/rc.inet1 b/rc.inet1
index 5f9c29d..2f982ca 100644
--- a/rc.inet1
+++ b/rc.inet1
@@ -73,6 +73,31 @@ lo_down() {
 # INTERFACE FUNCTIONS #
 #######################
 
+# Function to determine if virtual interfaces are defined
+virtif_determine() {
+  if [ ! -z ${VIRTIFNAME} ]; then
+    virtifcount=$(echo ${VIRTIFNAME[@]} | wc -w)
+  else
+    return 1
+  fi
+}
+
+# Function to create virtual interfaces
+virtif_create() {
+  # argument is 'i' - the position of this interface in the IFNAME array.
+  for i in $(seq 0 ${virtifcount}); do
+    /sbin/ip tuntap add dev ${VIRTIFNAME[$i]} mode ${VIRTIFTYPE[$i]} user ${VIRTIFUSER[$i]} group ${VIRTIFGROUP[$i]}
+  done
+}
+
+# Function to destory virtual interfaces
+virtif_destroy() {
+  # argument is 'i' - the position of this interface in the IFNAME array.
+  for i in $(seq 0 ${virtifcount}); do
+    /sbin/ip tuntap del dev ${VIRTIFNAME[$i]} mode ${VIRTIFTYPE[$i]}
+  done
+}
+
 # Function to assemble a bridge interface.
 br_open() {
   # argument is 'i' - the position of this interface in the IFNAME array.
@@ -256,6 +281,7 @@ gateway_down() {
 # Function to start the network:
 start() {
   lo_up
+  virtif_determine && virtif_create
   for i in ${IFNAME[@]} ; do
     if_up $i
   done
@@ -268,6 +294,7 @@ stop() {
   for i in ${IFNAME[@]} ; do
     if_down $i
   done
+  virtif_determine && virtif_destroy
   lo_down
 }
 
-- 
cgit v1.2.3


From 6d9819e53e571df0b657fa12535290f59c031113 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackware.com>
Date: Wed, 12 Jul 2017 02:11:28 -0500
Subject: rc.inet1: fix index number usage in virtual interface setup/destroy

---
 rc.inet1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rc.inet1')

diff --git a/rc.inet1 b/rc.inet1
index 2f982ca..9ab5102 100644
--- a/rc.inet1
+++ b/rc.inet1
@@ -76,7 +76,7 @@ lo_down() {
 # Function to determine if virtual interfaces are defined
 virtif_determine() {
   if [ ! -z ${VIRTIFNAME} ]; then
-    virtifcount=$(echo ${VIRTIFNAME[@]} | wc -w)
+    virtifcount=$(expr $(echo ${VIRTIFNAME[@]} | wc -w) - 1)
   else
     return 1
   fi
-- 
cgit v1.2.3


From 6281b5d47da57004b1d00f1a9946f5af6cca38a0 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackware.com>
Date: Thu, 13 Jul 2017 19:11:47 -0500
Subject: rc.inet1: Use bash builtin arithmetic instead of external expr

---
 rc.inet1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rc.inet1')

diff --git a/rc.inet1 b/rc.inet1
index 9ab5102..871b38d 100644
--- a/rc.inet1
+++ b/rc.inet1
@@ -76,7 +76,7 @@ lo_down() {
 # Function to determine if virtual interfaces are defined
 virtif_determine() {
   if [ ! -z ${VIRTIFNAME} ]; then
-    virtifcount=$(expr $(echo ${VIRTIFNAME[@]} | wc -w) - 1)
+    virtifcount=$(($(echo ${VIRTIFNAME[@]} | wc -w) - 1))
   else
     return 1
   fi
-- 
cgit v1.2.3