automatic commit at releng box

mc36 · Jan 7, 2025 · e0057ce · e0057ce
1 parent 8a70ba1
commit e0057ce
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 2 deletions.
diff --git a/src/org/freertr/serv/servSdwan.java b/src/org/freertr/serv/servSdwan.java
@@ -220,6 +220,24 @@ public userFormat getShow() {
         return res;
     }
 
+    /**
+     * do clear
+     *
+     * @param peer peer ip
+     */
+    public void doClear(addrIP peer) {
+        for (int i = 0; i < conns.size(); i++) {
+            servSdwanConn ntry = conns.get(i);
+            if (ntry == null) {
+                continue;
+            }
+            if (peer.compareTo(ntry.connA) != 0) {
+                continue;
+            }
+            ntry.doClose();
+        }
+    }
+
 }
 
 class servSdwanConn implements Runnable, Comparable<servSdwanConn> {

diff --git a/src/org/freertr/serv/servVxlan.java b/src/org/freertr/serv/servVxlan.java
@@ -318,4 +318,22 @@ public userFormat getShow() {
         return res;
     }
 
+    /**
+     * do clear
+     *
+     * @param peer peer ip
+     */
+    public void doClear(addrIP peer) {
+        for (int i = 0; i < conns.size(); i++) {
+            servVxlanConn ntry = conns.get(i);
+            if (ntry == null) {
+                continue;
+            }
+            if (peer.compareTo(ntry.conn.peerAddr) != 0) {
+                continue;
+            }
+            ntry.closeDn();
+        }
+    }
+
 }
diff --git a/src/org/freertr/user/userClear.java b/src/org/freertr/user/userClear.java
@@ -69,6 +69,8 @@
 import org.freertr.serv.servL2tp2;
 import org.freertr.serv.servL2tp3;
 import org.freertr.serv.servPckOudp;
+import org.freertr.serv.servSdwan;
+import org.freertr.serv.servVxlan;
 import org.freertr.util.logger;
 import org.freertr.util.version;
 
@@ -317,6 +319,34 @@ public cfgAlias doer() {
             srv.doClear(adr);
             return null;
         }
+        if (a.equals("vxlan")) {
+            servVxlan srv = cfgAll.srvrFind(new servVxlan(), cfgAll.dmnVxlan, cmd.word());
+            if (srv == null) {
+                cmd.error("no such server");
+                return null;
+            }
+            addrIP adr = new addrIP();
+            if (adr.fromString(cmd.word())) {
+                cmd.error("bad address");
+                return null;
+            }
+            srv.doClear(adr);
+            return null;
+        }
+        if (a.equals("sdwan")) {
+            servSdwan srv = cfgAll.srvrFind(new servSdwan(), cfgAll.dmnSdwan, cmd.word());
+            if (srv == null) {
+                cmd.error("no such server");
+                return null;
+            }
+            addrIP adr = new addrIP();
+            if (adr.fromString(cmd.word())) {
+                cmd.error("bad address");
+                return null;
+            }
+            srv.doClear(adr);
+            return null;
+        }
         if (a.equals("vdc")) {
             cfgVdc ntry = cfgInit.vdcLst.find(new cfgVdc(cmd.word()));
             if (ntry == null) {

diff --git a/src/org/freertr/user/userExec.java b/src/org/freertr/user/userExec.java
@@ -2043,14 +2043,12 @@ public userHelping getHelping() {
         hl.add(null, "2 3      pckoudp                      pckoudp protocol client");
         hl.add(cfgAll.dmnPckOudp.listServers(), "3 4        <name:loc>                 server name");
         hl.add(null, "4 .          <addr>                   peer address");
-/////////////////////
         hl.add(null, "2 3      vxlan                        vxlan protocol client");
         hl.add(cfgAll.dmnVxlan.listServers(), "3 4        <name:loc>                 server name");
         hl.add(null, "4 .          <addr>                   peer address");
         hl.add(null, "2 3      sdwan                        sdwan protocol client");
         hl.add(cfgAll.dmnSdwan.listServers(), "3 4        <name:loc>                 server name");
         hl.add(null, "4 .          <addr>                   peer address");
-/////////////////////
         hl.add(null, "2 3      vdc                          restart vdc process");
         hl.add(null, "3 4,.      <name:vdc>                 name of vdc");
         hl.add(null, "4 .          stop                     stop");