d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust MAC algo to support interface branching

Browse Source
This commit is contained in:
Devin Teske 2016-02-09 01:41:03 +00:00
parent 214d450501
commit 78a38b8f05
2 changed files with 61 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
share/examples/jails/jib
View File

@ -227,32 +227,37 @@ jib_addm()
# 6. Set the MAC address of the new interface using a sensible # 6. Set the MAC address of the new interface using a sensible
# algorithm to prevent conflicts on the network. # algorithm to prevent conflicts on the network.
# #
# The formula I'm using is ``SP:SS:SI:II:II:II'' where: # The formula I'm using is ``NP:SS:SS:II:II:II'' where:
# + S denotes 16 bits of sum(1) data, split because P (below). # + N denotes 4 bits used as a counter to support branching
# each parent interface up to 15 times under the same jail
# name (see S below).
# + P denotes the special nibble whose value, if one of # + P denotes the special nibble whose value, if one of
# 2, 6, A, or E (but usually 2) denotes a privately # 2, 6, A, or E (but usually 2) denotes a privately
# administered MAC address (while remaining routable). # administered MAC address (while remaining routable).
# + S denotes 16 bits, the sum(1) value of the jail name.
# + I denotes bits that are inherited from parent interface. # + I denotes bits that are inherited from parent interface.
# #
# The S bits are a CRC-16 checksum of NAME, allowing the jail # The S bits are a CRC-16 checksum of NAME, allowing the jail
# to change the epair(4) generation order without affecting the # to change the epair(4) generation order without affecting the
# MAC address. Meanwhile, if the jail NAME changes (e.g., it # MAC address. Meanwhile, if...
# was duplicated and given a new name with no other changes), # + the jail NAME changes (e.g., it was duplicated and given
# the underlying network interface changes, or the jail is # a new name with no other changes)
# moved to another host, the MAC address will be recalculated # + the underlying network interface changes
# to a new, similarly unique value preventing conflict. # + the jail is moved to another host
# the MAC address will be recalculated to a new, similarly
# unique value preventing conflict.
# #
iface_devid=$( ifconfig $iface ether | awk '/ether/,$0=$2' ) iface_devid=$( ifconfig $iface ether | awk '/ether/,$0=$2' )
eiface_devid_a=${iface_devid#??:??:?} eiface_devid_a=${iface_devid#??:??:??}
eiface_devid_b=${iface_devid#??:??:?} eiface_devid_b=${iface_devid#??:??:??}
num=$( set -- `echo -n $name | sum` && echo $1 ) num=$( set -- `echo -n $name | sum` && echo $1 )
quad=$(( $num & 15 )) quad=$(( $num & 15 ))
case "$quad" in case "$quad" in
10) quad=a ;; 11) quad=b ;; 12) quad=c ;; 10) quad=a ;; 11) quad=b ;; 12) quad=c ;;
13) quad=d ;; 14) quad=e ;; 15) quad=f ;; 13) quad=d ;; 14) quad=e ;; 15) quad=f ;;
esac esac
eiface_devid_a=:$quad$eiface_devid_a eiface_devid_a=$quad$eiface_devid_a
eiface_devid_b=:$quad$eiface_devid_b eiface_devid_b=$quad$eiface_devid_b
num=$(( $num >> 4 )) num=$(( $num >> 4 ))
quad=$(( $num & 15 )) quad=$(( $num & 15 ))
case "$quad" in case "$quad" in
@ -267,6 +272,14 @@ jib_addm()
10) quad=a ;; 11) quad=b ;; 12) quad=c ;; 10) quad=a ;; 11) quad=b ;; 12) quad=c ;;
13) quad=d ;; 14) quad=e ;; 15) quad=f ;; 13) quad=d ;; 14) quad=e ;; 15) quad=f ;;
esac esac
eiface_devid_a=$quad:$eiface_devid_a
eiface_devid_b=$quad:$eiface_devid_b
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
case "$iface_devid" in case "$iface_devid" in
?2:*|?6:*) ?2:*|?6:*)
eiface_devid_a=a:$quad$eiface_devid_a eiface_devid_a=a:$quad$eiface_devid_a
@ -276,7 +289,14 @@ jib_addm()
eiface_devid_a=2:$quad$eiface_devid_a eiface_devid_a=2:$quad$eiface_devid_a
eiface_devid_b=6:$quad$eiface_devid_b eiface_devid_b=6:$quad$eiface_devid_b
esac esac
num=$(( $num >> 4 )) eval num=\$_${iface}_num
if [ "$num" ]; then
num=$(( $num + 1 ))
eval _${iface}_num=$num
else
num=0
local _${iface}_num=$num
fi
quad=$(( $num & 15 )) quad=$(( $num & 15 ))
case "$quad" in case "$quad" in
10) quad=a ;; 11) quad=b ;; 12) quad=c ;; 10) quad=a ;; 11) quad=b ;; 12) quad=c ;;

39
share/examples/jails/jng
View File

@ -260,30 +260,35 @@ jng_bridge()
# 6. Set the MAC address of the new interface using a sensible # 6. Set the MAC address of the new interface using a sensible
# algorithm to prevent conflicts on the network. # algorithm to prevent conflicts on the network.
# #
# The formula I'm using is ``SP:SS:SI:II:II:II'' where: # The formula I'm using is ``NP:SS:SS:II:II:II'' where:
# + S denotes 16 bits of sum(1) data, split because P (below). # + N denotes 4 bits used as a counter to support branching
# each parent interface up to 15 times under the same jail
# name (see S below).
# + P denotes the special nibble whose value, if one of # + P denotes the special nibble whose value, if one of
# 2, 6, A, or E (but usually 2) denotes a privately # 2, 6, A, or E (but usually 2) denotes a privately
# administered MAC address (while remaining routable). # administered MAC address (while remaining routable).
# + S denotes 16 bits, the sum(1) value of the jail name.
# + I denotes bits that are inherited from parent interface. # + I denotes bits that are inherited from parent interface.
# #
# The S bits are a CRC-16 checksum of NAME, allowing the jail # The S bits are a CRC-16 checksum of NAME, allowing the jail
# to change link numbers in ng_bridge(4) without affecting the # to change link numbers in ng_bridge(4) without affecting the
# MAC address. Meanwhile, if the jail NAME changes (e.g., it # MAC address. Meanwhile, if...
# was duplicated and given a new name with no other changes), # + the jail NAME changes (e.g., it was duplicated and given
# the underlying network interface changes, or the jail is # a new name with no other changes)
# moved to another host, the MAC address will be recalculated # + the underlying network interface changes
# to a new, similarly unique value preventing conflict. # + the jail is moved to another host
# the MAC address will be recalculated to a new, similarly
# unique value preventing conflict.
# #
iface_devid=$( ifconfig $iface ether | awk '/ether/,$0=$2' ) iface_devid=$( ifconfig $iface ether | awk '/ether/,$0=$2' )
eiface_devid=${iface_devid#??:??:?} eiface_devid=${iface_devid#??:??:??}
num=$( set -- `echo -n $name | sum` && echo $1 ) num=$( set -- `echo -n $name | sum` && echo $1 )
quad=$(( $num & 15 )) quad=$(( $num & 15 ))
case "$quad" in case "$quad" in
10) quad=a ;; 11) quad=b ;; 12) quad=c ;; 10) quad=a ;; 11) quad=b ;; 12) quad=c ;;
13) quad=d ;; 14) quad=e ;; 15) quad=f ;; 13) quad=d ;; 14) quad=e ;; 15) quad=f ;;
esac esac
eiface_devid=:$quad$eiface_devid eiface_devid=$quad$eiface_devid
num=$(( $num >> 4 )) num=$(( $num >> 4 ))
quad=$(( $num & 15 )) quad=$(( $num & 15 ))
case "$quad" in case "$quad" in
@ -297,11 +302,25 @@ jng_bridge()
10) quad=a ;; 11) quad=b ;; 12) quad=c ;; 10) quad=a ;; 11) quad=b ;; 12) quad=c ;;
13) quad=d ;; 14) quad=e ;; 15) quad=f ;; 13) quad=d ;; 14) quad=e ;; 15) quad=f ;;
esac esac
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
case "$iface_devid" in case "$iface_devid" in
?2:*) eiface_devid=a:$quad$eiface_devid ;; ?2:*) eiface_devid=a:$quad$eiface_devid ;;
*) eiface_devid=2:$quad$eiface_devid *) eiface_devid=2:$quad$eiface_devid
esac esac
num=$(( $num >> 4 )) eval num=\$_${iface}_num
if [ "$num" ]; then
num=$(( $num + 1 ))
eval _${iface}_num=$num
else
num=0
local _${iface}_num=$num
fi
quad=$(( $num & 15 )) quad=$(( $num & 15 ))
case "$quad" in case "$quad" in
10) quad=a ;; 11) quad=b ;; 12) quad=c ;; 10) quad=a ;; 11) quad=b ;; 12) quad=c ;;