Added http stream feature (only input stream yet)

Added DIME "client" support (very experimental)

1 files changed, 132 insertions, 90 deletions

diff --git a/nanohttp/nanohttp-client.h b/nanohttp/nanohttp-client.h
index f937f00..6a53f9d 100644
--- a/nanohttp/nanohttp-client.h
+++ b/nanohttp/nanohttp-client.h
@@ -1,92 +1,134 @@
-/******************************************************************
- *  $Id: nanohttp-client.h,v 1.7 2004/08/31 16:34:08 rans Exp $
- *
- * CSOAP Project:  A http client/server library in C
- * 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: ayaz@jprogrammer.net
- ******************************************************************/
-#ifndef NANO_HTTP_CLIENT_H 
-#define NANO_HTTP_CLIENT_H 
-
-
-#include <nanohttp/nanohttp-common.h>
-#include <nanohttp/nanohttp-socket.h>
-
-
-typedef struct httpc_conn
-{
-  hsocket_t sock;
-  hpair_t *header;
-  hurl_t *url;
-}httpc_conn_t;
-
-/*
-  PROTOTYPE:
-  void my_callback(int counter, httpc_conn_t* conn,
-	    	   void *userdata, int size, char *buffer)
- */
-typedef void (*httpc_response_callback)(int, httpc_conn_t*, void*,int,char*); 
-
-/*
-  void my_start_callback(httpc_conn_t *conn, void *userdata, 
-		    hpair_t *header, const char *spec,
-		    int errcode, const char *desc)
- */
-typedef void (*httpc_response_start_callback)(httpc_conn_t*, void*, hpair_t*, 
-					      const char*, int, const char*);
+/******************************************************************

+ *  $Id: nanohttp-client.h,v 1.8 2004/09/19 07:05:03 snowdrop Exp $

+ *

+ * CSOAP Project:  A http client/server library in C

+ * 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: ayaz@jprogrammer.net

+ ******************************************************************/

+#ifndef NANO_HTTP_CLIENT_H 

+#define NANO_HTTP_CLIENT_H 

+

+

+#include <nanohttp/nanohttp-common.h>

+#include <nanohttp/nanohttp-socket.h>

+#include <nanohttp/nanohttp-reqres.h>

+

+typedef struct httpc_conn

+{

+  hsocket_t sock;

+  hpair_t *header;

+  hurl_t *url;

+  http_version_t version;

+  /*

+    -1  : last dime package 

+    0   : no dime connection

+    >0  : dime package number

+  */

+  int _dime_package_nr;

+  long _dime_sent_bytes; 

+  int _is_chunked;

+}httpc_conn_t;

+

+/*

+  PROTOTYPE:

+  void my_callback(int counter, httpc_conn_t* conn,

+	    	   void *userdata, int size, char *buffer)

+ */

+typedef void (*httpc_response_callback)(int, httpc_conn_t*, void*,int,char*); 

+

+/*

+  void my_start_callback(httpc_conn_t *conn, void *userdata, 

+		    hpair_t *header, const char *spec,

+		    int errcode, const char *desc)

+ */

+typedef void (*httpc_response_start_callback)(httpc_conn_t*, void*, hpair_t*, 

+					      const char*, int, const char*);

 

 int httpc_init(int argc, char *argv[]);

-httpc_conn_t* httpc_new();
-void httpc_free(httpc_conn_t* conn);
-
-int httpc_set_header(httpc_conn_t *conn, const char* key, const char* value);
-
-hresponse_t *httpc_get(httpc_conn_t *conn, const char *url);
-hresponse_t *httpc_post(httpc_conn_t *conn, const char *url, 
-			int conten_size, const char *content);
-
-int httpc_get_cb(httpc_conn_t *conn, const char *url, 
-		 httpc_response_start_callback start_cb,
-		 httpc_response_callback cb, void *userdata);
-		 
-
-int httpc_post_cb(httpc_conn_t *conn, const char *url, 
-		  httpc_response_start_callback start_cb,
-		  httpc_response_callback cb, int content_size, 
-		  char *content,  void *userdata);
-
-
-
-/*
-  Chunked POST Module
- */
-
-/* Returns 0 if success, >0 otherwise */
-/* do not use this
-int httpc_post_open(httpc_conn_t *conn, const char *url);
-
-int httpc_post_send(httpc_conn_t *conn, const char* buffer, int bufsize);
-hresponse_t *httpc_post_finish(httpc_conn_t *conn);
-int httpc_post_finish_cb(httpc_conn_t *conn, 
-			 httpc_response_start_callback start_cb,
-			 httpc_response_callback cb, void *userdata);
-*/
-
-#endif
-
+httpc_conn_t* httpc_new();

+void httpc_free(httpc_conn_t* conn);

+

+int httpc_set_header(httpc_conn_t *conn, const char* key, const char* value);

+void  httpc_set_transfer_encoding(httpc_conn_t *conn, const char*  encoding);

+

+hresponse_t *httpc_get(httpc_conn_t *conn, const char *url);

+hresponse_t *httpc_post(httpc_conn_t *conn, const char *url, 

+			int conten_size, const char *content);

+

+int httpc_get_cb(httpc_conn_t *conn, const char *url, 

+		 httpc_response_start_callback start_cb,

+		 httpc_response_callback cb, void *userdata);

+		 

+

+int httpc_post_cb(httpc_conn_t *conn, const char *url, 

+		  httpc_response_start_callback start_cb,

+		  httpc_response_callback cb, int content_size, 

+		  const char *content,  void *userdata);

+

+/*

+  DIME support httpc_dime_* function set

+*/

+int httpc_dime_begin(httpc_conn_t *conn, const char *url);

+int httpc_dime_next(httpc_conn_t* conn, long content_length, 

+                    const char *content_type, const char *id,

+                    const char *dime_options, int last);

+int httpc_dime_send_data(httpc_conn_t* conn, int size, unsigned char* data);

+hresponse_t* httpc_dime_get_response(httpc_conn_t *conn);

+int httpc_dime_get_response_cb(httpc_conn_t *conn, 

+  httpc_response_start_callback start_cb,

+  httpc_response_callback cb, void *userdata);

+

+/*

+  MIME support httpc_mime_* function set

+*/

+

+int httpc_mime_post_begin(httpc_conn_t *conn, const char *url,

+  const char* related_start, 

+  const char* related_start_info, 

+  const char* related_type);

+

+int httpc_mime_post_next(httpc_conn_t *conn, 

+  const char* content_id,

+  const char* content_type, 

+  const char* transfer_encoding);

+

+int httpc_mime_post_send(httpc_conn_t *conn, size_t size, const unsigned char* data);

+hresponse_t *httpc_mime_post_end(httpc_conn_t *conn);

+int httpc_mime_post_end_cb(httpc_conn_t *conn, 

+  httpc_response_start_callback start_cb,

+  httpc_response_callback cb, void *userdata);

+

+

+/*

+  Chunked POST Module

+ */

+

+/* Returns 0 if success, >0 otherwise */

+/* do not use this

+int httpc_post_open(httpc_conn_t *conn, const char *url);

+

+int httpc_post_send(httpc_conn_t *conn, const char* buffer, int bufsize);

+hresponse_t *httpc_post_finish(httpc_conn_t *conn);

+int httpc_post_finish_cb(httpc_conn_t *conn, 

+			 httpc_response_start_callback start_cb,

+			 httpc_response_callback cb, void *userdata);

+*/

+

+#endif

+