From fc3547880aafad726509f0514df2d5e0bb140728 Mon Sep 17 00:00:00 2001
From: Alexander Zubkov <green@qrator.net>
Date: Thu, 24 Aug 2023 04:30:42 +0200
Subject: Filter: Add bytestring type

 - Rename BYTESTRING lexem to BYTETEXT, not to collide with 'bytestring' type name
 - Add bytestring type with id T_BYTESTRING (0x2c)
 - Add from_hex() filter function to create bytestring from hex string
 - Add filter test cases for bytestring type

Minor changes by committer.
---
 conf/cf-lex.l   | 2 +-
 conf/confbase.Y | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'conf')

diff --git a/conf/cf-lex.l b/conf/cf-lex.l
index 965e1e3f..e789e864 100644
--- a/conf/cf-lex.l
+++ b/conf/cf-lex.l
@@ -272,7 +272,7 @@ WHITE [ \t]
   ASSERT(bs->length == len);
 
   cf_lval.bs = bs;
-  return BYTESTRING;
+  return BYTETEXT;
 }
 
 ({XIGIT}*::|({XIGIT}*:){3,})({XIGIT}*|{DIGIT}+\.{DIGIT}+\.{DIGIT}+\.{DIGIT}+) {
diff --git a/conf/confbase.Y b/conf/confbase.Y
index 3dd5fed7..da750d38 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -106,7 +106,7 @@ CF_DECLS
 %token <i64> VPN_RD
 %token <s> CF_SYM_KNOWN CF_SYM_UNDEFINED
 %token <t> TEXT
-%token <bs> BYTESTRING
+%token <bs> BYTETEXT
 %type <iface> ipa_scope
 
 %type <i> expr bool pxlen4
-- 
cgit v1.2.3