svn commit: r295442 - head/share/examples/jails

[Devin Teske]

Author: dteske
Date: Tue Feb  9 18:10:36 2016
New Revision: 295442
URL: https://svnweb.freebsd.org/changeset/base/295442

Log:
  Change MAC algo to support mixing w/jng interfaces

Modified:
  head/share/examples/jails/jib

Modified: head/share/examples/jails/jib
==============================================================================
--- head/share/examples/jails/jib	Tue Feb  9 18:08:40 2016	(r295441)
+++ head/share/examples/jails/jib	Tue Feb  9 18:10:36 2016	(r295442)
@@ -198,7 +198,8 @@ jib_addm()
 
 	mustberoot_to_continue
 
-	local iface iface_devid eiface_devid_a eiface_devid_b
+	local iface iface_devid eiface_devid
+	local eiface_devid_a eiface_devid_b
 	local new num quad i=0
 	for iface in $*; do
 
@@ -248,32 +249,28 @@ jib_addm()
 		# unique value preventing conflict.
 		#
 		iface_devid=$( ifconfig $iface ether | awk '/ether/,$0=$2' )
-		eiface_devid_a=${iface_devid#??:??:??}
-		eiface_devid_b=${iface_devid#??:??:??}
+		eiface_devid=${iface_devid#??:??:??}
 		num=$( set -- `echo -n $name | sum` && echo $1 )
 		quad=$(( $num & 15 ))
 		case "$quad" in
 		10) quad=a ;; 11) quad=b ;; 12) quad=c ;;
 		13) quad=d ;; 14) quad=e ;; 15) quad=f ;;
 		esac
-		eiface_devid_a=$quad$eiface_devid_a
-		eiface_devid_b=$quad$eiface_devid_b
+		eiface_devid=$quad$eiface_devid
 		num=$(( $num >> 4 ))
 		quad=$(( $num & 15 ))
 		case "$quad" in
 		10) quad=a ;; 11) quad=b ;; 12) quad=c ;;
 		13) quad=d ;; 14) quad=e ;; 15) quad=f ;;
 		esac
-		eiface_devid_a=$quad$eiface_devid_a
-		eiface_devid_b=$quad$eiface_devid_b
+		eiface_devid=$quad$eiface_devid
 		num=$(( $num >> 4 ))
 		quad=$(( $num & 15 ))
 		case "$quad" in
 		10) quad=a ;; 11) quad=b ;; 12) quad=c ;;
 		13) quad=d ;; 14) quad=e ;; 15) quad=f ;;
 		esac
-		eiface_devid_a=$quad:$eiface_devid_a
-		eiface_devid_b=$quad:$eiface_devid_b
+		eiface_devid=$quad:$eiface_devid
 		num=$(( $num >> 4 ))
 		quad=$(( $num & 15 ))
 		case "$quad" in
@@ -281,13 +278,13 @@ jib_addm()
 		13) quad=d ;; 14) quad=e ;; 15) quad=f ;;
 		esac
 		case "$iface_devid" in
-		?2:*|?6:*)
-			eiface_devid_a=a:$quad$eiface_devid_a
-			eiface_devid_b=e:$quad$eiface_devid_b
+		?[Ee]:*)
+			eiface_devid_a=2:$quad$eiface_devid
+			eiface_devid_b=6:$quad$eiface_devid
 			;;
 		*)
-			eiface_devid_a=2:$quad$eiface_devid_a
-			eiface_devid_b=6:$quad$eiface_devid_b
+			eiface_devid_a=2:$quad$eiface_devid
+			eiface_devid_b=e:$quad$eiface_devid
 		esac
 		eval num=\$_${iface}_num
 		if [ "$num" ]; then