From d24d6ab7bbfda8e302af3a5cf8be62299d543c1a Mon Sep 17 00:00:00 2001 From: snowdrop Date: Thu, 28 Oct 2004 10:30:41 +0000 Subject: changed hstatus_t to herror_t and chagend the API function to return herror_t. Added herror_*() functions and fixed a bug in the socket receive comm. --- examples/csoap/echoattachments-client.c | 299 +++++++++++++++++--------------- examples/csoap/echoattachments-server.c | 52 +++++- examples/csoap/simpleclient.c | 77 ++++---- examples/csoap/simpleserver.c | 49 +++--- 4 files changed, 252 insertions(+), 225 deletions(-) (limited to 'examples') diff --git a/examples/csoap/echoattachments-client.c b/examples/csoap/echoattachments-client.c index 352a73c..1550c93 100755 --- a/examples/csoap/echoattachments-client.c +++ b/examples/csoap/echoattachments-client.c @@ -1,142 +1,157 @@ -/****************************************************************** - * $Id: echoattachments-client.c,v 1.3 2004/10/15 15:10:14 snowdrop Exp $ - * - * CSOAP Project: CSOAP examples project - * Copyright (C) 2003-2004 Ferhat Ayaz - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA02111-1307USA - * - * Email: ferhatayaz@yahoo.com - ******************************************************************/ - -#include - - -/* -static const char *url = "http://csoap.sourceforge.net/cgi-bin/csoapserver"; -*/ -static const char *url = "http://localhost:10000/echoattachment"; -static const char *urn = ""; -static const char *method = "echo"; - - -void compareFiles(const char* received, const char *sent) -{ - FILE *f1, *f2; - char c1, c2; - long s1,s2; - - printf("Opening received file to compare: '%s'\n", received); - f1 = fopen(received, "r"); - if (!f1) { - fprintf(stderr, "Can not open '%s'\n", received); - return; - } - - printf("Opening sent file to compare: '%s'\n", sent); - f2 = fopen(sent, "r"); - if (!f2) { - fprintf(stderr, "Can not open '%s'\n", sent); - fclose(f1); - return; - } - - fseek(f1, 0, SEEK_END); - fseek(f2, 0, SEEK_END); - - s1 = ftell(f1); - s2 = ftell(f2); - - fseek(f1, 0, SEEK_SET); - fseek(f2, 0, SEEK_SET); - - if (s1 > s2) { - - printf("ERROR: files are not equal! Received file is bigger\n"); - fclose(f1); fclose(f2); - return; - - } else if (s2 > s1) { - - printf("ERROR: files are not equal! Sent file is bigger\n"); - fclose(f1); fclose(f2); - return; - } - - while (feof(f1)) { - - c1= fgetc(f1); - c2= fgetc(f2); - if (c1 != c2){ - printf("ERROR: files are not equal! Byte compare failed\n"); - fclose(f1); fclose(f2); - break; - } - } - - printf("OK: files are equal!\n"); - fclose(f1); fclose(f2); - -} - -int main(int argc, char *argv[]) -{ - SoapCtx *ctx, *ctx2; - char href[MAX_HREF_SIZE]; - xmlNodePtr fault; - - if (argc < 2) { - fprintf(stderr, "usage: %s [url]\n", argv[0]); - exit(1); - } - - log_set_level(HLOG_VERBOSE); - if (!soap_client_init_args(argc, argv)) { - return 1; - } - - ctx = soap_client_ctx_new(urn, method); - if (soap_ctx_add_file(ctx, argv[1], "application/octet-stream", href) != H_OK) { - fprintf(stderr, "Error while adding '%s'\n", argv[1]); - soap_ctx_free(ctx); - exit(1); - } - soap_env_add_attachment(ctx->env,"source", href); - - printf("sending request ...\n"); - if (argc > 2) - ctx2 = soap_client_invoke(ctx, argv[2], ""); - else - ctx2 = soap_client_invoke(ctx, url, ""); - - fault = soap_env_get_fault(ctx2->env); - if (fault) { - soap_xml_doc_print(ctx2->env->root->doc); - } else if (ctx2->attachments) { - compareFiles(ctx2->attachments->parts->filename, argv[1]); - } else { - printf("No attachments!"); - soap_xml_doc_print(ctx2->env->root->doc); - } - - soap_ctx_free(ctx2); - soap_ctx_free(ctx); - - return 0; -} - - - - +/****************************************************************** + * $Id: echoattachments-client.c,v 1.4 2004/10/28 10:30:41 snowdrop Exp $ + * + * CSOAP Project: CSOAP examples project + * Copyright (C) 2003-2004 Ferhat Ayaz + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA02111-1307USA + * + * Email: ferhatayaz@yahoo.com + ******************************************************************/ + +#include + + + + +static const char *urn = "urn:examples"; +static const char *url = "http://localhost:10000/echoattachment"; +static const char *method = "echo"; + + +void compareFiles(const char* received, const char *sent) +{ + FILE *f1, *f2; + char c1, c2; + long s1,s2; + + printf("Opening received file to compare: '%s'\n", received); + f1 = fopen(received, "r"); + if (!f1) { + fprintf(stderr, "Can not open '%s'\n", received); + return; + } + + printf("Opening sent file to compare: '%s'\n", sent); + f2 = fopen(sent, "r"); + if (!f2) { + fprintf(stderr, "Can not open '%s'\n", sent); + fclose(f1); + return; + } + + fseek(f1, 0, SEEK_END); + fseek(f2, 0, SEEK_END); + + s1 = ftell(f1); + s2 = ftell(f2); + + fseek(f1, 0, SEEK_SET); + fseek(f2, 0, SEEK_SET); + + if (s1 > s2) { + + printf("ERROR: files are not equal! Received file is bigger\n"); + fclose(f1); fclose(f2); + return; + + } else if (s2 > s1) { + + printf("ERROR: files are not equal! Sent file is bigger\n"); + fclose(f1); fclose(f2); + return; + } + + while (feof(f1)) { + + c1= fgetc(f1); + c2= fgetc(f2); + if (c1 != c2){ + printf("ERROR: files are not equal! Byte compare failed\n"); + fclose(f1); fclose(f2); + break; + } + } + + printf("OK: files are equal!\n"); + fclose(f1); fclose(f2); + +} + +int main(int argc, char *argv[]) +{ + SoapCtx *ctx, *ctx2; + char href[MAX_HREF_SIZE]; + xmlNodePtr fault; + herror_t err; + + if (argc < 2) { + fprintf(stderr, "usage: %s [url]\n", argv[0]); + exit(1); + } + + log_set_level(HLOG_VERBOSE); + err = soap_client_init_args(argc, argv); + if (err != H_OK) { + log_error4("[%d] %s():%s ", herror_code(err), herror_func(err), herror_message(err)); + herror_release(err); + return 1; + } + + err = soap_client_ctx_new(urn, method, &ctx); + if (err != H_OK) { + log_error4("[%d] %s():%s ", herror_code(err), herror_func(err), herror_message(err)); + herror_release(err); + return 1; + } + if (soap_ctx_add_file(ctx, argv[1], "application/octet-stream", href) != H_OK) { + fprintf(stderr, "Error while adding '%s'\n", argv[1]); + soap_ctx_free(ctx); + exit(1); + } + soap_env_add_attachment(ctx->env,"source", href); + + printf("sending request ...\n"); + if (argc > 2) + err = soap_client_invoke(ctx, &ctx2, argv[2], ""); + else + err = soap_client_invoke(ctx, &ctx2, url, ""); + + if (err != H_OK) { + log_error4("%s():%s [%d]", herror_func(err), herror_message(err), herror_code(err)); + herror_release(err); + return 1; + } + + fault = soap_env_get_fault(ctx2->env); + if (fault) { + soap_xml_doc_print(ctx2->env->root->doc); + } else if (ctx2->attachments) { + compareFiles(ctx2->attachments->parts->filename, argv[1]); + } else { + printf("No attachments!"); + soap_xml_doc_print(ctx2->env->root->doc); + } + + soap_ctx_free(ctx2); + soap_ctx_free(ctx); + + return 0; +} + + + + + diff --git a/examples/csoap/echoattachments-server.c b/examples/csoap/echoattachments-server.c index 701d6a6..5aeeb76 100755 --- a/examples/csoap/echoattachments-server.c +++ b/examples/csoap/echoattachments-server.c @@ -1,5 +1,5 @@ /****************************************************************** - * $Id: echoattachments-server.c,v 1.2 2004/10/15 15:10:15 snowdrop Exp $ + * $Id: echoattachments-server.c,v 1.3 2004/10/28 10:30:42 snowdrop Exp $ * * CSOAP Project: CSOAP examples project * Copyright (C) 2003-2004 Ferhat Ayaz @@ -24,21 +24,26 @@ #include -static const char *url = "/echoattachment"; -static const char *urn = ""; +static const char *url = "/echoattachments"; +static const char *urn = "urn:examples"; static const char *method = "echo"; - +/* SoapCtx* echo_attachments(SoapCtx *req) { - + herror_t err; SoapEnv *env; SoapCtx* ctx; part_t *part; char href[MAX_HREF_SIZE]; - env = soap_env_new_with_response(req->env); + err = soap_env_new_with_response(req->env, &env); + if (err != H_OK) { + herror_release(err); + return NULL; + } + ctx = soap_ctx_new(env); if (req->attachments) { @@ -54,16 +59,45 @@ SoapCtx* echo_attachments(SoapCtx *req) return ctx; } +*/ -int main(int argc, char *argv[]) +herror_t echo_attachments(SoapCtx *req, SoapCtx* res) { + herror_t err; + + part_t *part; + char href[MAX_HREF_SIZE]; + + err = soap_env_new_with_response(req->env, &res->env); + if (err != H_OK) { + return err; + } + if (req->attachments) + { + for (part = req->attachments->parts; part != NULL; part = part->next) + { + soap_ctx_add_file(res, part->filename, part->content_type, href); + soap_env_add_attachment(res->env, "echoFile", href); + } + } + + return H_OK; +} + + +int main(int argc, char *argv[]) +{ + herror_t err; SoapRouter *router; log_set_level(HLOG_VERBOSE); - if (!soap_server_init_args(argc, argv)) { - return 1; + err = soap_server_init_args(argc, argv); + if (err != H_OK) { + log_error4("%s():%s [%d]", herror_func(err), herror_message(err), herror_code(err)); + herror_release(err); + return 1; } router = soap_router_new(); diff --git a/examples/csoap/simpleclient.c b/examples/csoap/simpleclient.c index 3ac1588..7b80193 100644 --- a/examples/csoap/simpleclient.c +++ b/examples/csoap/simpleclient.c @@ -1,8 +1,8 @@ /****************************************************************** - * $Id: simpleclient.c,v 1.5 2004/10/15 13:42:57 snowdrop Exp $ + * $Id: simpleclient.c,v 1.6 2004/10/28 10:30:42 snowdrop Exp $ * * CSOAP Project: CSOAP examples project - * Copyright (C) 2003 Ferhat Ayaz + * Copyright (C) 2003-2004 Ferhat Ayaz * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,67 +18,54 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA02111-1307USA * - * Email: ayaz@jprogrammer.net + * Email: ferhatayaz@yahoo.com ******************************************************************/ #include -/* -static const char *url = "http://csoap.sourceforge.net/cgi-bin/csoapserver"; -*/ -static const char *url = "http://localhost:3031/csoapserver"; +static const char *url = "http://localhost:10000/csoapserver"; static const char *urn = "urn:examples"; static const char *method = "sayHello"; int main(int argc, char *argv[]) { - SoapCtx *ctx, *ctx2; + SoapCtx *ctx, *ctx2; + herror_t err; + + /*log_set_level(HLOG_VERBOSE);*/ + err = soap_client_init_args(argc, argv); + if (err != H_OK) { + log_error4("%s():%s [%d]", herror_func(err), herror_message(err), herror_code(err)); + herror_release(err); + return 1; + } + + err = soap_client_ctx_new(urn, method, &ctx); + if (err != H_OK) { + log_error4("%s():%s [%d]", herror_func(err), herror_message(err), herror_code(err)); + herror_release(err); + return 1; + } - log_set_level(HLOG_VERBOSE); - if (!soap_client_init_args(argc, argv)) { - return 1; - } - - ctx = soap_client_ctx_new(urn, method); soap_env_add_item(ctx->env, "xsd:string", "name", "Jonny B. Good"); if (argc > 1) - ctx2 = soap_client_invoke(ctx, argv[1], ""); + err = soap_client_invoke(ctx, &ctx2, argv[1], ""); else - ctx2 = soap_client_invoke(ctx, url, ""); + err = soap_client_invoke(ctx, &ctx2, url, ""); + + if (err != H_OK) { + log_error4("[%d] %s(): %s ", herror_code(err), herror_func(err), herror_message(err)); + herror_release(err); + soap_ctx_free(ctx); + return 1; + } soap_xml_doc_print(ctx2->env->root->doc); soap_ctx_free(ctx2); - soap_ctx_free(ctx); -} - -/* -int main2(int argc, char *argv[]) -{ - SoapEnv *env, *res; - - log_set_level(HLOG_VERBOSE); - if (!soap_client_init_args(argc, argv)) { - return 1; - } - - env = soap_env_new_with_method(urn, method); - soap_env_add_item(env, "xsd:string", "name", "Jonny B. Good"); - - if (argc > 1) - res = soap_client_invoke(env, argv[1], ""); - else - res = soap_client_invoke(env, url, ""); - soap_xml_doc_print(res->root->doc); - soap_env_free(res); - soap_env_free(env); - + soap_ctx_free(ctx); + return 0; } - -*/ - - - diff --git a/examples/csoap/simpleserver.c b/examples/csoap/simpleserver.c index 3ccd61e..a165cfc 100644 --- a/examples/csoap/simpleserver.c +++ b/examples/csoap/simpleserver.c @@ -1,8 +1,8 @@ /****************************************************************** - * $Id: simpleserver.c,v 1.10 2004/10/15 13:42:57 snowdrop Exp $ + * $Id: simpleserver.c,v 1.11 2004/10/28 10:30:42 snowdrop Exp $ * * CSOAP Project: CSOAP examples project - * Copyright (C) 2003 Ferhat Ayaz + * Copyright (C) 2003-2004 Ferhat Ayaz * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA02111-1307USA * - * Email: ayaz@jprogrammer.net + * Email: ferhatayaz@yahoo.com ******************************************************************/ #include @@ -29,54 +29,45 @@ static const char *urn = "urn:examples"; static const char *method = "sayHello"; -void add_name(xmlNodePtr node, SoapEnv *env) +herror_t say_hello(SoapCtx *req, SoapCtx* res) { - char *name; - name = (char*)xmlNodeListGetString(node->doc, - node->xmlChildrenNode, 1); - - - if (!name) return; - soap_env_add_itemf(env,"xsd:string", "echo", - "Hello '%s'", name); - - /*xmlFree(BAD_CAST name);*/ - -} - - -SoapCtx* say_hello(SoapCtx *request) -{ + herror_t err; + char *name; - SoapEnv *env; - SoapCtx* ctx; xmlNodePtr method, node; - env = soap_env_new_with_response(request->env); + err = soap_env_new_with_response(req->env, &res->env); + if (err != H_OK) { + return err; + } - method = soap_env_get_method(request->env); + method = soap_env_get_method(req->env); node = soap_xml_get_children(method); while (node) { - add_name(node, env); + name = (char*)xmlNodeListGetString(node->doc, node->xmlChildrenNode, 1); + soap_env_add_itemf(req->env,"xsd:string", "echo", "Hello '%s'", name); node = soap_xml_get_next(node); } - ctx = soap_ctx_new(env); - return ctx; + return H_OK; } int main(int argc, char *argv[]) { + herror_t err; SoapRouter *router; log_set_level(HLOG_VERBOSE); - if (!soap_server_init_args(argc, argv)) { - return 1; + err = soap_server_init_args(argc, argv); + if (err != H_OK) { + log_error4("%s():%s [%d]", herror_func(err), herror_message(err), herror_code(err)); + herror_release(err); + return 1; } router = soap_router_new(); -- cgit v1.1-32-gdbae