Changes in uspace/lib/http/src/http.c [b623b68:779541b] in mainline

File:

• uspace/lib/http/src/http.c (modified) (7 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;
         
@@ -86 +94 @@
                 /* Interpret as a host name */
                 dnsr_hostinfo_t *hinfo = NULL;
-                rc = dnsr_name2host(http->host, &hinfo, AF_NONE);
+                rc = dnsr_name2host(http->host, &hinfo, ip_any);
                 
                 if (rc != EOK)
@@ -95 +103 @@
         }
         
-        struct sockaddr_in addr;
-        struct sockaddr_in6 addr6;
-        uint16_t af = inet_addr_sockaddr_in(&http->addr, &addr, &addr6);
+        inet_ep2_t epp;
         
-        http->conn_sd = socket(PF_INET, SOCK_STREAM, 0);
-        if (http->conn_sd < 0)
-                return http->conn_sd;
+        inet_ep2_init(&epp);
+        epp.remote.addr = http->addr;
+        epp.remote.port = http->port;
         
-        switch (af) {
-        case AF_INET:
-                addr.sin_port = htons(http->port);
-                rc = connect(http->conn_sd, (struct sockaddr *) &addr, sizeof(addr));
-                break;
-        case AF_INET6:
-                addr6.sin6_port = htons(http->port);
-                rc = connect(http->conn_sd, (struct sockaddr *) &addr6, sizeof(addr6));
-                break;
-        default:
-                return ENOTSUP;
-        }
+        rc = tcp_create(&http->tcp);
+        if (rc != EOK)
+                return rc;
+        
+        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;
@@ -121 +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;
 }