Changes in uspace/app/nterm/conn.c [a62ceaf:0aa70f4] in mainline

File:

• uspace/app/nterm/conn.c (modified) (3 diffs)

uspace/app/nterm/conn.c

@@ -37 +37 @@
 #include <errno.h>
 #include <fibril.h>
-#include <inet/endpoint.h>
-#include <inet/hostport.h>
-#include <inet/tcp.h>
+#include <inet/dnsr.h>
+#include <net/socket.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <str_error.h>
 #include <sys/types.h>
@@ -48 +46 @@
 #include "nterm.h"
 
-static tcp_t *tcp;
-static tcp_conn_t *conn;
+static int conn_fd;
+static fid_t rcv_fid;
 
 #define RECV_BUF_SIZE 1024
 static uint8_t recv_buf[RECV_BUF_SIZE];
 
-static void conn_conn_reset(tcp_conn_t *);
-static void conn_data_avail(tcp_conn_t *);
+static int rcv_fibril(void *arg)
+{
+        ssize_t nr;
 
-static tcp_cb_t conn_cb = {
-        .conn_reset = conn_conn_reset,
-        .data_avail = conn_data_avail
-};
+        while (true) {
+                nr = recv(conn_fd, recv_buf, RECV_BUF_SIZE, 0);
+                if (nr < 0)
+                        break;
 
-static void conn_conn_reset(tcp_conn_t *conn)
-{
-        printf("\n[Connection reset]\n");
+                nterm_received(recv_buf, nr);
+        }
+
+        if (nr == ENOTCONN)
+                printf("\n[Other side has closed the connection]\n");
+        else
+                printf("'\n[Receive errror (%s)]\n", str_error(nr));
+
+        exit(0);
+        return 0;
 }
 
-static void conn_data_avail(tcp_conn_t *conn)
+int conn_open(const char *addr_s, const char *port_s)
 {
-        int rc;
-        size_t nrecv;
-
-        while (true) {
-                rc = tcp_conn_recv(conn, recv_buf, RECV_BUF_SIZE, &nrecv);
+        int conn_fd = -1;
+        
+        /* Interpret as address */
+        inet_addr_t addr_addr;
+        int rc = inet_addr_parse(addr_s, &addr_addr);
+        
+        if (rc != EOK) {
+                /* Interpret as a host name */
+                dnsr_hostinfo_t *hinfo = NULL;
+                rc = dnsr_name2host(addr_s, &hinfo, 0);
+                
                 if (rc != EOK) {
-                        printf("\n[Receive error %d]\n", rc);
-                        break;
+                        printf("Error resolving host '%s'.\n", addr_s);
+                        goto error;
                 }
-
-                nterm_received(recv_buf, nrecv);
-
-                if (nrecv != RECV_BUF_SIZE)
-                        break;
+                
+                addr_addr = hinfo->addr;
         }
-}
-
-int conn_open(const char *hostport)
-{
-        inet_ep2_t epp;
-        const char *errmsg;
-        int rc;
-
-        inet_ep2_init(&epp);
-        rc = inet_hostport_plookup_one(hostport, ip_any, &epp.remote, NULL,
-            &errmsg);
-        if (rc != EOK) {
-                printf("Error: %s (host:port %s).\n", errmsg, hostport);
+        
+        struct sockaddr_in addr;
+        struct sockaddr_in6 addr6;
+        uint16_t af = inet_addr_sockaddr_in(&addr_addr, &addr, &addr6);
+        
+        char *endptr;
+        uint16_t port = strtol(port_s, &endptr, 10);
+        if (*endptr != '\0') {
+                printf("Invalid port number %s\n", port_s);
                 goto error;
         }
-
-        printf("Connecting to %s\n", hostport);
-        char *s;
-        rc = inet_addr_format(&epp.remote.addr, &s);
+        
+        printf("Connecting to host %s port %u\n", addr_s, port);
+        
+        conn_fd = socket(PF_INET, SOCK_STREAM, 0);
+        if (conn_fd < 0)
+                goto error;
+        
+        switch (af) {
+        case AF_INET:
+                addr.sin_port = htons(port);
+                rc = connect(conn_fd, (struct sockaddr *) &addr, sizeof(addr));
+                break;
+        case AF_INET6:
+                addr6.sin6_port = htons(port);
+                rc = connect(conn_fd, (struct sockaddr *) &addr6, sizeof(addr6));
+                break;
+        default:
+                printf("Unknown address family.\n");
+                goto error;
+        }
+        
         if (rc != EOK)
                 goto error;
-
-        rc = tcp_create(&tcp);
-        if (rc != EOK)
+        
+        rcv_fid = fibril_create(rcv_fibril, NULL);
+        if (rcv_fid == 0)
                 goto error;
-
-        rc = tcp_conn_create(tcp, &epp, &conn_cb, NULL, &conn);
-        if (rc != EOK)
-                goto error;
-
-        rc = tcp_conn_wait_connected(conn);
-        if (rc != EOK)
-                goto error;
-
+        
+        fibril_add_ready(rcv_fid);
+        
         return EOK;
+        
 error:
-        tcp_conn_destroy(conn);
-        tcp_destroy(tcp);
-
+        if (conn_fd >= 0) {
+                closesocket(conn_fd);
+                conn_fd = -1;
+        }
+        
         return EIO;
 }
@@ -128 +147 @@
 int conn_send(void *data, size_t size)
 {
-        int rc = tcp_conn_send(conn, data, size);
+        int rc = send(conn_fd, data, size, 0);
         if (rc != EOK)
                 return EIO;
-
+        
         return EOK;
 }