From 8ac68591caa2ba4d3370b4d526bb6b8d7695af7b Mon Sep 17 00:00:00 2001
From: daxi20 <gaoyuheng@yuheng.hl.cn>
Date: Mon, 13 Oct 2025 02:40:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bird/bird.conf            | 17 -----------------
 bird/function/tables.conf | 18 +++++++++---------
 2 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/bird/bird.conf b/bird/bird.conf
index 5ebd2b6..8c98ec6 100644
--- a/bird/bird.conf
+++ b/bird/bird.conf
@@ -35,27 +35,10 @@ protocol kernel {
                 krt_prefsrc = UNET_V4_kernel;
                 accept;
             }
-<<<<<<< HEAD
-            reject;
-        };
-    };
-};
-
-# echo "102 ipv4_pub" >> /etc/iproute2/rt_tables
-protocol kernel {
-    scan time 20;
-    kernel table 102;  
-    ipv4 {
-        table inet4;
-        import none;
-        export filter {
-            if source = RTS_STATIC then reject;
-=======
             if dn42_is_valid_network() then {
                 krt_prefsrc = DN42_V4_kernel;
                 accept;
             }
->>>>>>> parent of 1660565 (对相关的配置进行修整；)
             if !is_bogon_prefix() then {
                 if bgp_large_community ~ [(LOCAL_ASN, 3,*)] then reject;
                 krt_prefsrc = LOCAL_V4_kernel;
diff --git a/bird/function/tables.conf b/bird/function/tables.conf
index a7757c9..35547eb 100644
--- a/bird/function/tables.conf
+++ b/bird/function/tables.conf
@@ -17,15 +17,15 @@ protocol pipe inet6_sync {
     };
 }
 
-#protocol pipe inet4_sync {
-#  table inet4;
-#  peer table master4;
-#  import none;
-#  export filter {
-#    if bgp_large_community ~ [(LOCAL_ASN, 3,*)] then reject;
-#    accept;
-#    };
-#}
+protocol pipe inet4_sync {
+  table inet4;
+  peer table master4;
+  import none;
+  export filter {
+    if bgp_large_community ~ [(LOCAL_ASN, 3,*)] then reject;
+    accept;
+    };
+}
 
 protocol pipe dn42v4_sync {
   table dn42v4;