Changes in / [c42f50d:3e896e1] in mainline

Location:

uspace

Files:

• app/download/Makefile (modified) (1 diff)
• app/download/main.c (modified) (5 diffs)
• lib/http/Makefile (modified) (1 diff)
• lib/http/http.c (added)
• lib/http/http.h (added)
• lib/http/include/http/ctype.h (deleted)
• lib/http/include/http/errno.h (deleted)
• lib/http/include/http/http.h (deleted)
• lib/http/include/http/receive-buffer.h (deleted)
• lib/http/src/headers.c (deleted)
• lib/http/src/http.c (deleted)
• lib/http/src/receive-buffer.c (deleted)
• lib/http/src/request.c (deleted)
• lib/http/src/response.c (deleted)

uspace/app/download/Makefile

@@ -29 +29 @@
 USPACE_PREFIX = ../..
 LIBS = $(LIBHTTP_PREFIX)/libhttp.a $(LIBURI_PREFIX)/liburi.a
-EXTRA_CFLAGS = -I$(LIBHTTP_PREFIX)/include -I$(LIBURI_PREFIX)
+EXTRA_CFLAGS = -I$(LIBHTTP_PREFIX) -I$(LIBURI_PREFIX)
 DEFS = -DRELEASE=$(RELEASE)
 BINARY = download

uspace/app/download/main.c

@@ -47 +47 @@
 #include <net/socket.h>
 
-#include <http/http.h>
+#include <http.h>
 #include <uri.h>
 
@@ -132 +132 @@
                 fprintf(stderr, "Failed creating request\n");
                 uri_destroy(uri);
-                return 3;
-        }
-        
-        int rc = http_headers_append(&req->headers, "Host", uri->host);
-        if (rc != EOK) {
-                fprintf(stderr, "Failed setting Host header: %s\n", str_error(rc));
-                uri_destroy(uri);
-                return rc;
-        }
-        
-        rc = http_headers_append(&req->headers, "User-Agent", USER_AGENT);
-        if (rc != EOK) {
-                fprintf(stderr, "Failed creating User-Agent header: %s\n", str_error(rc));
-                uri_destroy(uri);
-                return rc;
-        }
+                free(server_path);
+                return 3;
+        }
+        
+        http_header_t *header_host = http_header_create("Host", uri->host);
+        if (header_host == NULL) {
+                fprintf(stderr, "Failed creating Host header\n");
+                uri_destroy(uri);
+                free(server_path);
+                return 3;
+        }
+        list_append(&header_host->link, &req->headers);
+        
+        http_header_t *header_ua = http_header_create("User-Agent", USER_AGENT);
+        if (header_ua == NULL) {
+                fprintf(stderr, "Failed creating User-Agent header\n");
+                uri_destroy(uri);
+                free(server_path);
+                return 3;
+        }
+        list_append(&header_ua->link, &req->headers);
         
         http_t *http = http_create(uri->host, port);
         if (http == NULL) {
                 uri_destroy(uri);
+                free(server_path);
                 fprintf(stderr, "Failed creating HTTP object\n");
                 return 3;
         }
         
-        rc = http_connect(http);
+        int rc = http_connect(http);
         if (rc != EOK) {
                 fprintf(stderr, "Failed connecting: %s\n", str_error(rc));
                 uri_destroy(uri);
+                free(server_path);
                 return rc;
         }
@@ -167 +174 @@
                 fprintf(stderr, "Failed sending request: %s\n", str_error(rc));
                 uri_destroy(uri);
+                free(server_path);
                 return rc;
         }
         
         http_response_t *response = NULL;
-        rc = http_receive_response(&http->recv_buffer, &response);
+        rc = http_receive_response(http, &response);
         if (rc != EOK) {
                 fprintf(stderr, "Failed receiving response: %s\n", str_error(rc));
                 uri_destroy(uri);
+                free(server_path);
                 return rc;
         }
@@ -188 +197 @@
                         fprintf(stderr, "Failed allocating buffer\n)");
                         uri_destroy(uri);
+                        free(server_path);
                         return ENOMEM;
                 }
                 
                 int body_size;
-                while ((body_size = recv_buffer(&http->recv_buffer, buf, buf_size)) > 0) {
+                while ((body_size = http_receive_body(http, buf, buf_size)) > 0) {
                         fwrite(buf, 1, body_size, stdout);
                 }
@@ -202 +212 @@
         
         uri_destroy(uri);
+        free(server_path);
         return EOK;
 }

uspace/lib/http/Makefile

@@ -31 +31 @@
 SLIBRARY = libhttp.so.0.0
 LSONAME = libhttp.so0
-EXTRA_CFLAGS += -Iinclude
+#EXTRA_CFLAGS += 
 
 SOURCES = \
-        src/http.c \
-        src/headers.c \
-        src/request.c \
-        src/response.c \
-        src/receive-buffer.c
+        http.c
 
 include $(USPACE_PREFIX)/Makefile.common