From e9cac40e9ac94a25ec3e811ba1991d1e6e429c86 Mon Sep 17 00:00:00 2001 From: ERIK ALEXANDRE PUCCI <eap08@c3sl.ufpr.br> Date: Fri, 22 Jan 2010 10:24:26 -0200 Subject: [PATCH] client.c: Changed Agent Version method code for the check_version() call The Agent Version method related code calls the check_version(), improving modularization. Removed versionFromServer variable from main(). It is only used in check_version(). Signed-off-by: ERIK ALEXANDRE PUCCI <eap08@c3sl.ufpr.br> Acked-by: Bruno Ribas <ribas@c3sl.ufpr.br> Acked-by: Josiney de Souza <josineys@c3sl.ufpr.br> Signed-off-by: Danilo K. S. Yorinori <danilok@c3sl.ufpr.br> --- src/client.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/src/client.c b/src/client.c index 563a725..228f3df 100644 --- a/src/client.c +++ b/src/client.c @@ -34,7 +34,7 @@ int main(int argc, char **argv) { struct soap *soap = soap_new(); - char *url, *inep, *macAddr, *basedir, *clientVersion, *versionFromServer; + char *url, *inep, *macAddr, *basedir, *clientVersion; int arglen, len; /* Initialization * @@ -91,25 +91,7 @@ int main(int argc, char **argv) /* End of Initialization *----------------------------------------------------------------------- * Agent Version method */ - if (soap_call_ns1__getAgentVersion(soap, url, "", &versionFromServer) != - SOAP_OK) - { - soap_print_fault(soap, stderr); - exit(2); - } - - if (DEBUG) - { - printf("Version from server: %s\n",versionFromServer); - } - - /* Compare client and server versions */ - if (strcmp(clientVersion, versionFromServer) != 0) - { - fprintf(stderr, "Client version out-of-date. Update client.\n"); - /* Client out-of-date version */ - exit(4); - } + check_version(soap, url, clientVersion); /* End of Agent Version method *------------------------------------------------------------------------ * Availability method */ -- GitLab