mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

inteno-netmodes: make shiftrange script work with LEDE

Browse source
This commit is contained in:
Sukru Senli 2018-01-02 14:18:30 +01:00
parent 77d8c53c77
commit cfbb84ef57
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
inteno-netmodes/files/etc/hotplug.d/iface/70-shiftrange
View file

@ -5,10 +5,9 @@
. /lib/functions.sh . /lib/functions.sh
. /lib/functions/network.sh . /lib/functions/network.sh
local lockfile="/tmp/70-shiftrange.lock" LOCKFILE="/tmp/70-shiftrange.lock"
local restricted_nets="" RESTRICTED_NETS=""
local all_nets="" ALL_NETS=""
##### #####
##### initial functions ##### initial functions
@ -30,8 +29,8 @@ initial_check()
finish() finish()
{ {
lock -u $lockfile lock -u $LOCKFILE
rm -f $lockfile rm -f $LOCKFILE
} }
# just one instance of this script at a time # just one instance of this script at a time
@ -41,13 +40,13 @@ just_one_instance()
local limit=10 local limit=10
#wait for the lock to become free #wait for the lock to become free
while [ -e $lockfile ] ; do while [ -e $LOCKFILE ] ; do
sleep 1 sleep 1
counter=$((counter + 1)) counter=$((counter + 1))
[ "$counter" -gt "$limit" ] && exit 1 [ "$counter" -gt "$limit" ] && exit 1
done done
lock $lockfile lock $LOCKFILE
trap finish EXIT INT TERM trap finish EXIT INT TERM
} }
@ -95,7 +94,7 @@ next_network_address()
local ip4=${ip%%/*} local ip4=${ip%%/*}
local ip=$((($ip1 << 24) + ($ip2 << 16) + ($ip3 << 8) + $ip4)) local ip=$((($ip1 << 24) + ($ip2 << 16) + ($ip3 << 8) + $ip4))
local one=$((1 << (32-$prefix))) local one="$((1 << (32-$prefix)))"
local new=$(($ip + $one)) local new=$(($ip + $one))
local n1=$((($new & 0xFF000000) >> 24)) local n1=$((($new & 0xFF000000) >> 24))
@ -135,7 +134,7 @@ shift_range()
{ {
local net="$1" local net="$1"
while true ; do while true ; do
if [ "$restricted_nets" == "${restricted_nets//$net/}" ] && [ "$all_nets" == "${all_nets//$net/}" ]; then if [ "$RESTRICTED_NETS" == "${RESTRICTED_NETS//$net/}" ] && [ "$ALL_NETS" == "${ALL_NETS//$net/}" ]; then
# found a net that is not in restricted nets nor in all nets # found a net that is not in restricted nets nor in all nets
break break
fi fi
@ -150,8 +149,8 @@ shift_range()
##### parse all interfaces section ##### parse all interfaces section
##### #####
# restricted_nets = all the IPs on wan interfaces # RESTRICTED_NETS = all the IPs on wan interfaces
# all_nets = all the IPs on any interface # ALL_NETS = all the IPs on any interface
parse_interface() parse_interface()
{ {
local interface=$1 local interface=$1
@ -165,13 +164,13 @@ parse_interface()
networks="$networks $(get_network_address $n)" networks="$networks $(get_network_address $n)"
done done
[ "$is_lan" != "1" ] && restricted_nets="$restricted_nets $networks" [ "$is_lan" != "1" ] && RESTRICTED_NETS="$RESTRICTED_NETS $networks"
all_nets="$all_nets $networks" ALL_NETS="$ALL_NETS $networks"
} }
# parse all the interfaces # parse all the interfaces
# get all the IPs on wan interfaces and store them in restrict_nets # get all the IPs on wan interfaces and store them in restrict_nets
# get all the IPs on all interfaces and store them in all_nets # get all the IPs on all interfaces and store them in ALL_NETS
parse_interfaces() parse_interfaces()
{ {
config_foreach parse_interface "interface" config_foreach parse_interface "interface"
@ -199,14 +198,14 @@ parse_lan()
for ip in $ips ; do for ip in $ips ; do
net="$(get_network_address $ip)" net="$(get_network_address $ip)"
if [ "$restricted_nets" == "${restricted_nets//$net/}" ] ; then if [ "$RESTRICTED_NETS" == "${RESTRICTED_NETS//$net/}" ] ; then
# net is not in restricted nets # net is not in restricted nets
# append ip to newips # append ip to newips
[ -z "$newips" ] && newips="${ip%/*}" || newips="$newips ${ip%/*}" [ -z "$newips" ] && newips="${ip%/*}" || newips="$newips ${ip%/*}"
continue continue
fi fi
#net is in restricted_nets #net is in RESTRICTED_NETS
local newnet=$(shift_range $net) local newnet=$(shift_range $net)
local newip="$(first_host_in_network $newnet)" local newip="$(first_host_in_network $newnet)"
# append newip to newips # append newip to newips
@ -229,7 +228,6 @@ parse_lans()
config_foreach parse_lan "interface" config_foreach parse_lan "interface"
} }
##### #####
##### main ##### main
##### #####