From 30e74469b8c9ff516f867d236e20132c0f345717 Mon Sep 17 00:00:00 2001 From: m0gg Date: Wed, 3 Jan 2007 21:31:44 +0000 Subject: nanoHTTP MIME client example update --- Makefile.am | 8 +- examples/nanohttp/Makefile.am | 6 +- examples/nanohttp/client_mime.c | 185 ------------------------------- examples/nanohttp/client_post_chunked.c | 150 -------------------------- examples/nanohttp/mime_client.c | 186 ++++++++++++++++++++++++++++++++ 5 files changed, 193 insertions(+), 342 deletions(-) delete mode 100755 examples/nanohttp/client_mime.c delete mode 100644 examples/nanohttp/client_post_chunked.c create mode 100755 examples/nanohttp/mime_client.c diff --git a/Makefile.am b/Makefile.am index 8351d0a..0a931a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # -# $Revision: 1.15 $ +# $Revision: 1.16 $ # SUBDIRS=nanohttp \ @@ -24,11 +24,9 @@ documentation=doc/Doxyfile.api \ doc/tutorial.xml \ doc/images/logo02.gif -broken_examples=examples/nanohttp/client_mime.c \ - examples/nanohttp/httpcpost.c \ +broken_examples=examples/nanohttp/httpcpost.c \ examples/nanohttp/httppost.c \ - examples/nanohttp/postserver.c \ - examples/nanohttp/client_post_chunked.c + examples/nanohttp/postserver.c win32_env=win32/MinGW/Makefile \ win32/MinGW/compile.bat \ diff --git a/examples/nanohttp/Makefile.am b/examples/nanohttp/Makefile.am index 53eadcc..bb92e1d 100644 --- a/examples/nanohttp/Makefile.am +++ b/examples/nanohttp/Makefile.am @@ -1,12 +1,14 @@ # -# $Revision: 1.14 $ +# $Revision: 1.15 $ # LDADD=../../nanohttp/libnanohttp.la INCLUDES=-I${top_srcdir} -noinst_PROGRAMS=http_server http_client +noinst_PROGRAMS=http_server http_client mime_client http_server_SOURCES=http_server.c http_client_SOURCES=http_client.c +mime_client_SOURCES=mime_client.c + diff --git a/examples/nanohttp/client_mime.c b/examples/nanohttp/client_mime.c deleted file mode 100755 index 7271865..0000000 --- a/examples/nanohttp/client_mime.c +++ /dev/null @@ -1,185 +0,0 @@ -/****************************************************************** -* $Id: client_mime.c,v 1.1 2004/10/15 13:42:07 snowdrop Exp $ -* -* CSOAP Project: A http client/server library in C (example) -* Copyright (C) 2003 Ferhat Ayaz -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Library General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. -* -* This library 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 -* Library General Public License for more details. -* -* You should have received a copy of the GNU Library General Public -* License along with this library; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 02111-1307, USA. -* -* Email: ferhatayaz@yahoo.com -******************************************************************/ -#include - -#include - -#define MAX_BUFFER_SIZE 1024 - -static -void show_response(hresponse_t *res) -{ - hpair_t *pair; - byte_t buffer[MAX_BUFFER_SIZE+1]; - int read; - if (res == NULL) - { - log_error1("Response is NULL!"); - return; - } - - log_info2("Spec : '%s'", res->spec); - log_info2("Status: %d", res->errcode); - log_info2("Desc : '%s'", res->desc); - - pair = res->header; - while (pair != NULL) { - log_debug3("%s: %s", pair->key, pair->value); - pair = pair->next; - } - - if (res->in == NULL) - { - log_warn1("No input stream!"); - return; - } - - - while (http_input_stream_is_ready(res->in)) - { - read = http_input_stream_read(res->in, buffer, MAX_BUFFER_SIZE); - buffer[read] = '\0'; - puts(buffer); - } - -} - - - -static -int send_file(httpc_conn_t *conn, const char* filename, - const char* id, const char* content_type) -{ - int status, size; - FILE *f = fopen(filename, "r"); - char buffer[MAX_BUFFER_SIZE]; - - if (f == NULL) - { - log_error2("can not open file: '%s'", filename); - return 0; - } - - status = httpc_mime_next(conn, id, content_type, "binary"); - if (status != HSOCKET_OK) - return status; - - while (!feof(f)) { - size = fread(buffer, 1, MAX_BUFFER_SIZE, f); - if (size == -1) - { - log_error1("Can not read file!"); - fclose(f); - return 0; - } - status = http_output_stream_write(conn->out, buffer, size); - if (status != HSOCKET_OK) - { - log_error1("Can not send data!"); - fclose(f); - return 0; - } - } - - fclose(f); - return 1; -} - -int main(int argc, char *argv[]) -{ - httpc_conn_t *conn; /* Client connection object */ - hresponse_t *res; /* Response object **/ - - int status; - FILE *f; - size_t size; - char url[50], file[50], id[50], content_type[50]; - - char buffer[MAX_BUFFER_SIZE+1]; - - - /* Check usage */ - if (argc < 5) { - fprintf(stderr, "usage %s \n", argv[0]); - exit(1); - } - - /* Set log level to see more information written by the library */ - log_set_level(HLOG_VERBOSE); - - /* Initialize httpc module */ - if (httpc_init(argc, argv)) - { - log_error1("Can not init httpc"); - return 1; - } - - /* Create the client connection object */ - conn = httpc_new(); - - httpc_set_header(conn, "SOAPAction", "\"\""); - httpc_set_header(conn, HEADER_TRANSFER_ENCODING, TRANSFER_ENCODING_CHUNKED); - - /* - Open connection for mime - */ - status = httpc_mime_begin(conn, argv[1], argv[3], "", argv[4]); - if (status != HSOCKET_OK) - { - log_error2("Can not start MIME: %d", status); - exit(1); - } - - if (!send_file(conn, argv[2], argv[3], argv[4])) - return 1; - - while (1) - { - printf("Enter filename ['.' for finish]: "); - gets(file); - if (!strcmp(file, ".")) - break; - - printf("Enter part id:"); - gets(id); - printf("Enter content-type:"); - gets(content_type); - - if (!send_file(conn, file, id, content_type)) - return 1; - } - - res = httpc_mime_end(conn); - - /* Show response */ - show_response(res); - - /* clean up*/ - hresponse_free(res); - httpc_free(conn); - return 0; -} - - - diff --git a/examples/nanohttp/client_post_chunked.c b/examples/nanohttp/client_post_chunked.c deleted file mode 100644 index f9855b4..0000000 --- a/examples/nanohttp/client_post_chunked.c +++ /dev/null @@ -1,150 +0,0 @@ -/****************************************************************** -* $Id: client_post_chunked.c,v 1.1 2004/10/15 13:42:07 snowdrop Exp $ -* -* CSOAP Project: A http client/server library in C (example) -* Copyright (C) 2003 Ferhat Ayaz -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Library General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. -* -* This library 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 -* Library General Public License for more details. -* -* You should have received a copy of the GNU Library General Public -* License along with this library; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 02111-1307, USA. -* -* Email: ferhatayaz@yahoo.com -******************************************************************/ -#include - -#include - -#define MAX_BUFFER_SIZE 1024 - -static -void show_response(hresponse_t *res) -{ - hpair_t *pair; - byte_t buffer[MAX_BUFFER_SIZE+1]; - int read; - if (res == NULL) - { - log_error1("Response is NULL!"); - return; - } - - log_info2("Spec : '%s'", res->spec); - log_info2("Status: %d", res->errcode); - log_info2("Desc : '%s'", res->desc); - - pair = res->header; - while (pair != NULL) { - log_debug3("%s: %s", pair->key, pair->value); - pair = pair->next; - } - - if (res->in == NULL) - { - log_warn1("No input stream!"); - return; - } - - - while (http_input_stream_is_ready(res->in)) - { - read = http_input_stream_read(res->in, buffer, MAX_BUFFER_SIZE); - buffer[read] = '\0'; - puts(buffer); - } - -} - - - -int main(int argc, char *argv[]) -{ - httpc_conn_t *conn; /* Client connection object */ - hresponse_t *res; /* Response object **/ - char postdata[1054]; - - /* Check usage */ - if (argc < 2) { - fprintf(stderr, "usage %s \n", argv[0]); - exit(1); - } - - /* Set log level to see more information written by the library */ - log_set_level(HLOG_VERBOSE); - - /* Initialize httpc module */ - if (httpc_init(argc, argv)) - { - log_error1("Can not init httpc"); - return 1; - } - - /* Create the client connection object */ - conn = httpc_new(); - - /* Set header for chunked transport */ - httpc_set_header(conn, HEADER_TRANSFER_ENCODING, TRANSFER_ENCODING_CHUNKED); - - /* POSTing will be done in 3 steps - 1. httpc_post_begin() - 2. http_output_stream_write() - 3. httpc_post_end() - */ - - /* (1) First step begin the post request*/ - if (httpc_post_begin(conn, argv[1]) != HSOCKET_OK) - { - log_error1("Can not begin posting\n"); - httpc_free(conn); - exit(1); - } - - /* (2) Post some data*/ - while (1) - { - printf("\nEnter post data (max 1054). [Type '.' to end]: "); - gets(postdata); - if (!strcmp(postdata, ".")) - break; - else if (http_output_stream_write(conn->out, postdata, strlen(postdata)) - != HSOCKET_OK ) - { - log_error1("Can not post\n"); - httpc_free(conn); - exit(1); - } - } - - /* (3) End POSTing data and receive the response */ - printf("\nReceiving ... \n "); - res = httpc_post_end(conn); - if (res == NULL) - { - log_error2("Error: %s", conn->errmsg); - httpc_free(conn); - exit(1); - } - - show_response(res); - - /* Clean up */ - hresponse_free(res); - httpc_free(conn); - - return 0; -} - - - - - diff --git a/examples/nanohttp/mime_client.c b/examples/nanohttp/mime_client.c new file mode 100755 index 0000000..e4d50ba --- /dev/null +++ b/examples/nanohttp/mime_client.c @@ -0,0 +1,186 @@ +/****************************************************************** +* $Id: mime_client.c,v 1.1 2007/01/03 21:31:44 m0gg Exp $ +* +* CSOAP Project: A http client/server library in C (example) +* Copyright (C) 2003 Ferhat Ayaz +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU Library General Public +* License as published by the Free Software Foundation; either +* version 2 of the License, or (at your option) any later version. +* +* This library 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 +* Library General Public License for more details. +* +* You should have received a copy of the GNU Library General Public +* License along with this library; if not, write to the +* Free Software Foundation, Inc., 59 Temple Place - Suite 330, +* Boston, MA 02111-1307, USA. +* +* Email: ferhatayaz@yahoo.com +******************************************************************/ +#include +#include + +#include + +#define MAX_BUFFER_SIZE 1024 + +static +void show_response(hresponse_t *res) +{ + hpair_t *pair; + char buffer[MAX_BUFFER_SIZE+1]; + int len; + + if (res == NULL) + { + fprintf(stderr, "Response is NULL\n"); + return; + } + + fprintf(stdout, "Version: '%d'\n", res->version); + fprintf(stdout, "Status: %d\n", res->errcode); + fprintf(stdout, "Desc: '%s'\n", res->desc); + + for (pair = res->header; pair; pair = pair->next) + { + fprintf(stdout, "%s: %s\n", pair->key, pair->value); + } + + if (res->in == NULL) + { + fprintf(stderr, "No input stream!\n"); + return; + } + + while (http_input_stream_is_ready(res->in)) + { + len = http_input_stream_read(res->in, buffer, MAX_BUFFER_SIZE); + fwrite(buffer, len, 1, stdout); + } + + return; +} + +static +int send_file(httpc_conn_t *conn, const char* filename, const char* id, const char* content_type) +{ + herror_t status; + int size; + FILE *f = fopen(filename, "r"); + char buffer[MAX_BUFFER_SIZE]; + + if ((f = fopen(filename, "r")) == NULL) + { + fprintf(stderr, "cannot open file: '%s' (%s)\n", filename, strerror(errno)); + return -1; + } + + if ((status = httpc_mime_next(conn, id, content_type, "binary")) != H_OK) + { + fprintf(stderr, "httpc_mime_next failed (%s)\n", herror_message(status)); + herror_release(status); + return -1; + } + + while (!feof(f)) + { + size = fread(buffer, 1, MAX_BUFFER_SIZE, f); + if (size == -1) + { + fprintf(stderr, "Cannot read file (%s)\n", strerror(errno)); + fclose(f); + return -1; + } + http_output_stream_write(conn->out, buffer, size); + } + + fclose(f); + return 0; +} + +int main(int argc, char **argv) +{ + httpc_conn_t *conn; /* Client connection object */ + hresponse_t *res; /* Response object **/ + + herror_t status; + FILE *f; + size_t size; + char url[50], file[50], id[50], content_type[50]; + + char buffer[MAX_BUFFER_SIZE+1]; + + /* Check usage */ + if (argc < 5) + { + fprintf(stderr, "usage %s \n", argv[0]); + exit(1); + } + + /* Set log level to see more information written by the library */ + // log_set_level(HLOG_VERBOSE); + + /* Initialize httpc module */ + if ((status = httpc_init(argc, argv)) != H_OK) + { + fprintf(stderr, "Cannot init httpc (%s)\n", herror_message(status)); + herror_release(status); + return 1; + } + + /* Create the client connection object */ + conn = httpc_new(); + + httpc_set_header(conn, HEADER_TRANSFER_ENCODING, TRANSFER_ENCODING_CHUNKED); + + /* + Open connection for mime + */ + if ((status = httpc_mime_begin(conn, argv[1], argv[3], "", argv[4])) != H_OK) + { + log_error2("Can not start MIME: %s\n", herror_message(status)); + herror_release(status); + exit(1); + } + + if (!send_file(conn, argv[2], argv[3], argv[4])) + { + fprintf(stderr, "send_file failed\n"); + exit(1); + } + + while (1) + { + printf("Enter filename ['.' for finish]: "); + gets(file); + if (!strcmp(file, ".")) + break; + + printf("Enter part id:"); + gets(id); + printf("Enter content-type:"); + gets(content_type); + + if (!send_file(conn, file, id, content_type)) + exit(1); + } + + if ((status = httpc_mime_end(conn, &res)) != H_OK) + { + fprintf(stderr, "httpc_mime_end failed (%s)\n", herror_message(status)); + herror_release(status); + exit(1); + } + + /* Show response */ + show_response(res); + + /* clean up*/ + hresponse_free(res); + httpc_free(conn); + return 0; +} -- cgit v1.1-32-gdbae