回档

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;