automatic commit at releng box

no todo: aliases with sticky parameters
mc36 · Mar 30, 2022 · 2915590 · 2915590
1 parent b34a5fe
commit 2915590
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 4 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -13097,3 +13097,5 @@ todo: changelog converter with start point
 no todo: lsrp pvrp forbid remote dynamic metric
 ---------------------------------- 2022-03-30 07:59:57 22.3.30
 no todo: changelog converter with start point
+---------------------------------- 2022-03-30 08:45:44 22.3.30
+no todo: aliases with sticky parameters
diff --git a/src/net/freertr/cfg/cfgAlias.java b/src/net/freertr/cfg/cfgAlias.java
@@ -8,6 +8,7 @@
 import net.freertr.user.userExec;
 import net.freertr.user.userFilter;
 import net.freertr.user.userHelping;
+import net.freertr.user.userReader;
 import net.freertr.util.cmds;
 
 /**
@@ -48,6 +49,11 @@ public cfgAlias() {
      */
     public boolean hidden = false;
 
+    /**
+     * sticky parameter
+     */
+    public String sticky = "";
+
     /**
      * help description text
      */
@@ -248,6 +254,9 @@ public List<String> getShRun(int filter) {
         if (parameter != paraMode.allow) {
             l.add(a + " parameter " + param2string(parameter));
         }
+        if (sticky.length() > 0) {
+            l.add(a + " sticky " + sticky);
+        }
         if (description.length() > 0) {
             l.add(a + " description " + description);
         }
@@ -281,6 +290,14 @@ public void doCfgStr(cmds cmd) {
             hidden = true;
             return;
         }
+        if (a.equals("sticky")) {
+            sticky = cmd.getRemaining();
+            userReader rdr = new userReader(cmd.pipe, null);
+            userExec exe = new userExec(cmd.pipe, rdr);
+            exe.privileged = true;
+            doCommands(exe, cmd);
+            return;
+        }
         cmd.badCmd();
     }
 
@@ -324,6 +341,9 @@ public void getLines(userHelping l, int lev) {
      */
     public void doCommands(userExec exe, cmds par) {
         cmds orig = par.copyBytes(false);
+        if (sticky.length() > 0) {
+            sticky = par.getRemaining();
+        }
         String a = getCommand(orig);
         a = exe.repairCommand(a);
         exe.executeCommand(a);

diff --git a/src/net/freertr/user/userConfig.java b/src/net/freertr/user/userConfig.java
@@ -683,6 +683,8 @@ private void getHelpGlobal(userHelping l) {
         l.add(null, "5  5,.        <cmd>                  command");
         l.add(null, "4  5        description              specify help description");
         l.add(null, "5  5,.        <text>                 help text");
+        l.add(null, "4  5        sticky                   specify sticky parameter");
+        l.add(null, "5  5,.        <text>                 parameter text");
         l.add(null, "4  5        parameter                specify parameter existence");
         l.add(null, "5  .          forbidden              no parameters");
         l.add(null, "5  .          required               need parameters");

diff --git a/src/rtr-sw.txt b/src/rtr-sw.txt
@@ -789,6 +789,7 @@ dial-peer 1
  direction both
  exit
 !
+alias test bash command attach shell1 /rtr/ptyRun.bin /bin/bash
 !
 server telnet tel
  security authentication access

diff --git a/src/rtr.csv b/src/rtr.csv
@@ -1,6 +1,6 @@
 url;file;result;test
 -;-;-;freeRouter v22.3.30-cur, done by cs@nop.
--;-;-;2022-03-30 08:08:37, took 00:08:40, with 80 workers, on 2780 cases, 0 failed, 0 traces, 3 retries
+-;-;-;2022-03-30 08:53:41, took 00:07:57, with 80 workers, on 2780 cases, 0 failed, 0 traces, 2 retries
 -;-;-;./rtr.bin
 http://sources.freertr.net/cfg/basic.tst;basic.tst;success;dummy test
 http://sources.freertr.net/cfg/conn-amt01.tst;conn-amt01.tst;success;amt over ipv4

diff --git a/src/rtr.ftr b/src/rtr.ftr
@@ -2778,7 +2778,6 @@ qc pass: socks4 server
 qc pass: socks5 server
 qc pass: tacacs server
 qc pass: udp forwarder server
-todo: aliases with sticky parameters
 todo: disableable door code in temper
 todo: quic
 todo: update gtp stack to the latest standards

diff --git a/src/rtr.html b/src/rtr.html
@@ -12,7 +12,7 @@
 </style>
 <title>tester</title></head><body>
 release: freeRouter v22.3.30-cur, done by cs@nop.<br/>
-tested: 2022-03-30 08:08:37, took 00:08:40, with 80 workers, on 2780 cases, 0 failed, 0 traces, 3 retries<br/>
+tested: 2022-03-30 08:53:41, took 00:07:57, with 80 workers, on 2780 cases, 0 failed, 0 traces, 2 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/todo.txt b/todo.txt
@@ -1,4 +1,3 @@
-aliases with sticky parameters
 disableable door code in temper
 quic
 update gtp stack to the latest standards