automatic commit at releng box

no todo: sho ipv4 bgp x flaps
rare-freertr · Nov 10, 2022 · eb86a18 · eb86a18
1 parent a257b6d
commit eb86a18
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -13543,3 +13543,5 @@ todo: colorful bgp lu implementation accroding to https://lists.geant.org/sympa/
 ---------------------------------- 2022-08-30 18:18:06 22.8.30
 todo: sho ipv4 bgp x flaps
 todo: fix enter in spacetab term behaviour
+---------------------------------- 2022-11-10 06:00:07 22.11.10
+no todo: sho ipv4 bgp x flaps
diff --git a/src/net/freertr/ip/ipMpls.java b/src/net/freertr/ip/ipMpls.java
@@ -730,7 +730,15 @@ public static void gotPolkaPack(ifcPolka fwdP, ipFwd fwd4, ipFwd fwd6, packHolde
             logger.info("no route for index " + id);
             return;
         }
+        if (ntry.best.nextHop == null) {
+            logger.info("no nexthop for index " + id);
+            return;
+        }
         ipFwdIface ifc = (ipFwdIface) ntry.best.iface;
+        if (ifc == null) {
+            logger.info("no iface for index " + id);
+            return;
+        }
         ifc.lower.sendPolka(pck, ntry.best.nextHop);
     }
 
@@ -773,9 +781,17 @@ public static void gotMpolkaPack(ifcMpolka fwdP, ipFwd fwd4, ipFwd fwd6, packHol
             tabRouteEntry<addrIP> ntry = fwd.actualU.find(idx.prefix);
             if (ntry == null) {
                 logger.info("no route for index " + i);
-                return;
+                continue;
+            }
+            if (ntry.best.nextHop == null) {
+                logger.info("no nexthop for index " + id);
+                continue;
             }
             ipFwdIface ifc = (ipFwdIface) ntry.best.iface;
+            if (ifc == null) {
+                logger.info("no iface for index " + id);
+                continue;
+            }
             ifc.lower.sendMpolka(pck.copyBytes(true, true), ntry.best.nextHop);
         }
         if ((id & 1) == 0) {

diff --git a/src/rtr.csv b/src/rtr.csv
@@ -1,6 +1,6 @@
 url;file;result;test
 -;-;-;freeRouter v22.11.10-cur, done by cs@nop.
--;-;-;2022-11-10 05:57:09, took 00:08:46, with 80 workers, on 3024 cases, 0 failed, 0 traces, 1 retries
+-;-;-;2022-11-10 06:08:38, took 00:08:30, with 80 workers, on 3024 cases, 0 failed, 0 traces, 1 retries
 -;-;-;./rtr.bin
 http://sources.freertr.org/cfg/basic01.tst;basic01.tst;success;dummy test
 http://sources.freertr.org/cfg/basic02.tst;basic02.tst;success;interface with slot

diff --git a/src/rtr.ftr b/src/rtr.ftr
@@ -3022,7 +3022,6 @@ qc pass: socks4 server
 qc pass: socks5 server
 qc pass: tacacs server
 qc pass: udp forwarder server
-todo: sho ipv4 bgp x flaps
 todo: fix enter in spacetab term behaviour
 todo: allowed v4/v6 range to temper
 todo: colorful bgp lu implementation accroding to https://lists.geant.org/sympa/arc/rare-dev/2022-08/msg00042.html

diff --git a/src/rtr.html b/src/rtr.html
@@ -13,7 +13,7 @@
 </style>
 <title>tester</title></head><body>
 release: freeRouter v22.11.10-cur, done by cs@nop.<br/>
-tested: 2022-11-10 05:57:09, took 00:08:46, with 80 workers, on 3024 cases, 0 failed, 0 traces, 1 retries<br/>
+tested: 2022-11-10 06:08:38, took 00:08:30, with 80 workers, on 3024 cases, 0 failed, 0 traces, 1 retries<br/>
 jvm: ./rtr.bin<br/>
 <br/>
 <table><thead><tr><td><b>file</b></td><td><b>result</b></td><td><b>test</b></td></tr></thead><tbody>