diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2017-04-06 18:58:01 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2017-10-10 11:45:19 +0200 |
| commit | 4467c6112a6954908b97dce994852f882c38ce56 (patch) | |
| tree | 44dc21b554fb1700c580bfe24e0e9da282368427 /ctdb/protocol | |
| parent | 2cb5fdac42104c68566c9766cabf7d167091f64d (diff) | |
| download | samba-4467c6112a6954908b97dce994852f882c38ce56.tar.gz | |
ctdb-protocol: Add protocol marshalling for tunnel controls
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/protocol')
| -rw-r--r-- | ctdb/protocol/protocol_api.h | 8 | ||||
| -rw-r--r-- | ctdb/protocol/protocol_client.c | 42 | ||||
| -rw-r--r-- | ctdb/protocol/protocol_control.c | 12 | ||||
| -rw-r--r-- | ctdb/protocol/protocol_debug.c | 2 |
4 files changed, 64 insertions, 0 deletions
diff --git a/ctdb/protocol/protocol_api.h b/ctdb/protocol/protocol_api.h index e15bb972e22..0e5d57fdece 100644 --- a/ctdb/protocol/protocol_api.h +++ b/ctdb/protocol/protocol_api.h @@ -601,6 +601,14 @@ void ctdb_req_control_check_pid_srvid(struct ctdb_req_control *request, int ctdb_reply_control_check_pid_srvid(struct ctdb_reply_control *reply, int *status); +void ctdb_req_control_tunnel_register(struct ctdb_req_control *request, + uint64_t tunnel_id); +int ctdb_reply_control_tunnel_register(struct ctdb_reply_control *reply); + +void ctdb_req_control_tunnel_deregister(struct ctdb_req_control *request, + uint64_t tunnel_id); +int ctdb_reply_control_tunnel_deregister(struct ctdb_reply_control *reply); + /* From protocol/protocol_debug.c */ void ctdb_packet_print(uint8_t *buf, size_t buflen, FILE *fp); diff --git a/ctdb/protocol/protocol_client.c b/ctdb/protocol/protocol_client.c index a741b114dbd..a18af08e21a 100644 --- a/ctdb/protocol/protocol_client.c +++ b/ctdb/protocol/protocol_client.c @@ -2329,3 +2329,45 @@ int ctdb_reply_control_check_pid_srvid(struct ctdb_reply_control *reply, return reply->status; } + +/* CTDB_CONTROL_TUNNEL_REGISTER */ + +void ctdb_req_control_tunnel_register(struct ctdb_req_control *request, + uint64_t tunnel_id) +{ + request->opcode = CTDB_CONTROL_TUNNEL_REGISTER; + request->pad = 0; + request->srvid = tunnel_id; + request->client_id = 0; + request->flags = 0; +} + +int ctdb_reply_control_tunnel_register(struct ctdb_reply_control *reply) +{ + if (reply->rdata.opcode != CTDB_CONTROL_TUNNEL_REGISTER) { + return EPROTO; + } + + return reply->status; +} + +/* CTDB_CONTROL_TUNNEL_DEREGISTER */ + +void ctdb_req_control_tunnel_deregister(struct ctdb_req_control *request, + uint64_t tunnel_id) +{ + request->opcode = CTDB_CONTROL_TUNNEL_DEREGISTER; + request->pad = 0; + request->srvid = tunnel_id; + request->client_id = 0; + request->flags = 0; +} + +int ctdb_reply_control_tunnel_deregister(struct ctdb_reply_control *reply) +{ + if (reply->rdata.opcode != CTDB_CONTROL_TUNNEL_DEREGISTER) { + return EPROTO; + } + + return reply->status; +} diff --git a/ctdb/protocol/protocol_control.c b/ctdb/protocol/protocol_control.c index 5abe0379fe0..12a78e1792d 100644 --- a/ctdb/protocol/protocol_control.c +++ b/ctdb/protocol/protocol_control.c @@ -420,6 +420,12 @@ static size_t ctdb_req_control_data_len(struct ctdb_req_control_data *cd) case CTDB_CONTROL_CHECK_PID_SRVID: len = ctdb_pid_srvid_len(cd->data.pid_srvid); break; + + case CTDB_CONTROL_TUNNEL_REGISTER: + break; + + case CTDB_CONTROL_TUNNEL_DEREGISTER: + break; } return len; @@ -1416,6 +1422,12 @@ static size_t ctdb_reply_control_data_len(struct ctdb_reply_control_data *cd) case CTDB_CONTROL_CHECK_PID_SRVID: break; + + case CTDB_CONTROL_TUNNEL_REGISTER: + break; + + case CTDB_CONTROL_TUNNEL_DEREGISTER: + break; } return len; diff --git a/ctdb/protocol/protocol_debug.c b/ctdb/protocol/protocol_debug.c index 5a24d39cfba..1a87ade3419 100644 --- a/ctdb/protocol/protocol_debug.c +++ b/ctdb/protocol/protocol_debug.c @@ -240,6 +240,8 @@ static void ctdb_opcode_print(uint32_t opcode, FILE *fp) { CTDB_CONTROL_DB_OPEN_FLAGS, "DB_OPEN_FLAGS" }, { CTDB_CONTROL_DB_ATTACH_REPLICATED, "DB_ATTACH_REPLICATED" }, { CTDB_CONTROL_CHECK_PID_SRVID, "CHECK_PID_SRVID" }, + { CTDB_CONTROL_TUNNEL_REGISTER, "TUNNEL_REGISTER" }, + { CTDB_CONTROL_TUNNEL_DEREGISTER, "TUNNEL_DEREGISTER" }, { MAP_END, "" }, }; |