automatic commit at releng box

mc36 · Dec 24, 2024 · d6405cf · d6405cf
1 parent dfe3fdc
commit d6405cf
Show file tree

Hide file tree

Showing 11 changed files with 1,002 additions and 32 deletions.
diff --git a/cfg/p4lang-rout395.tst b/cfg/p4lang-rout395.tst
diff --git a/cfg/p4lang-rout396.tst b/cfg/p4lang-rout396.tst
diff --git a/src/org/freertr/serv/servOpenflow.java b/src/org/freertr/serv/servOpenflow.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 import org.freertr.cfg.cfgAll;
+import org.freertr.cfg.cfgBrdg;
 import org.freertr.cfg.cfgIfc;
 import org.freertr.cfg.cfgVrf;
 import org.freertr.ifc.ifcBridgeIfc;
@@ -421,6 +422,28 @@ protected servOpenflowIfc1 findIfc(tabRouteIface ifc) {
         return null;
     }
 
+    /**
+     * find interface
+     *
+     * @param ifc interface
+     * @return interface, null if error
+     */
+    protected servOpenflowIfc1 findIfc(cfgBrdg ifc) {
+        for (int i = 0; i < expIfc.size(); i++) {
+            servOpenflowIfc1 old = expIfc.get(i);
+            if (old.ifc == null) {
+                continue;
+            }
+            if (old.ifc.bridgeIfc != null) {
+                continue;
+            }
+            if (old.ifc.bridgeHed == ifc) {
+                return old;
+            }
+        }
+        return null;
+    }
+
     /**
      * find interface
      *

diff --git a/src/org/freertr/serv/servP4langConn.java b/src/org/freertr/serv/servP4langConn.java
@@ -1708,6 +1708,22 @@ private void doBrdg(servP4langBr br) {
                 lower.sendLine("routedmac_" + a + " " + br.br.number + " " + ntry.adr.toEmuStr() + " " + nei.id + " " + p);
                 continue;
             }
+            if (ntry.ifc.lowerIf == null) {
+                servStackFwd oth = lower.parent.findIfc(lower.parid, br.br);
+                if (oth == null) {
+                    br.macs.del(ntry);
+                    continue;
+                }
+                addrIP adr = servStack.forwarder2addr(oth.id);
+                ifc = servP4langUtil.forwarder2iface(lower, oth.id);
+                servP4langNei hop = lower.findNei(ifc, adr);
+                if (hop == null) {
+                    br.macs.del(ntry);
+                    continue;
+                }
+                lower.sendLine("bridgevpls_" + a + " " + br.br.number + " " + ntry.adr.toEmuStr() + " " + adr + " " + hop.id + " " + lower.parent.bckplnLab[oth.id] + " " + br.br.bridgeHed.label.label);
+                continue;
+            }
             servStackFwd oth = lower.parent.findIfc(lower.parid, ntry.ifc);
             if (oth != null) {
                 addrIP adr = servStack.forwarder2addr(oth.id);

diff --git a/src/org/freertr/serv/servStack.java b/src/org/freertr/serv/servStack.java
@@ -5,6 +5,7 @@
 import org.freertr.addr.addrIP;
 import org.freertr.addr.addrPrefix;
 import org.freertr.cfg.cfgAll;
+import org.freertr.cfg.cfgBrdg;
 import org.freertr.cfg.cfgIfc;
 import org.freertr.ifc.ifcBridgeIfc;
 import org.freertr.ifc.ifcEthTyp;
@@ -552,6 +553,29 @@ public tabGen<addrIP> mergeMcast(servStackFwd who, tabGen<ipFwdIface> fwd, ipFwd
         return res;
     }
 
+    /**
+     * find interface
+     *
+     * @param who querier
+     * @param ifc interface
+     * @return owner, null if error
+     */
+    protected servStackFwd findIfc(servStackFwd who, cfgBrdg ifc) {
+        if (ifc == null) {
+            return null;
+        }
+        for (int i = 0; i < fwds.size(); i++) {
+            servStackFwd ntry = fwds.get(i);
+            if (ntry.id == who.id) {
+                continue;
+            }
+            if (ntry.findIfc(ifc)) {
+                return ntry;
+            }
+        }
+        return null;
+    }
+
     /**
      * find interface
      *

diff --git a/src/org/freertr/serv/servStackFwd.java b/src/org/freertr/serv/servStackFwd.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 import org.freertr.addr.addrIP;
+import org.freertr.cfg.cfgBrdg;
 import org.freertr.ifc.ifcBridgeIfc;
 import org.freertr.ifc.ifcEthTyp;
 import org.freertr.spf.spfCalc;
@@ -120,6 +121,22 @@ protected void getShowRun(String beg, String mid, List<String> l) {
         l.add(beg + mid + "remote " + remote);
     }
 
+    /**
+     * find interface
+     *
+     * @param ifc interface
+     * @return true if found
+     */
+    protected boolean findIfc(cfgBrdg ifc) {
+        if (p4 != null) {
+            return p4.findIfc(ifc) != null;
+        }
+        if (of != null) {
+            return of.findIfc(ifc) != null;
+        }
+        return false;
+    }
+
     /**
      * find interface
      *

diff --git a/src/org/freertr/user/userExec.java b/src/org/freertr/user/userExec.java
@@ -1515,38 +1515,24 @@ public static void getHelpShow(userHelping hl, boolean privi) {
         hl.add(null, "2 3,.    p4lang                  p4lang protocol information");
         hl.add(cfgAll.dmnP4lang.listServers(), "3 4,.    <name:loc>            server name");
         hl.add(null, "4 .          general             general status");
-        hl.add(null, "4 5,.        status              current status");
-        hl.add(null, "5 .            [num]             forwarder number");
-        hl.add(null, "4 5,.        api-tx              transmitted api message statistics");
-        hl.add(null, "5 .            [num]             forwarder number");
-        hl.add(null, "4 5,.        api-rx              received api message statistics");
-        hl.add(null, "5 .            [num]             forwarder number");
-        hl.add(null, "4 5,.        port-names          front panel information");
-        hl.add(null, "5 .            [num]             forwarder number");
-        hl.add(null, "4 5,.        port-magics         front port magic values");
-        hl.add(null, "5 .            [num]             forwarder number");
-        hl.add(null, "4 5,.        done-interface      exported interfaces");
-        hl.add(null, "5 .            [num]             forwarder number");
-        hl.add(null, "4 5,.        done-vrf            exported vrfs");
-        hl.add(null, "5 .            [num]             forwarder number");
-        hl.add(null, "4 5,.        done-neighbor       exported neighbors");
-        hl.add(null, "5 .            [num]             forwarder number");
-        hl.add(null, "4 5,.        done-mpls           exported labels");
-        hl.add(null, "5 .            [num]             forwarder number");
-        hl.add(null, "4 5,.        done-nsh            exported chains");
-        hl.add(null, "5 .            [num]             forwarder number");
+        hl.add(null, "4 .          status              current status");
+        hl.add(null, "4 .          api-tx              transmitted api message statistics");
+        hl.add(null, "4 .          api-rx              received api message statistics");
+        hl.add(null, "4 .          port-names          front panel information");
+        hl.add(null, "4 .          port-magics         front port magic values");
+        hl.add(null, "4 .          done-interface      exported interfaces");
+        hl.add(null, "4 .          done-vrf            exported vrfs");
+        hl.add(null, "4 .          done-neighbor       exported neighbors");
+        hl.add(null, "4 .          done-mpls           exported labels");
+        hl.add(null, "4 .          done-nsh            exported chains");
         hl.add(null, "4 5          done-bridge         exported bridge macs");
-        hl.add(null, "5 6,.          <num>             bridge number");
-        hl.add(null, "6 .              [num]           forwarder number");
+        hl.add(null, "5 .            <num>             bridge number");
         hl.add(null, "4 5          done-route4         exported ipv4 routes");
-        hl.add(null, "5 6,.          <num>             vrf number");
-        hl.add(null, "6 .              [num]           forwarder number");
+        hl.add(null, "5 .            <num>             vrf number");
         hl.add(null, "4 5          done-route6         exported ipv6 routes");
-        hl.add(null, "5 6,.          <num>             vrf number");
-        hl.add(null, "6 .              [num]           forwarder number");
+        hl.add(null, "5 .            <num>             vrf number");
         hl.add(null, "4 5          port-counters       dataplane counters");
-        hl.add(null, "5 6,.          <name:ifc>        name of interface");
-        hl.add(null, "6 .              [num]           forwarder number");
+        hl.add(null, "5 .            <name:ifc>        name of interface");
         hl.add(null, "2 3,.    stack                   stack protocol information");
         hl.add(cfgAll.dmnStack.listServers(), "3 4,.    <name:loc>            server name");
         hl.add(null, "4 .          dataplanes          dataplanes");

diff --git a/src/rtr.csv b/src/rtr.csv
@@ -1,6 +1,6 @@
 url;file;result;test
 -;-;-;freeRouter v24.12.24-cur, done by sprscc13@mrn0b0dy.
--;-;-;2024-12-24 07:18:49, took 00:14:49, with 50 workers, on 3590 cases, 0 failed, 0 traces, 0 retries
+-;-;-;2024-12-24 07:59:03, took 00:14:39, with 50 workers, on 3590 cases, 0 failed, 0 traces, 7 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.html b/src/rtr.html
@@ -10,7 +10,7 @@
 </style>
 <title>tester</title></head><body>
 release: freeRouter v24.12.24-cur, done by sprscc13@mrn0b0dy.<br/>
-tested: 2024-12-24 07:18:49, took 00:14:49, with 50 workers, on 3590 cases, 0 failed, 0 traces, 0 retries<br/>
+tested: 2024-12-24 07:59:03, took 00:14:39, with 50 workers, on 3590 cases, 0 failed, 0 traces, 7 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>

diff --git a/src/rtr8.csv b/src/rtr8.csv
@@ -1,6 +1,6 @@
 url;file;result;test
 -;-;-;freeRouter v24.12.24-cur, done by sprscc13@mrn0b0dy.
--;-;-;2024-12-24 07:29:25, took 00:10:14, with 50 workers, on 662 cases, 0 failed, 0 traces, 0 retries
+-;-;-;2024-12-24 08:09:42, took 00:10:17, with 50 workers, on 662 cases, 0 failed, 0 traces, 0 retries
 -;-;-;./rtr.bin
 http://sources.freertr.org/cfg/p4lang-acl001.tst;p4lang-acl001.tst;success;p4lang: copp
 http://sources.freertr.org/cfg/p4lang-acl002.tst;p4lang-acl002.tst;success;p4lang: ingress access list

diff --git a/src/rtr8.html b/src/rtr8.html
@@ -10,7 +10,7 @@
 </style>
 <title>tester</title></head><body>
 release: freeRouter v24.12.24-cur, done by sprscc13@mrn0b0dy.<br/>
-tested: 2024-12-24 07:29:25, took 00:10:14, with 50 workers, on 662 cases, 0 failed, 0 traces, 0 retries<br/>
+tested: 2024-12-24 08:09:42, took 00:10:17, with 50 workers, on 662 cases, 0 failed, 0 traces, 0 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>