diff options
| author | Martin Schwenke <martin@meltin.net> | 2017-09-04 14:54:47 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2017-09-14 18:42:28 +0200 |
| commit | a808c0200197a4648caba88a550c8d63f3c8fe63 (patch) | |
| tree | be55da1da2aab0fd810b898ae69fe90fb94a414e /ctdb/protocol | |
| parent | 28eda778465272e6d0afa4d03da70d3c9e0d9472 (diff) | |
| download | samba-a808c0200197a4648caba88a550c8d63f3c8fe63.tar.gz | |
ctdb-protocol: Drop marshalling for monitor controls
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Thu Sep 14 18:42:28 CEST 2017 on sn-devel-144
Diffstat (limited to 'ctdb/protocol')
| -rw-r--r-- | ctdb/protocol/protocol_api.h | 10 | ||||
| -rw-r--r-- | ctdb/protocol/protocol_client.c | 58 |
2 files changed, 0 insertions, 68 deletions
diff --git a/ctdb/protocol/protocol_api.h b/ctdb/protocol/protocol_api.h index 83ebd4862ff..d165ba25ade 100644 --- a/ctdb/protocol/protocol_api.h +++ b/ctdb/protocol/protocol_api.h @@ -299,10 +299,6 @@ int ctdb_reply_control_get_pnn(struct ctdb_reply_control *reply, void ctdb_req_control_shutdown(struct ctdb_req_control *request); int ctdb_reply_control_shutdown(struct ctdb_reply_control *reply); -void ctdb_req_control_get_monmode(struct ctdb_req_control *request); -int ctdb_reply_control_get_monmode(struct ctdb_reply_control *reply, - int *mon_mode); - void ctdb_req_control_tcp_client(struct ctdb_req_control *request, struct ctdb_connection *conn); int ctdb_reply_control_tcp_client(struct ctdb_reply_control *reply); @@ -388,12 +384,6 @@ int ctdb_reply_control_try_delete_records(struct ctdb_reply_control *reply, TALLOC_CTX *mem_ctx, struct ctdb_rec_buffer **recbuf); -void ctdb_req_control_enable_monitor(struct ctdb_req_control *request); -int ctdb_reply_control_enable_monitor(struct ctdb_reply_control *reply); - -void ctdb_req_control_disable_monitor(struct ctdb_req_control *request); -int ctdb_reply_control_disable_monitor(struct ctdb_reply_control *reply); - void ctdb_req_control_add_public_ip(struct ctdb_req_control *request, struct ctdb_addr_info *addr_info); int ctdb_reply_control_add_public_ip(struct ctdb_reply_control *reply); diff --git a/ctdb/protocol/protocol_client.c b/ctdb/protocol/protocol_client.c index dbe13d0be79..d750260ff8a 100644 --- a/ctdb/protocol/protocol_client.c +++ b/ctdb/protocol/protocol_client.c @@ -720,31 +720,6 @@ int ctdb_reply_control_shutdown(struct ctdb_reply_control *reply) /* CTDB_CONTROL_GET_MONMODE */ -void ctdb_req_control_get_monmode(struct ctdb_req_control *request) -{ - request->opcode = CTDB_CONTROL_GET_MONMODE; - request->pad = 0; - request->srvid = 0; - request->client_id = 0; - request->flags = 0; - - request->rdata.opcode = CTDB_CONTROL_GET_MONMODE; -} - -int ctdb_reply_control_get_monmode(struct ctdb_reply_control *reply, - int *mon_mode) -{ - if (reply->rdata.opcode != CTDB_CONTROL_GET_MONMODE) { - return EPROTO; - } - - if (reply->status >= 0) { - *mon_mode = reply->status; - reply->status = 0; - } - return reply->status; -} - /* CTDB_CONTROL_TCP_CLIENT */ void ctdb_req_control_tcp_client(struct ctdb_req_control *request, @@ -1196,41 +1171,8 @@ int ctdb_reply_control_try_delete_records(struct ctdb_reply_control *reply, } /* CTDB_CONTROL_ENABLE_MONITOR */ - -void ctdb_req_control_enable_monitor(struct ctdb_req_control *request) -{ - request->opcode = CTDB_CONTROL_ENABLE_MONITOR; - request->pad = 0; - request->srvid = 0; - request->client_id = 0; - request->flags = 0; - - request->rdata.opcode = CTDB_CONTROL_ENABLE_MONITOR; -} - -int ctdb_reply_control_enable_monitor(struct ctdb_reply_control *reply) -{ - return ctdb_reply_control_generic(reply, CTDB_CONTROL_ENABLE_MONITOR); -} - /* CTDB_CONTROL_DISABLE_MONITOR */ -void ctdb_req_control_disable_monitor(struct ctdb_req_control *request) -{ - request->opcode = CTDB_CONTROL_DISABLE_MONITOR; - request->pad = 0; - request->srvid = 0; - request->client_id = 0; - request->flags = 0; - - request->rdata.opcode = CTDB_CONTROL_DISABLE_MONITOR; -} - -int ctdb_reply_control_disable_monitor(struct ctdb_reply_control *reply) -{ - return ctdb_reply_control_generic(reply, CTDB_CONTROL_DISABLE_MONITOR); -} - /* CTDB_CONTROL_ADD_PUBLIC_IP */ void ctdb_req_control_add_public_ip(struct ctdb_req_control *request, |