Changeset 4f086417 in mainline for uspace/lib/http/include/http/http.h

Timestamp:

2013-10-05T20:51:34Z (11 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

39bcc99

Parents:

ef2ecec (diff), cbfc8b7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge libhttp improvements

File:

• uspace/lib/http/include/http/http.h (moved) (moved from uspace/lib/http/http.h ) (4 diffs)

uspace/lib/http/include/http/http.h

@@ -41 +41 @@
 #include <inet/addr.h>
 
+#include "receive-buffer.h"
+
 typedef struct {
         char *host;
@@ -50 +52 @@
         
         size_t buffer_size;
-        char *recv_buffer;
-        size_t recv_buffer_in;
-        size_t recv_buffer_out;
+        receive_buffer_t recv_buffer;
 } http_t;
 
@@ -67 +67 @@
 
 typedef struct {
+        list_t list;
+} http_headers_t;
+
+typedef struct {
         char *method;
         char *path;
-        list_t headers;
+        http_headers_t headers;
 } http_request_t;
 
@@ -76 +80 @@
         uint16_t status;
         char *message;
-        list_t headers;
+        http_headers_t headers;
 } http_response_t;
 
 extern http_t *http_create(const char *, uint16_t);
 extern int http_connect(http_t *);
+
+extern void http_header_init(http_header_t *);
 extern http_header_t *http_header_create(const char *, const char *);
-extern http_header_t *http_header_create_no_copy(char *, char *);
+extern int http_header_receive_name(receive_buffer_t *, receive_buffer_mark_t *);
+extern int http_header_receive_value(receive_buffer_t *, receive_buffer_mark_t *,
+    receive_buffer_mark_t *);
+extern int http_header_receive(receive_buffer_t *, http_header_t *, size_t,
+    size_t *);
+extern void http_header_normalize_value(char *);
+extern bool http_header_name_match(const char *, const char *);
+ssize_t http_header_encode(http_header_t *, char *, size_t);
 extern void http_header_destroy(http_header_t *);
+
+extern void http_headers_init(http_headers_t *);
+extern int http_headers_find_single(http_headers_t *, const char *,
+    http_header_t **);
+extern int http_headers_append(http_headers_t *, const char *, const char *);
+extern int http_headers_set(http_headers_t *, const char *, const char *);
+extern int http_headers_get(http_headers_t *, const char *, char **);
+extern int http_headers_receive(receive_buffer_t *, http_headers_t *, size_t,
+    unsigned);
+extern void http_headers_clear(http_headers_t *);
+
+#define http_headers_foreach(headers, iter) \
+    list_foreach((headers).list, link, http_header_t, (iter))
+
+static inline void http_headers_remove(http_headers_t *headers,
+    http_header_t *header)
+{
+        list_remove(&header->link);
+}
+
+static inline void http_headers_append_header(http_headers_t *headers,
+    http_header_t *header)
+{
+        list_append(&header->link, &headers->list);
+}
+
 extern http_request_t *http_request_create(const char *, const char *);
 extern void http_request_destroy(http_request_t *);
 extern int http_request_format(http_request_t *, char **, size_t *);
 extern int http_send_request(http_t *, http_request_t *);
-extern int http_parse_status(const char *, http_version_t *, uint16_t *,
+extern int http_receive_status(receive_buffer_t *, http_version_t *, uint16_t *,
     char **);
-extern int http_parse_header(const char *, char **, char **);
-extern int http_receive_response(http_t *, http_response_t **);
-extern int http_receive_body(http_t *, void *, size_t);
+extern int http_receive_response(receive_buffer_t *, http_response_t **,
+    size_t, unsigned);
 extern void http_response_destroy(http_response_t *);
 extern int http_close(http_t *);