From 72e83f9b52b5ed4bbeed1cc1163dc8392ccf6b05 Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Thu, 25 Jun 2009 16:11:44 +0000 Subject: version check between client/server made more specific to protocol only. This patch is a step towards giving compatibility between the versions of GlusterFS. Now onwards, the protocol-version won't depend on release versions. In general, multiple glusterfs versions can have common protocol-version. Signed-off-by: Anand V. Avati --- xlators/protocol/server/src/server-protocol.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xlators/protocol/server/src/server-protocol.c') diff --git a/xlators/protocol/server/src/server-protocol.c b/xlators/protocol/server/src/server-protocol.c index ee79893ff..47a3b4b47 100644 --- a/xlators/protocol/server/src/server-protocol.c +++ b/xlators/protocol/server/src/server-protocol.c @@ -6955,7 +6955,7 @@ mop_setvolume (call_frame_t *frame, xlator_t *bound_xl, if (trans->xl_private != conn) trans->xl_private = conn; - ret = dict_get_str (params, "version", &version); + ret = dict_get_str (params, "protocol-version", &version); if (ret < 0) { ret = dict_set_str (reply, "ERROR", "No version number specified"); @@ -6968,11 +6968,11 @@ mop_setvolume (call_frame_t *frame, xlator_t *bound_xl, goto fail; } - ret = strcmp (version, PACKAGE_VERSION); + ret = strcmp (version, GF_PROTOCOL_VERSION); if (ret != 0) { asprintf (&msg, - "Version mismatch: client(%s) Vs server (%s)", - version, PACKAGE_VERSION); + "protocol version mismatch: client(%s) - server(%s)", + version, GF_PROTOCOL_VERSION); ret = dict_set_dynstr (reply, "ERROR", msg); if (ret < 0) gf_log (trans->xl->name, GF_LOG_DEBUG, -- cgit