automatic commit at releng box

mc36 · Dec 8, 2021 · b1a082e · b1a082e
1 parent 88c196a
commit b1a082e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/src/net/freertr/serv/servP4lang.java b/src/net/freertr/serv/servP4lang.java
@@ -4531,16 +4531,16 @@ private void doRoutes(boolean ipv4, int vrf, tabRoute<addrIP> need, tabRoute<add
     }
 
     public String numat2str(tabIntMatcher mat, int max) {
-        if (mat.action == tabIntMatcher.actionType.xact) {
-            return mat.rangeMin + " " + max;
-        }
-        if (mat.action != tabIntMatcher.actionType.range) {
-            return "0 0";
-        }
-        if (mat.rangeMin == mat.rangeMax) {
-            return mat.rangeMin + " " + max;
+        switch (mat.action) {
+            case xact:
+                return mat.rangeMin + " " + max;
+            case range:
+                return mat.rangeMin + " " + (max - mat.rangeMax + mat.rangeMin);
+            case mask:
+                return mat.rangeMin + " " + mat.rangeMax;
+            default:
+                return "0 0";
         }
-        return mat.rangeMin + " " + (max - mat.rangeMax + mat.rangeMin);
     }
 
     public String ip2str(boolean ipv4, addrIP adr) {

diff --git a/src/net/freertr/tab/tabIntMatcher.java b/src/net/freertr/tab/tabIntMatcher.java
@@ -24,7 +24,6 @@ public tabIntMatcher() {
      * list of match criterias
      */
     public enum actionType {
-
         /**
          * always
          */
@@ -36,7 +35,11 @@ public enum actionType {
         /**
          * range
          */
-        range
+        range,
+        /**
+         * mask
+         */
+        mask
     }
 
     /**
@@ -63,6 +66,8 @@ public boolean matches(int i) {
                 return (i == rangeMin);
             case range:
                 return ((i >= rangeMin) && (i <= rangeMax));
+            case mask:
+                return (i & rangeMax) == rangeMin;
             default:
                 return false;
         }
@@ -96,6 +101,13 @@ public boolean fromString(String s) {
             rangeMax = bits.str2num(s.substring(i + 1, s.length()).trim());
             return false;
         }
+        i = s.indexOf("&");
+        if (i >= 0) {
+            action = actionType.mask;
+            rangeMin = bits.str2num(s.substring(0, i).trim());
+            rangeMax = bits.str2num(s.substring(i + 1, s.length()).trim());
+            return false;
+        }
         action = actionType.xact;
         rangeMin = bits.str2num(s);
         rangeMax = rangeMin;
@@ -121,6 +133,8 @@ public String toString() {
                 return "" + rangeMin;
             case range:
                 return rangeMin + "-" + rangeMax;
+            case mask:
+                return rangeMin + "&" + rangeMax;
             default:
                 return "unknown";
         }