mgmtd: simplify xpath registries

- move from client id indexed array of uints for register info per client to a u64 bitmask. Signed-off-by: Christian Hopps <[email protected]>
FRRouting · Oct 31, 2023 · 65cbbd3 · 65cbbd3
1 parent e1b2381
commit 65cbbd3
Show file tree

Hide file tree

Showing 7 changed files with 214 additions and 299 deletions.
diff --git a/lib/frrstr.c b/lib/frrstr.c
@@ -3,6 +3,7 @@
  * FRR string processing utilities.
  * Copyright (C) 2018  Cumulus Networks, Inc.
  *                     Quentin Young
+ * Copyright (c) 2023, LabN Consulting, L.L.C.
  */
 
 #include "zebra.h"
@@ -225,3 +226,26 @@ char *frrstr_hex(char *buff, size_t bufsiz, const uint8_t *str, size_t num)
 
 	return buff;
 }
+
+const char *frrstr_skip_over_char(const char *s, int skipc)
+{
+	int c, quote = 0;
+
+	while ((c = *s++)) {
+		if (c == '\\') {
+			if (!*s++)
+				return NULL;
+			continue;
+		}
+		if (quote) {
+			if (c == quote)
+				quote = 0;
+			continue;
+		}
+		if (c == skipc)
+			return s;
+		if (c == '"' || c == '\'')
+			quote = c;
+	}
+	return NULL;
+}
diff --git a/lib/frrstr.h b/lib/frrstr.h
@@ -3,6 +3,7 @@
  * FRR string processing utilities.
  * Copyright (C) 2018  Cumulus Networks, Inc.
  *                     Quentin Young
+ * Copyright (c) 2023, LabN Consulting, L.L.C.
  */
 
 #ifndef _FRRSTR_H_
@@ -166,6 +167,13 @@ int all_digit(const char *str);
  */
 char *frrstr_hex(char *buff, size_t bufsiz, const uint8_t *str, size_t num);
 
+
+/*
+ * Advance past a given char `skipc` in a string, while honoring quoting and
+ * backslash escapes.
+ */
+const char *frrstr_skip_over_char(const char *s, int skipc);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/mgmt_be_client.h b/lib/mgmt_be_client.h
@@ -37,6 +37,9 @@ enum mgmt_be_client_id {
 	for ((id) = MGMTD_BE_CLIENT_ID_MIN;		\
 	     (id) < MGMTD_BE_CLIENT_ID_MAX; (id)++)
 
+#define IS_IDBIT_UNSET(v, id) (!((v) & (1ull << (id))))
+#define IS_IDBIT_SET(v, id)   (!IS_IDBIT_UNSET(v, id))
+
 /***************************************************************
  * Constants
  ***************************************************************/