automatic commit at releng box

src/net/freertr/serv/servP4lang.java

@@ -74,6 +74,7 @@
 import net.freertr.tab.tabRouteEntry;
 import net.freertr.tab.tabRouteIface;
 import net.freertr.user.userFilter;
+import net.freertr.user.userFormat;
 import net.freertr.user.userHelping;
 import net.freertr.util.bits;
 import net.freertr.util.cmds;
@@ -187,6 +188,26 @@ public servP4lang() {
      */
     protected servP4langConn conn = null;
 
+    /**
+     * last peer
+     */
+    protected addrIP remote = null;
+
+    /**
+     * last capability
+     */
+    protected String capability = null;
+
+    /**
+     * last platform
+     */
+    protected String platform = null;
+
+    /**
+     * connection start
+     */
+    protected long started = 0;
+
     /**
      * interconnection interface
      */
@@ -615,7 +636,9 @@ public boolean srvAccept(pipeSide pipe, prtGenConn id) {
         }
         expDynAccNxt = 0;
         conn = new servP4langConn(pipe, this);
-        logger.warn("neighbor " + id.peerAddr + " up");
+        remote = id.peerAddr.copyBytes();
+        started = bits.getTime();
+        logger.warn("neighbor " + remote + " up");
         return false;
     }
 
@@ -746,6 +769,31 @@ public counter getCounter() {
         return cntr;
     }
 
+    /**
+     * do clear
+     */
+    public void doClear() {
+        if (conn == null) {
+            return;
+        }
+        conn.pipe.setClose();
+    }
+
+    /**
+     * get show
+     *
+     * @return show
+     */
+    public userFormat getShow() {
+        userFormat res = new userFormat("|", "category|value");
+        res.add("peer|" + remote);
+        res.add("capability|" + capability);
+        res.add("platform|" + platform);
+        res.add("since|" + bits.time2str(cfgAll.timeZoneName, started + cfgAll.timeServerOffset, 3));
+        res.add("for|" + bits.timePast(started));
+        return res;
+    }
+
 }
 
 class servP4langStr<T extends Comparator<T>> implements Comparator<servP4langStr<T>> {
@@ -1486,10 +1534,6 @@ private boolean doRound() {
             }
             cmds cmd = new cmds("p4lang", s);
             s = cmd.word();
-            if (s.equals("dataplane-say")) {
-                logger.info("dataplane said: " + cmd.getRemaining());
-                return false;
-            }
             if (s.equals("state")) {
                 servP4langIfc ntry = findIfc(bits.str2num(cmd.word()));
                 if (ntry == null) {
@@ -1980,6 +2024,18 @@ private boolean doRound() {
                 }
                 return false;
             }
+            if (s.equals("dataplane-say")) {
+                logger.info("dataplane said: " + cmd.getRemaining());
+                return false;
+            }
+            if (s.equals("platform")) {
+                lower.platform = cmd.getRemaining();
+                return false;
+            }
+            if (s.equals("capability")) {
+                lower.capability = cmd.getRemaining();
+                return false;
+            }
             if (debugger.servP4langErr) {
                 logger.debug("got unneeded report: " + cmd.getOriginal());
             }

src/net/freertr/user/userClear.java

@@ -51,6 +51,7 @@
 import net.freertr.rtr.rtrRip4neigh;
 import net.freertr.rtr.rtrRip6neigh;
 import net.freertr.serv.servBmp2mrt;
+import net.freertr.serv.servP4lang;
 import net.freertr.tab.tabRouteAttr;
 import net.freertr.util.bits;
 import net.freertr.util.cmds;
@@ -135,6 +136,15 @@ public cfgAlias doer() {
             ntry.stopCall(cmd.word());
             return null;
         }
+        if (a.equals("p4lang")) {
+            servP4lang srv = cfgAll.srvrFind(new servP4lang(), cfgAll.dmnP4lang, cmd.word());
+            if (srv == null) {
+                cmd.error("no such server");
+                return null;
+            }
+            srv.doClear();
+            return null;
+        }
         if (a.equals("bmp")) {
             servBmp2mrt srv = cfgAll.srvrFind(new servBmp2mrt(), cfgAll.dmnBmp, cmd.word());
             if (srv == null) {

src/net/freertr/user/userExec.java

@@ -1136,6 +1136,8 @@ public static void getHelpShow(userHelping hl, boolean privi) {
         hl.add(null, "6 .              <name>          key");
         hl.add(null, "2 3      bmp                     bgp monitoring protocol information");
         hl.add(cfgAll.dmnBmp.listServers(), "3 4,.      <name:loc>            server name");
+        hl.add(null, "2 3      p4lang                  p4lang protocol information");
+        hl.add(cfgAll.dmnP4lang.listServers(), "3 .        <name:loc>            server name");
         hl.add(null, "4 5,.        <addr>              from");
         hl.add(null, "5 .            <addr>            peer");
         hl.add(null, "2 3      bridge                  bridging information");
@@ -1520,6 +1522,8 @@ public userHelping getHelping() {
         getHelpClearIpX(hl);
         hl.add(null, "2 3      bmp                     clear one bmp server");
         hl.add(cfgAll.dmnBmp.listServers(), "3 .        <name:loc>            server name");
+        hl.add(null, "2 3      p4lang                  clear one p4lang server");
+        hl.add(cfgAll.dmnP4lang.listServers(), "3 .        <name:loc>            server name");
         hl.add(null, "2 3      socket                  clear one socket");
         hl.add(null, "3 4        <name:vrf>            vrf name");
         hl.add(null, "4 5          tcp                 select tcp");

src/net/freertr/user/userShow.java

@@ -74,6 +74,7 @@
 import net.freertr.serv.servDns;
 import net.freertr.serv.servHttp;
 import net.freertr.serv.servNetflow;
+import net.freertr.serv.servP4lang;
 import net.freertr.serv.servSmtp;
 import net.freertr.serv.servStreamingMdt;
 import net.freertr.tab.tabGen;
@@ -744,6 +745,15 @@ public cfgAlias doer() {
             }
             return null;
         }
+        if (a.equals("p4lang")) {
+            servP4lang srv = cfgAll.srvrFind(new servP4lang(), cfgAll.dmnP4lang, cmd.word());
+            if (srv == null) {
+                cmd.error("no such server");
+                return null;
+            }
+            rdr.putStrTab(srv.getShow());
+            return null;
+        }
         if (a.equals("bmp")) {
             servBmp2mrt srv = cfgAll.srvrFind(new servBmp2mrt(), cfgAll.dmnBmp, cmd.word());
             if (srv == null) {