merged multi-auth branch back into trunk

1 files changed, 44 insertions, 0 deletions

diff --git a/testing/scripts/function.sh b/testing/scripts/function.sh
index 22fce327c..917c972c7 100755
--- a/testing/scripts/function.sh
+++ b/testing/scripts/function.sh
@@ -83,3 +83,47 @@ function searchandreplace {
     rm -f "$TMPFILE"
 
 }
+
+#############################################
+# add a bridge
+#
+
+function umlbr_add {
+	brctl addbr     "umlbr$1"
+	brctl setfd     "umlbr$1" 0
+	brctl setageing "umlbr$1" 3600
+	brctl stp       "umlbr$1" off
+	ifconfig        "umlbr$1" "$2" netmask "$3" up 
+}
+
+#############################################
+# delete a bridge
+#
+
+function umlbr_del {
+	ifconfig    "umlbr$1" down                     &> /dev/null 2>&1
+	brctl delbr "umlbr$1"                          &> /dev/null 2>&1
+}
+
+#############################################
+# add a tap interface to a bridge
+#
+
+function umlbr_add_tap {
+	tunctl -t "tap$1_$2"                           &> /dev/null 2>&1
+	ifconfig "tap$1_$2" 0.0.0.0 promisc up         &> /dev/null 2>&1
+	brctl addif "umlbr$1" "tap$1_$2"               &> /dev/null 2>&1
+	cecho-n "$2.."
+ }
+
+#############################################
+# delete a tap interface from a bridge
+#
+
+function umlbr_del_tap {
+	ifconfig "umlbr$2" down                        &> /dev/null 2>&1
+	brctl delif "umlbr$1" "tap$1_$2"               &> /dev/null 2>&1
+	tunctl -d "tap$1_$2"                           &> /dev/null 2>&1
+	cecho-n "$2.."
+ }
+