Changeset ee1c2d9 in mainline for uspace/lib/http/include/http/http.h

Timestamp:

2015-06-13T18:30:18Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a157846

Parents:

0453261 (diff), 2f9a8e8 (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:

mainline changes

File:

• uspace/lib/http/include/http/http.h (modified) (2 diffs)

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

@@ -37 +37 @@
 #define HTTP_HTTP_H_
 
-#include <net/socket.h>
 #include <adt/list.h>
 #include <inet/addr.h>
+#include <inet/tcp.h>
 
 #include "receive-buffer.h"
@@ -48 +48 @@
         inet_addr_t addr;
 
-        bool connected;
-        int conn_sd;
-        
+        tcp_t *tcp;
+        tcp_conn_t *conn;
+
         size_t buffer_size;
         receive_buffer_t recv_buffer;