Changeset ee1c2d9 in mainline for uspace/lib/http/src/http.c

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/src/http.c (modified) (6 diffs)

uspace/lib/http/src/http.c

@@ -34 +34 @@
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -39 +40 @@
 #include <macros.h>
 
-#include <net/socket.h>
 #include <inet/dnsr.h>
+#include <inet/tcp.h>
 
 #include <http/http.h>
@@ -48 +49 @@
 {
         http_t *http = client_data;
-        return recv(http->conn_sd, buf, buf_size, 0);
+        size_t nrecv;
+        int rc;
+
+        rc = tcp_conn_recv_wait(http->conn, buf, buf_size, &nrecv);
+        if (rc != EOK)
+                return rc;
+
+        return nrecv;
 }
 
@@ -77 +85 @@
 int http_connect(http_t *http)
 {
-        if (http->connected)
+        if (http->conn != NULL)
                 return EBUSY;
         
@@ -95 +103 @@
         }
         
-        struct sockaddr *saddr;
-        socklen_t saddrlen;
+        inet_ep2_t epp;
         
-        rc = inet_addr_sockaddr(&http->addr, http->port, &saddr, &saddrlen);
-        if (rc != EOK) {
-                assert(rc == ENOMEM);
-                return ENOMEM;
-        }
+        inet_ep2_init(&epp);
+        epp.remote.addr = http->addr;
+        epp.remote.port = http->port;
         
-        http->conn_sd = socket(saddr->sa_family, SOCK_STREAM, 0);
-        if (http->conn_sd < 0)
-                return http->conn_sd;
+        rc = tcp_create(&http->tcp);
+        if (rc != EOK)
+                return rc;
         
-        rc = connect(http->conn_sd, saddr, saddrlen);
-        free(saddr);
+        rc = tcp_conn_create(http->tcp, &epp, NULL, NULL, &http->conn);
+        if (rc != EOK)
+                return rc;
+        
+        rc = tcp_conn_wait_connected(http->conn);
+        if (rc != EOK)
+                return rc;
         
         return rc;
@@ -116 +126 @@
 int http_close(http_t *http)
 {
-        if (!http->connected)
+        if (http->conn == NULL)
                 return EINVAL;
         
-        return closesocket(http->conn_sd);
+        tcp_conn_destroy(http->conn);
+        tcp_destroy(http->tcp);
+        return EOK;
 }