qnetd: Remove write callback on listening sockets

IPC and TLS sockets are read only, so write callbacks should never
happen (specifically tested in pr-poll-loop test) so remove them.

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

diff --git a/qdevices/corosync-qnetd.c b/qdevices/corosync-qnetd.c
index c5c6b09dde04983c3ad12275fa966d21d378c1ad..6b9a33b6b776be5f4ef1183f9275d9cc9c2300e8 100644 (file)
--- a/qdevices/corosync-qnetd.c
+++ b/qdevices/corosync-qnetd.c
@@ -99,18 +99,6 @@ server_socket_poll_loop_read_cb(PRFileDesc *prfd, void *user_data1, void *user_d
        return (0);
 }
 
-static int
-server_socket_poll_loop_write_cb(PRFileDesc *prfd, void *user_data1, void *user_data2)
-{
-
-       /*
-        * Poll write on listen socket -> fatal error
-        */
-       log(LOG_CRIT, "POLL_WRITE on listening socket");
-
-       return (-1);
-}
-
 static int
 server_socket_poll_loop_err_cb(PRFileDesc *prfd, short revents, void *user_data1, void *user_data2)
 {
@@ -437,7 +425,7 @@ main(int argc, char * const argv[])
        if (pr_poll_loop_add_prfd(&instance.main_poll_loop, instance.server.socket, POLLIN,
            NULL,
            server_socket_poll_loop_read_cb,
-           server_socket_poll_loop_write_cb,
+           NULL,
            server_socket_poll_loop_err_cb,
            &instance, NULL) != 0) {
                log(LOG_ERR, "Can't add server socket to main poll loop");

diff --git a/qdevices/qnetd-ipc.c b/qdevices/qnetd-ipc.c
index 3a981e0e774d0bbbe1c6445df75de02fde1bca38..9c93ab42592c2215641605f3d82101f333148318 100644 (file)
--- a/qdevices/qnetd-ipc.c
+++ b/qdevices/qnetd-ipc.c
@@ -77,15 +77,6 @@ ipc_socket_poll_loop_read_cb(int fd, void *user_data1, void *user_data2)
        return (0);
 }
 
-static int
-ipc_socket_poll_loop_write_cb(int fd, void *user_data1, void *user_data2)
-{
-
-       log(LOG_CRIT, "POLL_WRITE on listening IPC socket");
-
-       return (-1);
-}
-
 static int
 ipc_socket_poll_loop_err_cb(int fd, short revents, void *user_data1, void *user_data2)
 {
@@ -201,7 +192,7 @@ qnetd_ipc_init(struct qnetd_instance *instance)
        if (pr_poll_loop_add_fd(&instance->main_poll_loop, instance->local_ipc.socket, POLLIN,
            ipc_socket_poll_loop_set_events_cb,
            ipc_socket_poll_loop_read_cb,
-           ipc_socket_poll_loop_write_cb,
+           NULL,
            ipc_socket_poll_loop_err_cb, instance, NULL) == -1) {
                log_err(LOG_CRIT, "Can't add IPC socket to main poll loop");