development

4 files changed, 559 insertions, 25 deletions

diff --git a/examples/nanohttp/client_get.c b/examples/nanohttp/client_get.c
new file mode 100644
index 0000000..4015ed2
--- /dev/null
+++ b/examples/nanohttp/client_get.c
@@ -0,0 +1,112 @@
+/******************************************************************
+*  $Id: client_get.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-2004  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
+******************************************************************/
+#define MEM_DEBUG
+#include <stdio.h>
+#include <nanohttp/nanohttp-client.h>
+
+#ifdef MEM_DEBUG
+#include <utils/alloc.h>
+#endif
+
+#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("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 **/
+
+	/* check usage */
+	if (argc < 2) {
+		fprintf(stderr, "usage %s <url>\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();
+	
+  /* Send GET method and receive response */
+	res = httpc_get(conn, argv[1]);
+
+	/* Show response */
+	show_response(res);
+
+	/* Clean up */
+	hresponse_free(res);
+	httpc_free(conn);
+
+#ifdef MEM_DEBUG
+  _mem_report();
+#endif
+	
+	return 0;
+}
+
diff --git a/examples/nanohttp/client_mime.c b/examples/nanohttp/client_mime.c
new file mode 100755
index 0000000..7271865
--- /dev/null
+++ b/examples/nanohttp/client_mime.c
@@ -0,0 +1,185 @@
+/******************************************************************
+*  $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 <nanohttp/nanohttp-client.h>
+
+#include <stdio.h>
+
+#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 <url> <file> <id> <content-type>\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
new file mode 100644
index 0000000..f9855b4
--- /dev/null
+++ b/examples/nanohttp/client_post_chunked.c
@@ -0,0 +1,150 @@
+/******************************************************************
+*  $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 <nanohttp/nanohttp-client.h>
+
+#include <stdio.h>
+
+#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 <url> \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/postserver.c b/examples/nanohttp/postserver.c
index a28dc20..4e6a3c5 100644
--- a/examples/nanohttp/postserver.c
+++ b/examples/nanohttp/postserver.c
@@ -1,5 +1,5 @@
 /******************************************************************
-*  $Id: postserver.c,v 1.3 2004/09/19 07:05:03 snowdrop Exp $
+*  $Id: postserver.c,v 1.4 2004/10/15 13:42:07 snowdrop Exp $
 *
 * CSOAP Project:  A http client/server library in C (example)
 * Copyright (C) 2003  Ferhat Ayaz
@@ -19,12 +19,16 @@
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA  02111-1307, USA.
 * 
-* Email: ayaz@jprogrammer.net
+* Email: ferhatayaz@yahoo.com
 ******************************************************************/
 #include <nanohttp/nanohttp-server.h>
 
 #include <stdio.h>
-
+/*
+	Please ignore this file. This is just for me to test 
+	some features and new functions. In the future this
+	file will also be good start to learn nanohttp
+*/
 static 
 void _print_binary_ascii(int n)
 {
@@ -60,47 +64,119 @@ void _print_binary_ascii2(unsigned char n)
   log_verbose2("%s", ascii);
 }
 
+
+void echomime_service(httpd_conn_t *conn, hrequest_t *req)
+{
+  part_t    *part;
+  int status;
+  char   *content_type , *transfer_encoding, 
+         *content_id,  *root_content_type;
+
+	if (!req->attachments || !req->content_type) 
+	{
+		httpd_send_header(conn, 200, "OK");
+		http_output_stream_write_string(conn->out, "<html><body><h1>");
+		http_output_stream_write_string(conn->out, 
+		  "You do not posted a MIME message!<hr></h1></body></html>");
+		return;
+	}
+	else
+	{
+
+	  root_content_type = hpairnode_get(req->content_type->params, "type");
+
+	  status = 
+	     httpd_mime_send_header(conn, req->attachments->root_part->id, "",
+	      root_content_type, 200, "OK");
+
+	  if (status != H_OK)
+	   return;
+
+	  part = req->attachments->parts;
+	  while (part)
+	  {
+	     content_id = hpairnode_get(part->header, HEADER_CONTENT_ID);
+	     content_type = hpairnode_get(part->header, HEADER_CONTENT_TYPE);
+	     transfer_encoding = hpairnode_get(part->header, HEADER_TRANSFER_ENCODING);
+	     status = httpd_mime_send_file(conn, content_id, 
+	           content_type, transfer_encoding, part->filename);
+	     if (status != H_OK)
+	       return;
+	     part = part->next;
+	  }	  
+
+	  httpd_mime_end(conn);
+	}
+		
+}
+
 /*
 SERVICE: http://host:port/postserver
 */
 void post_service(httpd_conn_t *conn, hrequest_t *req)
 {
 	unsigned char *postdata;
-	long received;
+	long received, total=0;
 	unsigned int tmp;
 	char buffer[15];
-
+	hpair_t *pair;
+/*
 	postdata = httpd_get_postdata(conn, req, &received, -1);
-
-	if (postdata != NULL) {
-
-		httpd_send_header(conn, 200, "OK", NULL);
-		hsocket_send(conn->sock, "<html><body>\n");
-		hsocket_send(conn->sock, "<h3>You Posted:</h3><hr>\n");
-		hsocket_nsend(conn->sock, postdata, received);
-		hsocket_send(conn->sock, "<h3>Received size</h3><hr>\n");
-		sprintf(buffer, "%d", received);
-		hsocket_send(conn->sock, buffer);
-		hsocket_send(conn->sock, "</body></html>");
+*/
+	if (req->method == HTTP_REQUEST_POST) {
+
+		httpd_send_header(conn, 200, "OK");
+		http_output_stream_write_string(conn->out, "<html><body>\n");
+		http_output_stream_write_string(conn->out, "<h3>You Posted:</h3><hr>\n");
+		while (http_input_stream_is_ready(req->in))
+		{
+			received = http_input_stream_read(req->in, buffer, 10);
+			http_output_stream_write(conn->out, buffer, received);
+			total += received;
+		}
+		http_output_stream_write_string(conn->out, "<h3>Received size</h3><hr>\n");
+		sprintf(buffer, "%d", total);
+		http_output_stream_write_string(conn->out, buffer);
 
 		_print_binary_ascii2(postdata[0]);
 		_print_binary_ascii2(postdata[1]);
 		_print_binary_ascii2(postdata[2]);
 		_print_binary_ascii2(postdata[3]);
-		free(postdata);
+	/*	free(postdata);*/
 
 	} else {
 
-		httpd_send_header(conn, 200, "OK", NULL);
-		hsocket_send(conn->sock, "<html><body>");
-		hsocket_send(conn->sock, "<form action=\"/postserver\" method=\"POST\">");
-		hsocket_send(conn->sock, "Enter Postdata: <input name=\"field\" type=\"text\">");
-		hsocket_send(conn->sock, "<input type=\"submit\">");
-		hsocket_send(conn->sock, "</body></html>");
-
+		httpd_send_header(conn, 200, "OK");
+		http_output_stream_write_string(conn->out, "<html><body>");
+		http_output_stream_write_string(conn->out, "<form action=\"/postserver\" method=\"POST\">");
+		http_output_stream_write_string(conn->out, "Enter Postdata: <input name=\"field\" type=\"text\">");
+		http_output_stream_write_string(conn->out, "<input type=\"submit\">");
+		
 	}
 
+	http_output_stream_write_string(conn->out, "<hr><p><small>Content-Type:");
+	if (req->content_type)
+	{
+  	http_output_stream_write_string(conn->out, req->content_type->type);
+		http_output_stream_write_string(conn->out, "<br>");
+		pair = req->content_type->params;
+		while (pair)
+		{
+  		http_output_stream_write_string(conn->out, pair->key);
+  		http_output_stream_write_string(conn->out, "=");
+  		http_output_stream_write_string(conn->out, pair->value);
+  		http_output_stream_write_string(conn->out, "<br>");
+		  pair = pair->next;
+		}
+  }
+  else
+  {
+		http_output_stream_write_string(conn->out, "Not available");
+  }
+
+	http_output_stream_write_string(conn->out, "</body></html>");
 
+	
 }
 
 int main(int argc, char *argv[])
@@ -112,7 +188,12 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-	if (!httpd_register("/", post_service)) {
+	if (!httpd_register("/postserver", post_service)) {
+		fprintf(stderr, "Can not register service");
+		return 1;
+	}
+
+	if (!httpd_register("/axis/services/urn:EchoAttachmentsService", echomime_service)) {
 		fprintf(stderr, "Can not register service");
 		return 1;
 	}
@@ -122,5 +203,11 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
+	httpd_destroy();
+
+#ifdef MEM_DEBUG
+  _mem_report();
+#endif
+
 	return 0;
 }