automatic commit at releng box

mc36 · Jan 27, 2025 · 78a8b84 · 78a8b84
1 parent 24012cf
commit 78a8b84
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 19 deletions.
diff --git a/misc/native/p4xdp_msg.h b/misc/native/p4xdp_msg.h
@@ -163,10 +163,13 @@ int doOneCommand(unsigned char* buf) {
     if (strcmp(arg[0], "portvrf") == 0) {
         i = atoi(arg[2]);
         bpf_map_lookup_elem(vrf_port_fd, &i, vrfr);
-        vrfr->cmd = 1;
         vrfr->vrf = atoi(arg[3]);
-        if (del == 0) vrfr->cmd = 0;
-        if (bpf_map_update_elem(vrf_port_fd, &i, vrfr, BPF_ANY) != 0) warn("error setting entry");
+        vrfr->cmd = 1;
+        if (del == 0) {
+            if (bpf_map_delete_elem(vrf_port_fd, &i) != 0) warn("error removing entry");
+        } else {
+            if (bpf_map_update_elem(vrf_port_fd, &i, vrfr, BPF_ANY) != 0) warn("error setting entry");
+        }
         return 0;
     }
     if (strcmp(arg[0], "sgtset") == 0) {
@@ -248,54 +251,69 @@ int doOneCommand(unsigned char* buf) {
     if (strcmp(arg[0], "loconnifc") == 0) {
         i = atoi(arg[2]);
         bpf_map_lookup_elem(vrf_port_fd, &i, vrfr);
-        vrfr->cmd = 4;
         vrfr->label1 = atoi(arg[3]);
-        if (bpf_map_update_elem(vrf_port_fd, &i, vrfr, BPF_ANY) != 0) warn("error setting entry");
+        vrfr->cmd = 4;
+        if (del == 0) {
+            if (bpf_map_delete_elem(vrf_port_fd, &i) != 0) warn("error removing entry");
+        } else {
+            if (bpf_map_update_elem(vrf_port_fd, &i, vrfr, BPF_ANY) != 0) warn("error setting entry");
+        }
         return 0;
     }
     if (strcmp(arg[0], "loconnnei") == 0) {
         i = atoi(arg[2]);
         bpf_map_lookup_elem(vrf_port_fd, &i, vrfr);
-        vrfr->cmd = 5;
         vrfr->label1 = atoi(arg[3]);
-        if (bpf_map_update_elem(vrf_port_fd, &i, vrfr, BPF_ANY) != 0) warn("error setting entry");
+        vrfr->cmd = 5;
+        if (del == 0) {
+            if (bpf_map_delete_elem(vrf_port_fd, &i) != 0) warn("error removing entry");
+        } else {
+            if (bpf_map_update_elem(vrf_port_fd, &i, vrfr, BPF_ANY) != 0) warn("error setting entry");
+        }
         return 0;
     }
     if (strcmp(arg[0], "nshconn") == 0) {
         i = atoi(arg[2]);
         bpf_map_lookup_elem(vrf_port_fd, &i, vrfr);
-        vrfr->cmd = 6;
         vrfr->label1 = atoi(arg[3]);
         vrfr->label2 = atoi(arg[4]);
-        if (bpf_map_update_elem(vrf_port_fd, &i, vrfr, BPF_ANY) != 0) warn("error setting entry");
+        vrfr->cmd = 6;
+        if (del == 0) {
+            if (bpf_map_delete_elem(vrf_port_fd, &i) != 0) warn("error removing entry");
+        } else {
+            if (bpf_map_update_elem(vrf_port_fd, &i, vrfr, BPF_ANY) != 0) warn("error setting entry");
+        }
         return 0;
     }
     if (strcmp(arg[0], "xconnect") == 0) {
         i = atoi(arg[2]);
         bpf_map_lookup_elem(vrf_port_fd, &i, vrfr);
-        vrfr->cmd = 3;
         vrfr->nexthop = atoi(arg[4]);
         vrfr->label1 = atoi(arg[5]);
         vrfr->label2 = atoi(arg[7]);
+        vrfr->cmd = 3;
         o = atoi(arg[6]);
         labr.port = i;
         labr.cmd= 4;
-        if (bpf_map_update_elem(vrf_port_fd, &i, vrfr, BPF_ANY) != 0) warn("error setting entry");
         if (del == 0) {
-            vrfr->cmd = 0;
+            if (bpf_map_delete_elem(vrf_port_fd, &i) != 0) warn("error removing entry");
             if (bpf_map_delete_elem(labels_fd, &o) != 0) warn("error removing entry");
         } else {
+            if (bpf_map_update_elem(vrf_port_fd, &i, vrfr, BPF_ANY) != 0) warn("error setting entry");
             if (bpf_map_update_elem(labels_fd, &o, &labr, BPF_ANY) != 0) warn("error setting entry");
         }
         return 0;
     }
     if (strcmp(arg[0], "portbridge") == 0) {
         i = atoi(arg[2]);
         bpf_map_lookup_elem(vrf_port_fd, &i, vrfr);
-        vrfr->cmd = 2;
         vrfr->bridge = atoi(arg[3]);
-        if (del == 0) vrfr->cmd = 0;
-        if (bpf_map_update_elem(vrf_port_fd, &i, vrfr, BPF_ANY) != 0) warn("error setting entry");
+        vrfr->cmd = 2;
+        if (del == 0) {
+            if (bpf_map_delete_elem(vrf_port_fd, &i) != 0) warn("error removing entry");
+        } else {
+            if (bpf_map_update_elem(vrf_port_fd, &i, vrfr, BPF_ANY) != 0) warn("error setting entry");
+        }
         return 0;
     }
     if (strcmp(arg[0], "bridgemac") == 0) {

diff --git a/src/rtr.csv b/src/rtr.csv
@@ -1,6 +1,6 @@
 url;file;result;test
 -;-;-;freeRouter v25.1.27-cur, done by sprscc13@mrn0b0dy.
--;-;-;2025-01-27 16:35:14, took 00:15:04, with 50 workers, on 3634 cases, 0 failed, 0 traces, 2 retries
+-;-;-;2025-01-27 17:12:52, took 00:15:07, with 50 workers, on 3634 cases, 0 failed, 0 traces, 0 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 v25.1.27-cur, done by sprscc13@mrn0b0dy.<br/>
-tested: 2025-01-27 16:35:14, took 00:15:04, with 50 workers, on 3634 cases, 0 failed, 0 traces, 2 retries<br/>
+tested: 2025-01-27 17:12:52, took 00:15:07, with 50 workers, on 3634 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>

diff --git a/src/rtr8.csv b/src/rtr8.csv
@@ -1,6 +1,6 @@
 url;file;result;test
 -;-;-;freeRouter v25.1.27-cur, done by sprscc13@mrn0b0dy.
--;-;-;2025-01-27 16:46:00, took 00:10:23, with 50 workers, on 700 cases, 0 failed, 0 traces, 1 retries
+-;-;-;2025-01-27 17:24:42, took 00:11:26, with 50 workers, on 700 cases, 0 failed, 0 traces, 1 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 v25.1.27-cur, done by sprscc13@mrn0b0dy.<br/>
-tested: 2025-01-27 16:46:00, took 00:10:23, with 50 workers, on 700 cases, 0 failed, 0 traces, 1 retries<br/>
+tested: 2025-01-27 17:24:42, took 00:11:26, with 50 workers, on 700 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>