Changes in uspace/app/nterm/conn.c [a62ceaf:204ba47] in mainline

File:

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

uspace/app/nterm/conn.c

@@ -37 +37 @@
 #include <errno.h>
 #include <fibril.h>
+#include <inet/dnsr.h>
 #include <inet/endpoint.h>
-#include <inet/hostport.h>
 #include <inet/tcp.h>
 #include <stdio.h>
@@ -86 +86 @@
 }
 
-int conn_open(const char *hostport)
+int conn_open(const char *host, const char *port_s)
 {
         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);
+        /* Interpret as address */
+        inet_addr_t iaddr;
+        int rc = inet_addr_parse(host, &iaddr);
+
         if (rc != EOK) {
-                printf("Error: %s (host:port %s).\n", errmsg, hostport);
+                /* Interpret as a host name */
+                dnsr_hostinfo_t *hinfo = NULL;
+                rc = dnsr_name2host(host, &hinfo, ip_any);
+
+                if (rc != EOK) {
+                        printf("Error resolving host '%s'.\n", host);
+                        goto error;
+                }
+
+                iaddr = hinfo->addr;
+        }
+
+        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);
-        if (rc != EOK)
-                goto error;
+        inet_ep2_init(&epp);
+        epp.remote.addr = iaddr;
+        epp.remote.port = port;
+
+        printf("Connecting to host %s port %u\n", host, port);
 
         rc = tcp_create(&tcp);