Quite important network stuff

2 files changed, 6 insertions, 3 deletions

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;
 }