anvil: Rename ANVIL_CONNECTION_TYPE_MASTER to ANVIL_CONNECTION_TYPE_SHARED_FIFO

This connection type is the shared FIFO from the master process that all
services use to send CONNECT, DISCONNECT and KILL commands. Rename
accordingly.

diff --git a/src/anvil/anvil-connection.c b/src/anvil/anvil-connection.c
index 2439a6a54802cfdc5926cb425c9a457ff1206797..387083a72cb1493687705357dfadb405f1bfa915 100644 (file)
--- a/src/anvil/anvil-connection.c
+++ b/src/anvil/anvil-connection.c
@@ -503,7 +503,7 @@ anvil_connection_request(struct anvil_connection *conn,
                        *error_r = "KILL: Not enough parameters";
                        return -1;
                }
-               if (conn->conn_type != ANVIL_CONNECTION_TYPE_MASTER) {
+               if (conn->conn_type != ANVIL_CONNECTION_TYPE_SHARED_FIFO) {
                        *error_r = "KILL sent by a non-master connection";
                        return -1;
                }
@@ -648,7 +648,7 @@ anvil_connection_input_line(struct connection *_conn, const char *line)
                if (!version_string_verify(line, "anvil-client",
                                ANVIL_CLIENT_PROTOCOL_MAJOR_VERSION)) {
                        if (anvil_restarted &&
-                           (conn->conn_type == ANVIL_CONNECTION_TYPE_MASTER ||
+                           (conn->conn_type == ANVIL_CONNECTION_TYPE_SHARED_FIFO ||
                             conn->fifo)) {
                                /* old pending data. ignore input until we get
                                   the handshake. */

diff --git a/src/anvil/anvil-connection.h b/src/anvil/anvil-connection.h
index e8c988f741727d50258e98d4d3fd2f49920ffd6b..f6dd6130e264d73eb6a028c8a913691993490f2e 100644 (file)
--- a/src/anvil/anvil-connection.h
+++ b/src/anvil/anvil-connection.h
@@ -3,7 +3,7 @@
 
 enum anvil_connection_type {
        ANVIL_CONNECTION_TYPE_ADMIN,
-       ANVIL_CONNECTION_TYPE_MASTER,
+       ANVIL_CONNECTION_TYPE_SHARED_FIFO,
        ANVIL_CONNECTION_TYPE_AUTH_PENALTY,
 };
 

diff --git a/src/anvil/main.c b/src/anvil/main.c
index 67ccccf45d304f4c0c5b7064fdd23b7a7316d793..d4ca0491bfccc3880ea14ab002dbcc635c0016ed 100644 (file)
--- a/src/anvil/main.c
+++ b/src/anvil/main.c
@@ -99,7 +99,7 @@ static void client_connected(struct master_service_connection *conn)
        enum anvil_connection_type type;
 
        if (conn->fifo)
-               type = ANVIL_CONNECTION_TYPE_MASTER;
+               type = ANVIL_CONNECTION_TYPE_SHARED_FIFO;
        else {
                const char *type_str = master_service_connection_get_type(conn);