mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
Kernel 5.4 RUTX support
This commit is contained in:
Ycarus (Yannick Chabanois)
parent
839fcf1cab
commit
cfce9f52b2
7376 changed files with 3902 additions and 546 deletions
|
|
@ -10,24 +10,33 @@ CFG=/etc/board.json
|
|||
[ -s /etc/config/system ] && \
|
||||
[ -s /etc/config/hwinfo ] && \
|
||||
[ -s /etc/config/blesem ] && \
|
||||
[ -s /etc/config/poe ] && \
|
||||
exit 0
|
||||
|
||||
generate_bridge() {
|
||||
local name=$1
|
||||
local macaddr=$2
|
||||
uci -q batch <<-EOF
|
||||
set network.$name=device
|
||||
set network.$name.name=$name
|
||||
set network.$name.type=bridge
|
||||
EOF
|
||||
if [ -n "$macaddr" ]; then
|
||||
uci -q batch <<-EOF
|
||||
set network.$name.macaddr=$macaddr
|
||||
EOF
|
||||
fi
|
||||
}
|
||||
|
||||
generate_static_network() {
|
||||
uci -q batch <<-EOF
|
||||
delete network.loopback
|
||||
set network.loopback='interface'
|
||||
set network.loopback.ifname='lo'
|
||||
set network.loopback.device='lo'
|
||||
set network.loopback.proto='static'
|
||||
set network.loopback.ipaddr='127.0.0.1'
|
||||
set network.loopback.netmask='255.0.0.0'
|
||||
EOF
|
||||
[ -e /proc/sys/net/ipv6 ] && {
|
||||
uci -q batch <<-EOF
|
||||
delete network.globals
|
||||
set network.globals='globals'
|
||||
set network.globals.ula_prefix='auto'
|
||||
EOF
|
||||
}
|
||||
|
||||
if json_is_a dsl object; then
|
||||
json_select dsl
|
||||
|
|
@ -65,9 +74,30 @@ generate_static_network() {
|
|||
fi
|
||||
}
|
||||
|
||||
ip6assign=
|
||||
disable_vlan=
|
||||
apply_network_options() {
|
||||
json_select network_options && {
|
||||
json_get_vars ip6assign ula disable_vlan
|
||||
json_select ..
|
||||
}
|
||||
[ -z "$ip6assign" ] && ip6assign=1
|
||||
[ -z "$ula" ] && ula=1
|
||||
|
||||
[ -e /proc/sys/net/ipv6 ] && [ "$ula" = 1 ] && {
|
||||
uci -q batch <<-EOF
|
||||
delete network.globals
|
||||
set network.globals='globals'
|
||||
set network.globals.ula_prefix='auto'
|
||||
EOF
|
||||
}
|
||||
}
|
||||
|
||||
metric=1
|
||||
addr_offset=2
|
||||
generate_network() {
|
||||
local keys var val ifname macaddr proto type ipaddr netmask
|
||||
local ports device macaddr proto type ipaddr netmask vlan no_metric
|
||||
local bridge=$2
|
||||
|
||||
uci -q batch <<-EOF
|
||||
delete "network.$1"
|
||||
|
|
@ -76,46 +106,88 @@ generate_network() {
|
|||
|
||||
json_select network
|
||||
json_select "$1"
|
||||
json_get_keys keys
|
||||
for var in $keys; do
|
||||
json_get_var val "$var"
|
||||
[ "${var#_*}" = "$var" ] && {
|
||||
eval "$var=\"\$val\""
|
||||
uci -q set "network.$1.$var=$val"
|
||||
}
|
||||
done
|
||||
json_get_vars device macaddr proto ipaddr netmask vlan ipv6 guest type
|
||||
json_get_values ports ports
|
||||
json_select ..
|
||||
json_select ..
|
||||
|
||||
#~ [ -n "$ifname" ] || return
|
||||
|
||||
# force bridge for multi-interface devices (and lan)
|
||||
case "$1:$ifname" in
|
||||
*\ * | lan:*)
|
||||
type="bridge"
|
||||
uci -q set "network.$1.type=$type"
|
||||
;;
|
||||
esac
|
||||
json_select network_options && {
|
||||
json_get_vars no_metric
|
||||
json_select ..
|
||||
}
|
||||
|
||||
# Force bridge for "lan" as it may have other devices (e.g. wireless)
|
||||
# bridged
|
||||
[ "$1" = "lan" ] && [ -z "$ports" ] && {
|
||||
ports="$device"
|
||||
}
|
||||
|
||||
[ -n "$ports" ] && [ -z "$bridge" ] && {
|
||||
|
||||
[ -n "$macaddr" ] && {
|
||||
for port in $ports; do
|
||||
uci -q batch <<-EOF
|
||||
add network device
|
||||
set network.@device[-1].name='$port'
|
||||
set network.@device[-1].macaddr='$macaddr'
|
||||
EOF
|
||||
done
|
||||
}
|
||||
|
||||
uci -q batch <<-EOF
|
||||
add network device
|
||||
rename network.@device[-1]='br_$1'
|
||||
set network.@device[-1].name='br-$1'
|
||||
set network.@device[-1].type='bridge'
|
||||
EOF
|
||||
|
||||
[ -n "$device" ] && uci add_list network.@device[-1].ports="$device" || {
|
||||
for port in $ports; do
|
||||
uci add_list network.@device[-1].ports="$port"
|
||||
done
|
||||
}
|
||||
|
||||
device=br-$1
|
||||
type=
|
||||
macaddr=""
|
||||
|
||||
json_select hwinfo
|
||||
json_get_vars dsa
|
||||
json_select ..
|
||||
|
||||
}
|
||||
|
||||
if [ -n "$macaddr" ]; then
|
||||
for name in $ifname; do
|
||||
uci -q batch <<-EOF
|
||||
delete network.$1_${name/./_}_dev
|
||||
set network.$1_${name/./_}_dev='device'
|
||||
set network.$1_${name/./_}_dev.name='$name'
|
||||
set network.$1_${name/./_}_dev.macaddr='$macaddr'
|
||||
EOF
|
||||
done
|
||||
uci -q batch <<-EOF
|
||||
add network device
|
||||
set network.@device[-1].name='$device'
|
||||
set network.@device[-1].macaddr='$macaddr'
|
||||
EOF
|
||||
fi
|
||||
|
||||
uci -q batch <<-EOF
|
||||
delete network.$1
|
||||
set network.$1='interface'
|
||||
set network.$1.type='$type'
|
||||
set network.$1.device='$device'
|
||||
set network.$1.proto='none'
|
||||
EOF
|
||||
[ "$1" != "lan" ] && metric=$((metric+1))
|
||||
[ "$guest" = "1" ] && uci set network.$1.guest='1'
|
||||
|
||||
case "$proto" in
|
||||
static)
|
||||
local ipad
|
||||
local ipad metr
|
||||
case "$1" in
|
||||
lan)
|
||||
ipad=${ipaddr:-"192.168.100.1"}
|
||||
ipad="192.168.100.1"
|
||||
metr=1
|
||||
;;
|
||||
*)
|
||||
ipad=${ipaddr:-"192.168.$((addr_offset++)).1"}
|
||||
metr="$metric"
|
||||
;;
|
||||
*) ipad=${ipaddr:-"192.168.$((addr_offset++)).1"} ;;
|
||||
esac
|
||||
|
||||
netm=${netmask:-"255.255.255.0"}
|
||||
|
|
@ -124,26 +196,33 @@ generate_network() {
|
|||
set network.$1.proto='static'
|
||||
set network.$1.ipaddr='$ipad'
|
||||
set network.$1.netmask='$netm'
|
||||
set network.$1.metric='$metr'
|
||||
EOF
|
||||
[ -e /proc/sys/net/ipv6 ] && uci set network.$1.ip6assign='60'
|
||||
|
||||
[ "$ipv6" = "1" ] && uci set network.$1.ipv6="$ipv6"
|
||||
[ -e /proc/sys/net/ipv6 ] && [ "$ip6assign" = 1 ] && \
|
||||
uci set network.$1.ip6assign='60'
|
||||
;;
|
||||
|
||||
dhcp)
|
||||
# fixup IPv6 slave interface if parent is a bridge
|
||||
[ "$type" = "bridge" ] && ifname="br-$1"
|
||||
[ "$type" = "bridge" ] && device="br-$1"
|
||||
|
||||
uci set network.$1.proto='dhcp'
|
||||
uci set network.$1.metric='1'
|
||||
|
||||
#[ -e /proc/sys/net/ipv6 ] && {
|
||||
# uci -q batch <<-EOF
|
||||
# delete network.${1}6
|
||||
# set network.${1}6='interface'
|
||||
# set network.${1}6.device='$ifname'
|
||||
# set network.${1}6.proto='dhcpv6'
|
||||
# set network.${1}6.metric='1'
|
||||
# EOF
|
||||
#}
|
||||
uci -q batch <<-EOF
|
||||
set network.$1.proto='dhcp'
|
||||
set network.$1.metric='$metric'
|
||||
EOF
|
||||
[ -e /proc/sys/net/ipv6 ] && {
|
||||
metric=$((metric+1))
|
||||
uci -q batch <<-EOF
|
||||
delete network.${1}6
|
||||
set network.${1}6='interface'
|
||||
set network.${1}6.device='$device'
|
||||
set network.${1}6.proto='dhcpv6'
|
||||
set network.${1}6.metric='$metric'
|
||||
EOF
|
||||
[ "$ip6assign" != 1 ] && uci set network.${1}6.delegate='0'
|
||||
}
|
||||
;;
|
||||
|
||||
pppoe)
|
||||
|
|
@ -157,12 +236,17 @@ generate_network() {
|
|||
set network.$1.ipv6='1'
|
||||
delete network.${1}6
|
||||
set network.${1}6='interface'
|
||||
set network.${1}6.ifname='@${1}'
|
||||
set network.${1}6.device='@${1}'
|
||||
set network.${1}6.proto='dhcpv6'
|
||||
EOF
|
||||
}
|
||||
;;
|
||||
esac
|
||||
|
||||
[ -n "$no_metric" ] && {
|
||||
uci -q delete network.${1}.metric
|
||||
[ -e /proc/sys/net/ipv6 ] && uci -q delete network.${1}6.metric
|
||||
}
|
||||
}
|
||||
|
||||
add_modem_section() {
|
||||
|
|
@ -170,35 +254,40 @@ add_modem_section() {
|
|||
local num="$2"
|
||||
local simcount="$3"
|
||||
local builtin="$4"
|
||||
local custom_proto custom_ifname
|
||||
|
||||
json_select ..
|
||||
json_get_vars custom_proto custom_ifname
|
||||
json_select modems
|
||||
for count in $(seq "$simcount"); do
|
||||
interface="mob${num}s${count}a1"
|
||||
local proto="wwan"
|
||||
|
||||
# just like this for now
|
||||
# probably we should merge connm with wwan
|
||||
[ -e /dev/smd9 ] && {
|
||||
proto="connm"
|
||||
}
|
||||
# if needed, use custom proto for rmnet/other devices
|
||||
[ -n "${custom_proto}" ] && proto="${custom_proto}"
|
||||
|
||||
uci -q batch <<-EOF
|
||||
delete network.$interface
|
||||
set network.$interface='interface'
|
||||
set network.$interface.proto='$proto'
|
||||
set network.$interface.modem='$id'
|
||||
set network.$interface.metric='$((num+1))'
|
||||
set network.$interface.sim='${count}'
|
||||
set network.$interface.pdp='1'
|
||||
EOF
|
||||
metric=$((metric+1))
|
||||
|
||||
# just like this for now
|
||||
# probably we should merge connm with wwan
|
||||
[ -e /dev/smd9 ] && {
|
||||
uci set network.$interface.ifname='rmnet0'
|
||||
}
|
||||
uci_remove network "${interface}"
|
||||
uci_add network interface "${interface}"
|
||||
uci_set network "${interface}" proto "$proto"
|
||||
uci_set network "${interface}" modem "$id"
|
||||
uci_set network "${interface}" metric "$metric"
|
||||
uci_set network "${interface}" sim "${count}"
|
||||
uci_set network "${interface}" dhcpv6 "0"
|
||||
uci_set network "${interface}" pdptype "ip"
|
||||
uci_set network "${interface}" method "nat"
|
||||
uci_set network "${interface}" auth "none"
|
||||
uci_set network "${interface}" auto_apn "1"
|
||||
|
||||
# if needed, use custom ifname for rmnet/other devices
|
||||
[ -n "${custom_ifname}" ] && \
|
||||
uci_set network "${interface}" device "${custom_ifname}"
|
||||
|
||||
uci_commit network
|
||||
|
||||
update_firewall_zone "wan" "$interface"
|
||||
create_multiwan_iface "$interface" "$num"
|
||||
create_multiwan_iface "$interface" "$metric"
|
||||
add_simcard_config "$id" "${count}" "${count}" "$builtin"
|
||||
add_sim_switch_config "$id" "${count}"
|
||||
add_quota_limit_config "$interface"
|
||||
|
|
@ -243,6 +332,7 @@ generate_dynamic_lte() {
|
|||
product=$(cat "/sys/bus/usb/devices/$a/idProduct")
|
||||
[ -f "/lib/network/wwan/${vendor}:${product}" ] && {
|
||||
add_simcard_config "$a" "1" "0" ""
|
||||
add_sms_storage_config "$a"
|
||||
}
|
||||
done
|
||||
}
|
||||
|
|
@ -268,6 +358,7 @@ generate_switch_vlans_ports() {
|
|||
add network switch_vlan
|
||||
set network.@switch_vlan[-1].device='$switch'
|
||||
set network.@switch_vlan[-1].vlan='$role'
|
||||
set network.@switch_vlan[-1].vid='$role'
|
||||
set network.@switch_vlan[-1].ports='$ports'
|
||||
EOF
|
||||
done
|
||||
|
|
@ -319,6 +410,7 @@ generate_switch() {
|
|||
json_get_vars enable reset blinkrate cpu_port \
|
||||
ar8xxx_mib_type ar8xxx_mib_poll_interval
|
||||
|
||||
[ "$disable_vlan" = 1 ] && enable=0
|
||||
uci -q batch <<-EOF
|
||||
add network switch
|
||||
set network.@switch[-1].name='$key'
|
||||
|
|
@ -342,14 +434,16 @@ generate_static_system() {
|
|||
uci -q batch <<-EOF
|
||||
delete system.@system[0]
|
||||
set system.system='system'
|
||||
set system.@system[-1].hostname='OpenMPTCProuter'
|
||||
set system.@system[-1].hostname='$hostname'
|
||||
set system.@system[-1].timezone='UTC'
|
||||
set system.@system[-1].ttylogin='0'
|
||||
set system.@system[-1].log_size='128'
|
||||
set system.@system[-1].log_buffer_size='128'
|
||||
set system.@system[-1].log_size='200'
|
||||
set system.@system[-1].urandom_seed='0'
|
||||
|
||||
delete system.ntp
|
||||
set system.ntp='timeserver'
|
||||
set system.ntp.zoneName='UTC'
|
||||
set system.ntp.enabled='0'
|
||||
set system.ntp.enable_server='0'
|
||||
add_list system.ntp.server='0.pool.ntp.org'
|
||||
|
|
@ -365,9 +459,9 @@ generate_static_system() {
|
|||
if json_is_a system object; then
|
||||
json_select system
|
||||
local hostname
|
||||
#if json_get_var hostname hostname; then
|
||||
# uci -q set "system.@system[-1].hostname=$hostname"
|
||||
#fi
|
||||
if json_get_var hostname hostname; then
|
||||
uci -q set "system.@system[-1].hostname=$hostname"
|
||||
fi
|
||||
|
||||
if json_is_a ntpserver array; then
|
||||
local keys key
|
||||
|
|
@ -542,6 +636,66 @@ generate_hwinfo() {
|
|||
EOF
|
||||
}
|
||||
|
||||
set_poe_ports() {
|
||||
json_select "$1"
|
||||
json_get_vars name class budget
|
||||
uci -q batch <<-EOF
|
||||
set poe.port$1='port$1'
|
||||
set poe.port$1.name='$name'
|
||||
set poe.port$1.poe_enable='1'
|
||||
set poe.port$1.class='$class'
|
||||
set poe.port$1.budget='$budget'
|
||||
EOF
|
||||
json_select ..
|
||||
}
|
||||
|
||||
set_poe_chips(){
|
||||
local keys key
|
||||
uci -q set poe.chip$1=chip$1
|
||||
json_get_keys keys "$1"
|
||||
json_select "$1"
|
||||
for key in $keys; do
|
||||
json_get_var var "$key"
|
||||
uci -q set poe.chip$1.$key="$var"
|
||||
done
|
||||
json_select ..
|
||||
}
|
||||
|
||||
generate_poe_config(){
|
||||
if json_is_a poe object; then
|
||||
json_select poe
|
||||
json_get_vars chip_count budget poe_ports
|
||||
uci -q batch <<-EOF
|
||||
set poe.poe='poe'
|
||||
set poe.poe.chip_count='$chip_count'
|
||||
set poe.poe.budget='$budget'
|
||||
set poe.poe.poe_ports='$poe_ports'
|
||||
EOF
|
||||
if json_is_a ports array; then
|
||||
#json_for_each_item "set_poe_ports" ports
|
||||
json_select ports
|
||||
idx=1
|
||||
while json_is_a ${idx} object
|
||||
do
|
||||
"set_poe_ports" $idx
|
||||
idx=$(( idx + 1 ))
|
||||
done
|
||||
json_select ..
|
||||
fi
|
||||
if json_is_a poe_chips array; then
|
||||
json_select poe_chips
|
||||
idx=1
|
||||
while json_is_a ${idx} object
|
||||
do
|
||||
"set_poe_chips" $idx
|
||||
idx=$(( idx + 1 ))
|
||||
done
|
||||
json_select ..
|
||||
fi
|
||||
json_select ..
|
||||
fi
|
||||
}
|
||||
|
||||
generate_bluetooth() {
|
||||
uci -q batch <<-EOF
|
||||
set blesem.general='section'
|
||||
|
|
@ -552,15 +706,15 @@ generate_bluetooth() {
|
|||
}
|
||||
|
||||
add_firewall_zone() {
|
||||
local ifname
|
||||
local device
|
||||
|
||||
json_select network
|
||||
json_select "$1"
|
||||
json_get_vars ifname
|
||||
json_get_vars device
|
||||
json_select ..
|
||||
json_select ..
|
||||
|
||||
fw3 -q network "$1" || fw3 -q device "$ifname" && return
|
||||
fw3 -q network "$1" || fw3 -q device "$device" && return
|
||||
|
||||
uci -q batch <<-EOF
|
||||
add firewall zone
|
||||
|
|
@ -599,7 +753,7 @@ add_dhcp() {
|
|||
json_select ..
|
||||
json_select ..
|
||||
|
||||
[ "$_dhcp" = "1" ] || return
|
||||
[ "$_dhcp" = "true" ] || return
|
||||
uci -q batch <<-EOF
|
||||
set dhcp.$1='dhcp'
|
||||
set dhcp.$1.interface='$1'
|
||||
|
|
@ -617,11 +771,11 @@ umask 077
|
|||
if [ ! -s /etc/config/network ]; then
|
||||
touch /etc/config/network
|
||||
generate_static_network
|
||||
apply_network_options
|
||||
|
||||
json_get_keys keys network
|
||||
for key in $keys; do
|
||||
generate_network $key
|
||||
add_firewall_zone "$key"
|
||||
add_dhcp "$key"
|
||||
done
|
||||
|
||||
|
|
@ -651,6 +805,11 @@ if [ ! -s /etc/config/hwinfo ]; then
|
|||
for key in $keys; do generate_hwinfo $key; done
|
||||
fi
|
||||
|
||||
if [ ! -s /etc/config/poe ]; then
|
||||
touch /etc/config/poe
|
||||
generate_poe_config
|
||||
fi
|
||||
|
||||
if [ ! -s /etc/config/blesem ]; then
|
||||
bluetooth=""
|
||||
json_select hwinfo
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue