diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-10-21 11:53:29 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-10-28 05:42:05 +0100 |
| commit | a54db687acc14351613738d93a4e99ceaa2c6759 (patch) | |
| tree | 3e81dc50bfb6065bde1628158c6ec5e2fb40c1b6 /ctdb/server | |
| parent | 69c0c43d55c93b82b2e398d5c61009fd347170bf (diff) | |
| download | samba-a54db687acc14351613738d93a4e99ceaa2c6759.tar.gz | |
ctdb: Rename CTDB_VERSION to CTDB_PROTOCOL
CTDB_VERSION really is the ctdb protocol version.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'ctdb/server')
| -rw-r--r-- | ctdb/server/ctdb_daemon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index 254b1ca8195..aac507cab5c 100644 --- a/ctdb/server/ctdb_daemon.c +++ b/ctdb/server/ctdb_daemon.c @@ -814,7 +814,7 @@ static void daemon_incoming_packet(void *p, struct ctdb_req_header *hdr) goto done; } - if (hdr->ctdb_version != CTDB_VERSION) { + if (hdr->ctdb_version != CTDB_PROTOCOL) { ctdb_set_error(client->ctdb, "Bad CTDB version 0x%x rejected in daemon\n", hdr->ctdb_version); goto done; } @@ -876,7 +876,7 @@ static void ctdb_daemon_read_cb(uint8_t *data, size_t cnt, void *args) return; } - if (hdr->ctdb_version != CTDB_VERSION) { + if (hdr->ctdb_version != CTDB_PROTOCOL) { ctdb_set_error(client->ctdb, "Bad CTDB version 0x%x rejected in daemon\n", hdr->ctdb_version); return; } @@ -1354,7 +1354,7 @@ struct ctdb_req_header *_ctdb_transport_allocate(struct ctdb_context *ctdb, hdr->length = length; hdr->operation = operation; hdr->ctdb_magic = CTDB_MAGIC; - hdr->ctdb_version = CTDB_VERSION; + hdr->ctdb_version = CTDB_PROTOCOL; hdr->generation = ctdb->vnn_map->generation; hdr->srcnode = ctdb->pnn; |