diff --git a/bird/bird.conf b/bird/bird.conf index 2b89437..f130d8c 100644 --- a/bird/bird.conf +++ b/bird/bird.conf @@ -12,7 +12,7 @@ protocol kernel { import none; export filter { if source = RTS_STATIC then reject; - if dn42_is_self_net_v6() then { # 检查DN42自有网段 + if dn42_is_valid_network_v6() then { # 检查DN42自有网段 krt_prefsrc = DN42_V6_kernel; accept; } @@ -31,7 +31,7 @@ protocol kernel { import none; export filter { if source = RTS_STATIC then reject; - if dn42_is_self_net() then { # 检查DN42自有网段 + if dn42_is_valid_network() then { # 检查DN42自有网段 krt_prefsrc = DN42_V4_kernel; accept; } diff --git a/update.sh b/update.sh deleted file mode 100644 index 220a124..0000000 --- a/update.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -echo "1.克隆git仓库" -cd -git clone https://git.nia.ink/brnet/bird_config.git - -echo "2.备份原有公共配置项目" -mv /etc/bird/function /etc/bird/function.bak -mv /etc/bird/net /etc/bird/net.bak - -echo "3.复制新的公共配置项目" -cp -r bird_config/bird/function/ /etc/bird/ -cp -r bird_config/bird/net/ /etc/bird/ - -echo "4.优化conf文件夹" -mv /etc/bird/conf/mynet.conf /etc/bird/conf/unet.conf -mv /etc/bird/conf/pub.conf /etc/bird/conf/inet.conf -cp bird_config/bird/conf/dn42.conf /etc/bird/conf/dn42.conf - -echo "5.修改peers文件夹" -cp -r bird_config/bird/peers/dn42/ /etc/bird/peers/ - -echo "6.修改bird.conf" -rm /etc/bird/bird.conf -cp bird_config/bird/bird.conf /etc/bird/ - -echo "7.请手动完善var.conf 确认好后重启bird" -echo "define DN42_ASN = 4242423376;" -echo "define DN42_V4_kernel = 172.20.21.2;" -echo "define DN42_V6_kernel = fde8:936e:ee29::1;"