qdevice: Merge msg_decode_error functions

Signed-off-by: Jan Friesse <jfriesse@redhat.com>

diff --git a/qdevices/Makefile.am b/qdevices/Makefile.am
index 806703d1fa6c8d3bd092f2c93bf57f702288a07b..02f0730d34fb73757879e8e31864fc2c1d70429b 100644 (file)
--- a/qdevices/Makefile.am
+++ b/qdevices/Makefile.am
@@ -50,6 +50,7 @@ corosync_qnetd_SOURCES        = corosync-qnetd.c \
                           nss-sock.c nss-sock.h qnetd-client.c qnetd-client.h \
                           qnetd-client-list.c qnetd-client-list.h log.c log.h \
                           pr-poll-array.c pr-poll-array.h timer-list.c timer-list.h tlv.c tlv.h \
+                          log-common.c log-common.h \
                           send-buffer-list.c send-buffer-list.h node-list.c node-list.h \
                           qnetd-algo-test.c qnetd-algo-test.h qnetd-algorithm.c qnetd-algorithm.h \
                           qnetd-algo-utils.c qnetd-algo-utils.h \

diff --git a/qdevices/log-common.c b/qdevices/log-common.c
index a4cb5937695ebd49eebbc96736d8300a57f3f765..a4d12462d310158b53cf96e5deb1bf92f84598e2 100644 (file)
--- a/qdevices/log-common.c
+++ b/qdevices/log-common.c
@@ -54,3 +54,26 @@ log_common_debug_dump_node_list(const struct node_list *nlist)
                zi++;
        }
 }
+
+void
+log_common_msg_decode_error(int ret)
+{
+
+       switch (ret) {
+       case -1:
+               log(LOG_WARNING, "Received message with option with invalid length");
+               break;
+       case -2:
+               log(LOG_CRIT, "Can't allocate memory");
+               break;
+       case -3:
+               log(LOG_WARNING, "Received inconsistent msg (tlv len > msg size)");
+               break;
+       case -4:
+               log(LOG_WARNING, "Received message with option with invalid value");
+               break;
+       default:
+               log(LOG_ERR, "Unknown error occurred when decoding message");
+               break;
+       }
+}

diff --git a/qdevices/log-common.h b/qdevices/log-common.h
index 8ccfa93e0b2cedb2dd3066739ff1487b8d6f808f..e0fa483d67e529dee7e5e6fe27c233dbaa7d158d 100644 (file)
--- a/qdevices/log-common.h
+++ b/qdevices/log-common.h
@@ -43,6 +43,8 @@ extern "C" {
 
 extern void            log_common_debug_dump_node_list(const struct node_list *nlist);
 
+extern void            log_common_msg_decode_error(int ret);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/qdevices/log.c b/qdevices/log.c
index 29847c9194ba2d79a1d9397e62b8f9f2d06e7636..278fafa867f7d938f11a465e50937e014da4e005 100644 (file)
--- a/qdevices/log.c
+++ b/qdevices/log.c
@@ -178,26 +178,3 @@ log_set_target(int target, int syslog_facility)
                openlog(log_config_ident, LOG_PID, log_config_syslog_facility);
        }
 }
-
-void
-log_msg_decode_error(int ret)
-{
-
-       switch (ret) {
-       case -1:
-               log(LOG_WARNING, "Received message with option with invalid length");
-               break;
-       case -2:
-               log(LOG_CRIT, "Can't allocate memory");
-               break;
-       case -3:
-               log(LOG_WARNING, "Received inconsistent msg (tlv len > msg size)");
-               break;
-       case -4:
-               log(LOG_WARNING, "Received message with option with invalid value");
-               break;
-       default:
-               log(LOG_ERR, "Unknown error occurred when decoding message");
-               break;
-       }
-}

diff --git a/qdevices/log.h b/qdevices/log.h
index dc43c9fb38e37337a4ecb4478f6266eadfcb6b81..f8b91554b518876c57fbe6408086a508161b84f8 100644 (file)
--- a/qdevices/log.h
+++ b/qdevices/log.h
@@ -69,8 +69,6 @@ extern void           log_set_priority_bump(int enabled);
 
 extern void            log_set_target(int target, int syslog_facility);
 
-extern void            log_msg_decode_error(int ret);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/qdevices/qdevice-net-msg-received.c b/qdevices/qdevice-net-msg-received.c
index 14311c5d0dcf4c2d69a68ce35b10e2b84bff1554..27a0c10ab45f48a53ffaf224e777a408ac630195 100644 (file)
--- a/qdevices/qdevice-net-msg-received.c
+++ b/qdevices/qdevice-net-msg-received.c
@@ -33,6 +33,7 @@
  */
 
 #include "log.h"
+#include "log-common.h"
 #include "qdevice-net-algorithm.h"
 #include "qdevice-net-cast-vote-timer.h"
 #include "qdevice-net-heuristics.h"
@@ -83,29 +84,6 @@ qdevice_net_msg_received_check_tls_compatibility(enum tlv_tls_supported server_t
        return (res);
 }
 
-static void
-qdevice_net_msg_received_log_msg_decode_error(int ret)
-{
-
-       switch (ret) {
-       case -1:
-               log(LOG_WARNING, "Received message with option with invalid length");
-               break;
-       case -2:
-               log(LOG_CRIT, "Can't allocate memory");
-               break;
-       case -3:
-               log(LOG_WARNING, "Received inconsistent msg (tlv len > msg size)");
-               break;
-       case -4:
-               log(LOG_ERR, "Received message with option with invalid value");
-               break;
-       default:
-               log(LOG_ERR, "Unknown error occurred when decoding message");
-               break;
-       }
-}
-
 static int
 qdevice_net_msg_received_unexpected_msg(struct qdevice_net_instance *instance,
     const struct msg_decoded *msg, const char *msg_str)
@@ -881,7 +859,7 @@ qdevice_net_msg_received(struct qdevice_net_instance *instance)
                /*
                 * Error occurred. Disconnect.
                 */
-               qdevice_net_msg_received_log_msg_decode_error(res);
+               log_common_msg_decode_error(res);
                log(LOG_ERR, "Disconnecting from server");
                instance->disconnect_reason = QDEVICE_NET_DISCONNECT_REASON_MSG_DECODE_ERROR;
 

diff --git a/qdevices/qnetd-client-msg-received.c b/qdevices/qnetd-client-msg-received.c
index 1cc176328619cef8cdd52f41f70be5b108b4866e..84b68665c6e548bc5e2eddde5ed77ec745c90c8c 100644 (file)
--- a/qdevices/qnetd-client-msg-received.c
+++ b/qdevices/qnetd-client-msg-received.c
@@ -35,6 +35,7 @@
 #include <sys/types.h>
 
 #include "log.h"
+#include "log-common.h"
 #include "qnetd-algorithm.h"
 #include "qnetd-instance.h"
 #include "qnetd-log-debug.h"
@@ -1142,7 +1143,7 @@ qnetd_client_msg_received(struct qnetd_instance *instance, struct qnetd_client *
                /*
                 * Error occurred. Send server error.
                 */
-               log_msg_decode_error(res);
+               log_common_msg_decode_error(res);
                log(LOG_INFO, "Sending back error message");
 
                if (qnetd_client_send_err(client, msg.seq_number_set, msg.seq_number,