Quite important network stuff

3 files changed, 51 insertions, 4 deletions

diff --git a/libnet/http.c b/libnet/http.c
index 96dcd4d..85ceefc 100644
--- a/libnet/http.c
+++ b/libnet/http.c
@@ -3,9 +3,10 @@
 #include <assert.h>
 #include <conv.h>
 #include <def.h>
-#include <http.h>
 #include <mem.h>
+#include <net.h>
 #include <print.h>
+#include <socket.h>
 #include <str.h>
 
 char *http_data(char *r)
@@ -20,6 +21,33 @@ char *http_data(char *r)
 	return h;
 }
 
+char *http_header_key(char *r, const char *key)
+{
+	char *res = NULL;
+	for (char *p = r; *p; p++) {
+		/* printf("'%c%c%c' vs '%c%c%c'\n", p[0], p[1], p[2], key[0], key[1], key[2]); */
+		if (strlen(p) >= strlen(key) && !memcmp(p, key, strlen(key))) {
+			char *start = p + strlen(key) + 2;
+			char *end = start;
+			for (; *end != '\n'; end++)
+				;
+			res = malloc(end - start);
+			memcpy(res, start, end - start - 1);
+			res[end - start] = '\0';
+			break;
+		}
+	}
+	return res;
+}
+
+u32 http_content_length(char *r)
+{
+	char *value = http_header_key(r, "Content-Length");
+	int length = value ? atoi(value) : 0;
+	free(value);
+	return length;
+}
+
 char *http_code(char *r)
 {
 	char *code = malloc(4);
@@ -87,3 +115,19 @@ char *http_query_path(const char *query, char *path)
 
 	return path;
 }
+
+char *http_receive(struct socket *socket)
+{
+	char buf[4096] = { 0 };
+	if (!net_receive(socket, buf, 4096, NET_TIMEOUT))
+		return NULL;
+
+	u32 length = http_content_length(buf);
+	char *data = malloc(strlen(buf) + length);
+	memcpy(data, buf, strlen(buf));
+	while (strlen(http_data(data)) != length) {
+		if (!net_receive(socket, data, length, NET_TIMEOUT))
+			break;
+	}
+	return data;
+}
diff --git a/libnet/inc/http.h b/libnet/inc/http.h
index 223bdfc..45709c6 100644
--- a/libnet/inc/http.h
+++ b/libnet/inc/http.h
@@ -4,12 +4,16 @@
 #define HTTP_H
 
 #include <def.h>
+#include <socket.h>
 
 char *http_data(char *response);
+char *http_header_key(char *r, const char *key);
+u32 http_content_length(char *r);
 char *http_code(char *r);
 u32 http_response(const char *http_code, u32 content_length, const char *data, char *resp);
 char *http_query_get(const char *url, const char *path);
 char *http_query_path(const char *query, char *path);
+char *http_receive(struct socket *socket);
 
 #define HTTP_100 "100 Continue"
 #define HTTP_101 "101 Switching Protocol"
diff --git a/libnet/inc/net.h b/libnet/inc/net.h
index a897f1d..1b6a17d 100644
--- a/libnet/inc/net.h
+++ b/libnet/inc/net.h
@@ -4,7 +4,6 @@
 #define NET_H
 
 #include <dns.h>
-#include <http.h>
 #include <ip.h>
 #include <print.h>
 #include <socket.h>
@@ -48,8 +47,8 @@ static inline int net_connect(struct socket *socket, u32 ip_addr, u16 dst_port,
 static inline int net_close(struct socket *socket)
 {
 	int res = 0;
-	while (!(res = (int)sys1(SYS_NET_CLOSE, (int)(socket))))
-		;
+	while (socket->state == S_CLOSING || !(res = (int)sys1(SYS_NET_CLOSE, (int)(socket))))
+		yield();
 	return res;
 }