1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-03-09 15:40:20 +00:00

升级基本配置

This commit is contained in:
suyuan 2020-09-28 22:24:39 +08:00
parent 7cdbb2d8fc
commit 19d9d7a2d4
3 changed files with 99 additions and 47 deletions

View file

@ -15,17 +15,21 @@ generate_static_network() {
set network.loopback.proto='static' set network.loopback.proto='static'
set network.loopback.ipaddr='127.0.0.1' set network.loopback.ipaddr='127.0.0.1'
set network.loopback.netmask='255.0.0.0' set network.loopback.netmask='255.0.0.0'
delete network.globals
set network.globals='globals'
set network.globals.ula_prefix='auto'
EOF 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 if json_is_a dsl object; then
json_select dsl json_select dsl
if json_is_a atmbridge object; then if json_is_a atmbridge object; then
json_select atmbridge json_select atmbridge
local vpi vci encaps payload local vpi vci encaps payload nameprefix
json_get_vars vpi vci encaps payload json_get_vars vpi vci encaps payload nameprefix
uci -q batch <<-EOF uci -q batch <<-EOF
delete network.atm delete network.atm
set network.atm='atm-bridge' set network.atm='atm-bridge'
@ -33,6 +37,7 @@ generate_static_network() {
set network.atm.vci='$vci' set network.atm.vci='$vci'
set network.atm.encaps='$encaps' set network.atm.encaps='$encaps'
set network.atm.payload='$payload' set network.atm.payload='$payload'
set network.atm.nameprefix='$nameprefix'
EOF EOF
json_select .. json_select ..
fi fi
@ -67,26 +72,11 @@ generate_network() {
[ -n "$ifname" ] || return [ -n "$ifname" ] || return
case "$1" in # force bridge for multi-interface devices (and lan)
# hack (see /etc/board.d/02_network) case "$1:$ifname" in
none) return ;; *\ * | lan:*) type="bridge" ;;
lan*) proto=${proto:-static} ;;
wan*) proto=${proto:-dhcp} ;;
esac esac
if [ -n "$macaddr" ]; then
type=macvlan # useless, only for legacy
uci -q batch <<-EOF
delete network.${1}_dev
set network.${1}_dev='device'
set network.${1}_dev.name='$1'
set network.${1}_dev.type='$type'
set network.${1}_dev.ifname='$ifname'
set network.${1}_dev.macaddr='$macaddr'
EOF
ifname=$1
fi
uci -q batch <<-EOF uci -q batch <<-EOF
delete network.$1 delete network.$1
set network.$1='interface' set network.$1='interface'
@ -95,11 +85,22 @@ generate_network() {
set network.$1.proto='none' set network.$1.proto='none'
EOF EOF
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
fi
case "$protocol" in case "$protocol" in
static) static)
local ipad local ipad
case "$1" in case "$1" in
lan) ipad=${ipaddr:-"192.168.100.1"} ;; lan) ipad=${ipaddr:-"192.168.1.1"} ;;
*) ipad=${ipaddr:-"192.168.$((addr_offset++)).1"} ;; *) ipad=${ipaddr:-"192.168.$((addr_offset++)).1"} ;;
esac esac
@ -109,17 +110,23 @@ generate_network() {
set network.$1.proto='static' set network.$1.proto='static'
set network.$1.ipaddr='$ipad' set network.$1.ipaddr='$ipad'
set network.$1.netmask='$netm' set network.$1.netmask='$netm'
set network.$1.ip6assign='60'
EOF EOF
[ -e /proc/sys/net/ipv6 ] && uci set network.$1.ip6assign='60'
;; ;;
dhcp) dhcp)
# fixup IPv6 slave interface if parent is a bridge # fixup IPv6 slave interface if parent is a bridge
[ "$type" = "bridge" ] && ifname="br-$1" [ "$type" = "bridge" ] && ifname="br-$1"
uci -q batch <<-EOF uci set network.$1.proto='dhcp'
set network.$1.proto='dhcp' [ -e /proc/sys/net/ipv6 ] && {
EOF uci -q batch <<-EOF
delete network.${1}6
set network.${1}6='interface'
set network.${1}6.ifname='$ifname'
set network.${1}6.proto='dhcpv6'
EOF
}
;; ;;
pppoe) pppoe)
@ -127,12 +134,16 @@ generate_network() {
set network.$1.proto='pppoe' set network.$1.proto='pppoe'
set network.$1.username='username' set network.$1.username='username'
set network.$1.password='password' set network.$1.password='password'
set network.$1.ipv6='1'
delete network.${1}6
set network.${1}6='interface'
set network.${1}6.ifname='@${1}'
set network.${1}6.proto='dhcpv6'
EOF EOF
[ -e /proc/sys/net/ipv6 ] && {
uci -q batch <<-EOF
set network.$1.ipv6='1'
delete network.${1}6
set network.${1}6='interface'
set network.${1}6.ifname='@${1}'
set network.${1}6.proto='dhcpv6'
EOF
}
;; ;;
esac esac
} }
@ -206,7 +217,8 @@ generate_switch() {
json_select switch json_select switch
json_select "$key" json_select "$key"
json_get_vars enable reset blinkrate cpu_port json_get_vars enable reset blinkrate cpu_port \
ar8xxx_mib_type ar8xxx_mib_poll_interval
uci -q batch <<-EOF uci -q batch <<-EOF
add network switch add network switch
@ -214,6 +226,8 @@ generate_switch() {
set network.@switch[-1].reset='$reset' set network.@switch[-1].reset='$reset'
set network.@switch[-1].enable_vlan='$enable' set network.@switch[-1].enable_vlan='$enable'
set network.@switch[-1].blinkrate='$blinkrate' set network.@switch[-1].blinkrate='$blinkrate'
set network.@switch[-1].ar8xxx_mib_type='$ar8xxx_mib_type'
set network.@switch[-1].ar8xxx_mib_poll_interval='$ar8xxx_mib_poll_interval'
EOF EOF
generate_switch_vlans_ports "$1" generate_switch_vlans_ports "$1"
@ -227,7 +241,7 @@ generate_static_system() {
uci -q batch <<-EOF uci -q batch <<-EOF
delete system.@system[0] delete system.@system[0]
add system system add system system
set system.@system[-1].hostname='OpenMPTCProuter' set system.@system[-1].hostname='antrouter'
set system.@system[-1].timezone='UTC' set system.@system[-1].timezone='UTC'
set system.@system[-1].ttylogin='0' set system.@system[-1].ttylogin='0'
set system.@system[-1].log_size='64' set system.@system[-1].log_size='64'
@ -237,10 +251,10 @@ generate_static_system() {
set system.ntp='timeserver' set system.ntp='timeserver'
set system.ntp.enabled='1' set system.ntp.enabled='1'
set system.ntp.enable_server='0' set system.ntp.enable_server='0'
add_list system.ntp.server='0.openwrt.pool.ntp.org' add_list system.ntp.server='ntp1.aliyun.com'
add_list system.ntp.server='1.openwrt.pool.ntp.org' add_list system.ntp.server='time1.cloud.tencent.com'
add_list system.ntp.server='2.openwrt.pool.ntp.org' add_list system.ntp.server='time.ustc.edu.cn'
add_list system.ntp.server='3.openwrt.pool.ntp.org' add_list system.ntp.server='cn.pool.ntp.org'
EOF EOF
if json_is_a system object; then if json_is_a system object; then
@ -359,11 +373,12 @@ generate_led() {
;; ;;
switch) switch)
local port_mask speed_mask local port_mask speed_mask mode
json_get_vars port_mask speed_mask json_get_vars port_mask speed_mask mode
uci -q batch <<-EOF uci -q batch <<-EOF
set system.$cfg.port_mask='$port_mask' set system.$cfg.port_mask='$port_mask'
set system.$cfg.speed_mask='$speed_mask' set system.$cfg.speed_mask='$speed_mask'
set system.$cfg.mode='$mode'
EOF EOF
;; ;;
@ -411,6 +426,8 @@ generate_gpioswitch() {
json_init json_init
json_load "$(cat ${CFG})" json_load "$(cat ${CFG})"
umask 077
if [ ! -s /etc/config/network ]; then if [ ! -s /etc/config/network ]; then
touch /etc/config/network touch /etc/config/network
generate_static_network generate_static_network

View file

@ -1,8 +1,38 @@
___ __ __ ___ _____ ___ ___ _
/ _ \ _ __ ___ _ _ | \/ | _ \_ _/ __| _ \_ _ ___ _ _| |_ ___ _ _ /***
| (_) | '_ \/ -_) ' \| |\/| | _/ | || (__| _/ '_/ _ \ || | _/ -_) '_| * ,s555SB@@&
\___/| .__/\___|_||_|_| |_|_| |_| \___|_| |_| \___/\_,_|\__\___|_| * :9H####@@@@@Xi
|_| * 1@@@@@@@@@@@@@@8
------------------------------------------------------------------------------ * ,8@@@@@@@@@B@@@@@@8
* :B@@@@X3hi8Bs;B@@@@@Ah,
* ,8i r@@@B: 1S ,M@@@@@@#8;
* 1AB35.i: X@@8 . SGhr ,A@@@@@@@@S
* 1@h31MX8 18Hhh3i .i3r ,A@@@@@@@@@5
* ;@&i,58r5 rGSS: :B@@@@@@@@@@A
* 1#i . 9i hX. .: .5@@@@@@@@@@@1
* sG1, ,G53s. 9#Xi;hS5 3B@@@@@@@B1
* .h8h.,A@@@MXSs, #@H1: 3ssSSX@1
* s ,@@@@@@@@@@@@Xhi, r#@@X1s9M8 .GA981
* ,. rS8H#@@@@@@@@@@#HG51;. .h31i;9@r .8@@@@BS;i;
* .19AXXXAB@@@@@@@@@@@@@@#MHXG893hrX#XGGXM@@@@@@@@@@MS
* s@@MM@@@hsX#@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@&,
* :GB@#3G@@Brs ,1GM@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@B,
* .hM@@@#@@#MX 51 r;iSGAM@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@8
* :3B@@@@@@@@@@@&9@h :Gs .;sSXH@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@:
* s&HA#@@@@@@@@@@@@@@M89A;.8S. ,r3@@@@@@@@@@@@@@@@@@@@@@@@@@@r
* ,13B@@@@@@@@@@@@@@@@@@@5 5B3 ;. ;@@@@@@@@@@@@@@@@@@@@@@@@@@@i
* 5#@@#&@@@@@@@@@@@@@@@@@@9 .39: ;@@@@@@@@@@@@@@@@@@@@@@@@@@@;
* 9@@@X:MM@@@@@@@@@@@@@@@#; ;31. H@@@@@@@@@@@@@@@@@@@@@@@@@@:
* SH#@B9.rM@@@@@@@@@@@@@B :. 3@@@@@@@@@@@@@@@@@@@@@@@@@@5
* ,:. 9@@@@@@@@@@@#HB5 .M@@@@@@@@@@@@@@@@@@@@@@@@@B
* ,ssirhSM@&1;i19911i,. s@@@@@@@@@@@@@@@@@@@@@@@@@@S
* ,,,rHAri1h1rh&@#353Sh: 8@@@@@@@@@@@@@@@@@@@@@@@@@#:
* .A3hH@#5S553&@@#h i:i9S #@@@@@@@@@@@@@@@@@@@@@@@@@A.
*
*
* 又看源码,看你妹妹呀!
*/
-----------------------------------------------------
(%C) (%C)
------------------------------------------------------------------------------ ------------------------------------------------------------------------------

View file

@ -0,0 +1,5 @@
root:$1$ie.8vTnt$7EzhI1ZYiwp8hSAC4eSId0:18473:0:99999:7:::
daemon:*:0:0:99999:7:::
ftp:*:0:0:99999:7:::
network:*:0:0:99999:7:::
nobody:*:0:0:99999:7:::