From 6239d1dd84a50585a30175978be7e6d8ffb0b155 Mon Sep 17 00:00:00 2001

From: Ken Gaillot <kgaillot@redhat.com>

Date: Tue, 22 Dec 2015 15:59:21 -0600

Subject: [PATCH 102/105] Refactor: crmd,lrmd,liblrmd: use defined constants

 for lrmd IPC operations

Reduces chance of typos.

---

 crmd/lrm_state.c        |  6 +++---

 include/crm/lrmd.h      |  6 ++++++

 lib/lrmd/proxy_common.c |  6 +++---

 lrmd/ipc_proxy.c        | 14 +++++++-------

 lrmd/remote_ctl.c       |  6 +++---

 5 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/crmd/lrm_state.c b/crmd/lrm_state.c

index 0e52ff6..497d3f9 100644

--- a/crmd/lrm_state.c

+++ b/crmd/lrm_state.c

@@ -481,7 +481,7 @@ remote_proxy_cb(lrmd_t *lrmd, void *userdata, xmlNode *msg)

     crm_element_value_int(msg, F_LRMD_IPC_MSG_ID, &msg_id);

     /* This is msg from remote ipc client going to real ipc server */

-    if (safe_str_eq(op, "new")) {

+    if (safe_str_eq(op, LRMD_IPC_OP_NEW)) {

         const char *channel = crm_element_value(msg, F_LRMD_IPC_IPC_SERVER);

         CRM_CHECK(channel != NULL, return);

@@ -490,10 +490,10 @@ remote_proxy_cb(lrmd_t *lrmd, void *userdata, xmlNode *msg)

             remote_proxy_notify_destroy(lrmd, session);

         }

         crm_trace("new remote proxy client established to %s, session id %s", channel, session);

-    } else if (safe_str_eq(op, "destroy")) {

+    } else if (safe_str_eq(op, LRMD_IPC_OP_DESTROY)) {

         remote_proxy_end_session(session);

-    } else if (safe_str_eq(op, "request")) {

+    } else if (safe_str_eq(op, LRMD_IPC_OP_REQUEST)) {

         int flags = 0;

         xmlNode *request = get_message_xml(msg, F_LRMD_IPC_MSG);

         const char *name = crm_element_value(msg, F_LRMD_IPC_CLIENT);

diff --git a/include/crm/lrmd.h b/include/crm/lrmd.h

index 5a3c6ce..5c74798 100644

--- a/include/crm/lrmd.h

+++ b/include/crm/lrmd.h

@@ -90,6 +90,12 @@ typedef struct lrmd_key_value_s {

 #define LRMD_OP_POKE              "lrmd_rsc_poke"

 #define LRMD_OP_NEW_CLIENT        "lrmd_rsc_new_client"

+#define LRMD_IPC_OP_NEW           "new"

+#define LRMD_IPC_OP_DESTROY       "destroy"

+#define LRMD_IPC_OP_EVENT         "event"

+#define LRMD_IPC_OP_REQUEST       "request"

+#define LRMD_IPC_OP_RESPONSE      "response"

+

 #define F_LRMD_IPC_OP           "lrmd_ipc_op"

 #define F_LRMD_IPC_IPC_SERVER   "lrmd_ipc_server"

 #define F_LRMD_IPC_SESSION      "lrmd_ipc_session"

diff --git a/lib/lrmd/proxy_common.c b/lib/lrmd/proxy_common.c

index 50c59c3..a0f5e62 100644

--- a/lib/lrmd/proxy_common.c

+++ b/lib/lrmd/proxy_common.c

@@ -39,7 +39,7 @@ remote_proxy_notify_destroy(lrmd_t *lrmd, const char *session_id)

 {

     /* sending to the remote node that an ipc connection has been destroyed */

     xmlNode *msg = create_xml_node(NULL, T_LRMD_IPC_PROXY);

-    crm_xml_add(msg, F_LRMD_IPC_OP, "destroy");

+    crm_xml_add(msg, F_LRMD_IPC_OP, LRMD_IPC_OP_DESTROY);

     crm_xml_add(msg, F_LRMD_IPC_SESSION, session_id);

     lrmd_internal_proxy_send(lrmd, msg);

     free_xml(msg);

@@ -50,7 +50,7 @@ remote_proxy_relay_event(lrmd_t *lrmd, const char *session_id, xmlNode *msg)

 {

     /* sending to the remote node an event msg. */

     xmlNode *event = create_xml_node(NULL, T_LRMD_IPC_PROXY);

-    crm_xml_add(event, F_LRMD_IPC_OP, "event");

+    crm_xml_add(event, F_LRMD_IPC_OP, LRMD_IPC_OP_EVENT);

     crm_xml_add(event, F_LRMD_IPC_SESSION, session_id);

     add_message_xml(event, F_LRMD_IPC_MSG, msg);

     crm_log_xml_explicit(event, "EventForProxy");

@@ -63,7 +63,7 @@ remote_proxy_relay_response(lrmd_t *lrmd, const char *session_id, xmlNode *msg,

 {

     /* sending to the remote node a response msg. */

     xmlNode *response = create_xml_node(NULL, T_LRMD_IPC_PROXY);

-    crm_xml_add(response, F_LRMD_IPC_OP, "response");

+    crm_xml_add(response, F_LRMD_IPC_OP, LRMD_IPC_OP_RESPONSE);

     crm_xml_add(response, F_LRMD_IPC_SESSION, session_id);

     crm_xml_add_int(response, F_LRMD_IPC_MSG_ID, msg_id);

     add_message_xml(response, F_LRMD_IPC_MSG, msg);

diff --git a/lrmd/ipc_proxy.c b/lrmd/ipc_proxy.c

index d95a396..164a9ff 100644

--- a/lrmd/ipc_proxy.c

+++ b/lrmd/ipc_proxy.c

@@ -101,7 +101,7 @@ ipc_proxy_accept(qb_ipcs_connection_t * c, uid_t uid, gid_t gid, const char *ipc

     g_hash_table_insert(ipc_clients, client->id, client);

     msg = create_xml_node(NULL, T_LRMD_IPC_PROXY);

-    crm_xml_add(msg, F_LRMD_IPC_OP, "new");

+    crm_xml_add(msg, F_LRMD_IPC_OP, LRMD_IPC_OP_NEW);

     crm_xml_add(msg, F_LRMD_IPC_IPC_SERVER, ipc_channel);

     crm_xml_add(msg, F_LRMD_IPC_SESSION, client->id);

     lrmd_server_send_notify(ipc_proxy, msg);

@@ -157,7 +157,7 @@ ipc_proxy_forward_client(crm_client_t *ipc_proxy, xmlNode *xml)

     if (ipc_client == NULL) {

         xmlNode *msg = create_xml_node(NULL, T_LRMD_IPC_PROXY);

-        crm_xml_add(msg, F_LRMD_IPC_OP, "destroy");

+        crm_xml_add(msg, F_LRMD_IPC_OP, LRMD_IPC_OP_DESTROY);

         crm_xml_add(msg, F_LRMD_IPC_SESSION, session);

         lrmd_server_send_notify(ipc_proxy, msg);

         free_xml(msg);

@@ -176,11 +176,11 @@ ipc_proxy_forward_client(crm_client_t *ipc_proxy, xmlNode *xml)

      * and forwarding it to connection 1.

      */

-    if (safe_str_eq(msg_type, "event")) {

+    if (safe_str_eq(msg_type, LRMD_IPC_OP_EVENT)) {

         crm_trace("Sending event to %s", ipc_client->id);

         rc = crm_ipcs_send(ipc_client, 0, msg, crm_ipc_server_event);

-    } else if (safe_str_eq(msg_type, "response")) {

+    } else if (safe_str_eq(msg_type, LRMD_IPC_OP_RESPONSE)) {

         int msg_id = 0;

         crm_element_value_int(xml, F_LRMD_IPC_MSG_ID, &msg_id);

@@ -190,7 +190,7 @@ ipc_proxy_forward_client(crm_client_t *ipc_proxy, xmlNode *xml)

         CRM_LOG_ASSERT(msg_id == ipc_client->request_id);

         ipc_client->request_id = 0;

-    } else if (safe_str_eq(msg_type, "destroy")) {

+    } else if (safe_str_eq(msg_type, LRMD_IPC_OP_DESTROY)) {

         qb_ipcs_disconnect(ipc_client->ipcs);

     } else {

@@ -245,7 +245,7 @@ ipc_proxy_dispatch(qb_ipcs_connection_t * c, void *data, size_t size)

     client->request_id = id;

     msg = create_xml_node(NULL, T_LRMD_IPC_PROXY);

-    crm_xml_add(msg, F_LRMD_IPC_OP, "request");

+    crm_xml_add(msg, F_LRMD_IPC_OP, LRMD_IPC_OP_REQUEST);

     crm_xml_add(msg, F_LRMD_IPC_SESSION, client->id);

     crm_xml_add(msg, F_LRMD_IPC_CLIENT, crm_client_name(client));

     crm_xml_add(msg, F_LRMD_IPC_USER, client->user);

@@ -275,7 +275,7 @@ ipc_proxy_closed(qb_ipcs_connection_t * c)

     if (ipc_proxy) {

         xmlNode *msg = create_xml_node(NULL, T_LRMD_IPC_PROXY);

-        crm_xml_add(msg, F_LRMD_IPC_OP, "destroy");

+        crm_xml_add(msg, F_LRMD_IPC_OP, LRMD_IPC_OP_DESTROY);

         crm_xml_add(msg, F_LRMD_IPC_SESSION, client->id);

         lrmd_server_send_notify(ipc_proxy, msg);

         free_xml(msg);

diff --git a/lrmd/remote_ctl.c b/lrmd/remote_ctl.c

index ad85954..1983c88 100644

--- a/lrmd/remote_ctl.c

+++ b/lrmd/remote_ctl.c

@@ -333,7 +333,7 @@ remote_proxy_cb(lrmd_t *lrmd, void *userdata, xmlNode *msg)

     crm_element_value_int(msg, F_LRMD_IPC_MSG_ID, &msg_id);

     /* This is msg from remote ipc client going to real ipc server */

-    if (safe_str_eq(op, "new")) {

+    if (safe_str_eq(op, LRMD_IPC_OP_NEW)) {

         const char *channel = crm_element_value(msg, F_LRMD_IPC_IPC_SERVER);

         CRM_CHECK(channel != NULL, return);

@@ -342,10 +342,10 @@ remote_proxy_cb(lrmd_t *lrmd, void *userdata, xmlNode *msg)

             remote_proxy_notify_destroy(lrmd, session);

         }

         crm_info("new remote proxy client established to %s, session id %s", channel, session);

-    } else if (safe_str_eq(op, "destroy")) {

+    } else if (safe_str_eq(op, LRMD_IPC_OP_DESTROY)) {

         remote_proxy_end_session(session);

-    } else if (safe_str_eq(op, "request")) {

+    } else if (safe_str_eq(op, LRMD_IPC_OP_REQUEST)) {

         int flags = 0;

         xmlNode *request = get_message_xml(msg, F_LRMD_IPC_MSG);

         const char *name = crm_element_value(msg, F_LRMD_IPC_CLIENT);

-- 

1.8.3.1