Reorganize CIB op handler functions and start on based_remote.c

daemons/based/Makefile.am

@@ -15,6 +15,7 @@ halibdir	= $(CRM_DAEMON_DIR)
 halib_PROGRAMS	= pacemaker-based
 
 noinst_HEADERS = based_io.h
+noinst_HEADERS += based_messages.h
 noinst_HEADERS += based_notify.h
 noinst_HEADERS += based_operation.h
 noinst_HEADERS += based_transaction.h

daemons/based/based_messages.c

@@ -36,6 +36,34 @@ bool based_is_primary = false;
 
 xmlNode *the_cib = NULL;
 
+/*!
+ * \internal
+ * \brief Process a \c PCMK__CIB_REQUEST_ABS_DELETE
+ *
+ * \param[in] op            Ignored
+ * \param[in] options       Ignored
+ * \param[in] section       Ignored
+ * \param[in] req           Ignored
+ * \param[in] input         Ignored
+ * \param[in] existing_cib  Ignored
+ * \param[in] result_cib    Ignored
+ * \param[in] answer        Ignored
+ *
+ * \return \c -EINVAL
+ *
+ * \note This is unimplemented and simply returns an error.
+ */
+int
+based_process_abs_delete(const char *op, int options, const char *section,
+                         xmlNode *req, xmlNode *input, xmlNode *existing_cib,
+                         xmlNode **result_cib, xmlNode **answer)
+{
+    /* @COMPAT Remove when PCMK__CIB_REQUEST_ABS_DELETE is removed. Note that
+     * external clients with Pacemaker versions < 3.0.0 can send it.
+     */
+    return -EINVAL;
+}
+
 int
 cib_process_shutdown_req(const char *op, int options, const char *section, xmlNode * req,
                          xmlNode * input, xmlNode * existing_cib, xmlNode ** result_cib,
@@ -351,17 +379,6 @@ cib_process_replace_svr(const char *op, int options, const char *section, xmlNod
     return rc;
 }
 
-/* @COMPAT: Remove when PCMK__CIB_REQUEST_ABS_DELETE is removed
- * (At least external client code <3.0.0 can send it)
- */
-int
-cib_process_delete_absolute(const char *op, int options, const char *section, xmlNode * req,
-                            xmlNode * input, xmlNode * existing_cib, xmlNode ** result_cib,
-                            xmlNode ** answer)
-{
-    return -EINVAL;
-}
-
 static xmlNode *
 cib_msg_copy(xmlNode *msg)
 {

daemons/based/based_messages.h

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2004-2025 the Pacemaker project contributors
+ *
+ * The version control history for this file may have further details.
+ *
+ * This source code is licensed under the GNU Lesser General Public License
+ * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
+ */
+
+#ifndef BASED_MESSAGES__H
+#define BASED_MESSAGES__H
+
+#include <stdbool.h>
+
+#include <libxml/tree.h>            // xmlNode *
+
+extern bool based_is_primary;
+extern xmlNode *the_cib;
+
+int based_process_abs_delete(const char *op, int options, const char *section,
+                             xmlNode *req, xmlNode *input,
+                             xmlNode *existing_cib, xmlNode **result_cib,
+                             xmlNode **answer);
+
+int cib_process_shutdown_req(const char *op, int options, const char *section,
+                             xmlNode *req, xmlNode *input,
+                             xmlNode *existing_cib, xmlNode **result_cib,
+                             xmlNode **answer);
+
+int cib_process_noop(const char *op, int options, const char *section,
+                     xmlNode *req, xmlNode *input, xmlNode *existing_cib,
+                     xmlNode **result_cib, xmlNode **answer);
+
+int cib_process_ping(const char *op, int options, const char *section,
+                     xmlNode *req, xmlNode *input, xmlNode *existing_cib,
+                     xmlNode **result_cib, xmlNode **answer);
+
+int cib_process_readwrite(const char *op, int options, const char *section,
+                          xmlNode *req, xmlNode *input, xmlNode *existing_cib,
+                          xmlNode **result_cib, xmlNode **answer);
+
+int cib_process_replace_svr(const char *op, int options, const char *section,
+                            xmlNode *req, xmlNode *input, xmlNode *existing_cib,
+                            xmlNode **result_cib, xmlNode **answer);
+
+int cib_server_process_diff(const char *op, int options, const char *section,
+                            xmlNode *req, xmlNode *input, xmlNode *existing_cib,
+                            xmlNode **result_cib, xmlNode **answer);
+
+int cib_process_sync(const char *op, int options, const char *section,
+                     xmlNode *req, xmlNode *input, xmlNode *existing_cib,
+                     xmlNode **result_cib, xmlNode **answer);
+
+int cib_process_sync_one(const char *op, int options, const char *section,
+                         xmlNode *req, xmlNode *input, xmlNode *existing_cib,
+                         xmlNode **result_cib, xmlNode **answer);
+
+int cib_process_upgrade_server(const char *op, int options, const char *section,
+                               xmlNode *req, xmlNode *input,
+                               xmlNode *existing_cib, xmlNode **result_cib,
+                               xmlNode **answer);
+
+int cib_process_commit_transaction(const char *op, int options,
+                                   const char *section, xmlNode *req,
+                                   xmlNode *input, xmlNode *existing_cib,
+                                   xmlNode **result_cib, xmlNode **answer);
+
+int cib_process_schemas(const char *op, int options, const char *section,
+                        xmlNode *req, xmlNode *input, xmlNode *existing_cib,
+                        xmlNode **result_cib, xmlNode **answer);
+
+void send_sync_request(const char *host);
+int sync_our_cib(xmlNode *request, bool all);
+
+#endif // BASED_MESSAGES__H

daemons/based/based_operation.c

@@ -17,7 +17,7 @@
 #include "pacemaker-based.h"
 
 static const cib__op_fn_t op_functions[] = {
-    [cib__op_abs_delete]       = cib_process_delete_absolute,
+    [cib__op_abs_delete]       = based_process_abs_delete,
     [cib__op_apply_patch]      = cib_server_process_diff,
     [cib__op_bump]             = cib_process_bump,
     [cib__op_commit_transact]  = cib_process_commit_transaction,

daemons/based/pacemaker-based.h

@@ -21,6 +21,7 @@
 #include <crm/common/internal.h>    // pcmk__client_t
 
 #include "based_io.h"
+#include "based_messages.h"
 #include "based_operation.h"
 #include "based_notify.h"
 #include "based_transaction.h"
@@ -36,9 +37,7 @@ enum cib_client_flags {
     cib_notify_diff    = (UINT64_C(1) << 4),
 };
 
-extern bool based_is_primary;
 extern GHashTable *config_hash;
-extern xmlNode *the_cib;
 
 extern GMainLoop *mainloop;
 extern pcmk_cluster_t *crm_cluster;
@@ -64,50 +63,6 @@ int cib_process_request(xmlNode *request, bool privileged,
 void cib_shutdown(int nsig);
 void terminate_cib(int exit_status);
 
-int cib_process_shutdown_req(const char *op, int options, const char *section,
-                             xmlNode *req, xmlNode *input,
-                             xmlNode *existing_cib, xmlNode **result_cib,
-                             xmlNode **answer);
-int cib_process_noop(const char *op, int options, const char *section,
-                     xmlNode *req, xmlNode *input, xmlNode *existing_cib,
-                     xmlNode **result_cib, xmlNode **answer);
-int cib_process_ping(const char *op, int options, const char *section,
-                     xmlNode *req, xmlNode *input, xmlNode *existing_cib,
-                     xmlNode **result_cib, xmlNode **answer);
-int cib_process_readwrite(const char *op, int options, const char *section,
-                          xmlNode *req, xmlNode *input, xmlNode *existing_cib,
-                          xmlNode **result_cib, xmlNode **answer);
-int cib_process_replace_svr(const char *op, int options, const char *section,
-                            xmlNode *req, xmlNode *input, xmlNode *existing_cib,
-                            xmlNode **result_cib, xmlNode **answer);
-int cib_server_process_diff(const char *op, int options, const char *section,
-                            xmlNode *req, xmlNode *input, xmlNode *existing_cib,
-                            xmlNode **result_cib, xmlNode **answer);
-int cib_process_sync(const char *op, int options, const char *section,
-                     xmlNode *req, xmlNode *input, xmlNode *existing_cib,
-                     xmlNode **result_cib, xmlNode **answer);
-int cib_process_sync_one(const char *op, int options, const char *section,
-                         xmlNode *req, xmlNode *input, xmlNode *existing_cib,
-                         xmlNode **result_cib, xmlNode **answer);
-int cib_process_delete_absolute(const char *op, int options,
-                                const char *section, xmlNode *req,
-                                xmlNode *input, xmlNode *existing_cib,
-                                xmlNode **result_cib, xmlNode **answer);
-int cib_process_upgrade_server(const char *op, int options, const char *section,
-                               xmlNode *req, xmlNode *input,
-                               xmlNode *existing_cib, xmlNode **result_cib,
-                               xmlNode **answer);
-int cib_process_commit_transaction(const char *op, int options,
-                                   const char *section, xmlNode *req,
-                                   xmlNode *input, xmlNode *existing_cib,
-                                   xmlNode **result_cib, xmlNode **answer);
-int cib_process_schemas(const char *op, int options, const char *section,
-                        xmlNode *req, xmlNode *input, xmlNode *existing_cib,
-                        xmlNode **result_cib, xmlNode **answer);
-
-void send_sync_request(const char *host);
-int sync_our_cib(xmlNode *request, bool all);
-
 static inline const char *
 cib_config_lookup(const char *opt)
 {

include/crm/cib/internal.h

@@ -95,7 +95,7 @@ enum cib__op_type {
     cib__op_schemas,
 };
 
-gboolean cib_read_config(GHashTable * options, xmlNode * current_cib);
+void cib_read_config(GHashTable *options, xmlNode *current_cib);
 
 typedef int (*cib__op_fn_t)(const char *, int, const char *, xmlNode *,
                             xmlNode *, xmlNode *, xmlNode **, xmlNode **);

lib/cib/cib_utils.c

@@ -730,14 +730,14 @@ cib_native_notify(gpointer data, gpointer user_data)
     pcmk__trace("Callback invoked...");
 }
 
-gboolean
+void
 cib_read_config(GHashTable * options, xmlNode * current_cib)
 {
     xmlNode *config = NULL;
     crm_time_t *now = NULL;
 
     if (options == NULL || current_cib == NULL) {
-        return FALSE;
+        return;
     }
 
     now = crm_time_new(NULL);
@@ -758,8 +758,6 @@ cib_read_config(GHashTable * options, xmlNode * current_cib)
     pcmk__validate_cluster_options(options);
 
     crm_time_free(now);
-
-    return TRUE;
 }
 
 int