Changeset a62ceaf in mainline for uspace/app/nterm

Timestamp:

2016-02-29T19:19:19Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

129b92c6

Parents:

5147ff1

Message:

Need better interfaces for handling internet host and host:port specifications.

Location:

uspace/app/nterm

Files:

• conn.c (modified) (2 diffs)
• conn.h (modified) (1 diff)
• nterm.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 *host, const char *port_s)
+int conn_open(const char *hostport)
 {
         inet_ep2_t epp;
+        const char *errmsg;
+        int rc;
 
-        /* Interpret as address */
-        inet_addr_t iaddr;
-        int rc = inet_addr_parse(host, &iaddr);
-
+        inet_ep2_init(&epp);
+        rc = inet_hostport_plookup_one(hostport, ip_any, &epp.remote, NULL,
+            &errmsg);
         if (rc != EOK) {
-                /* 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);
+                printf("Error: %s (host:port %s).\n", errmsg, hostport);
                 goto error;
         }
 
-        inet_ep2_init(&epp);
-        epp.remote.addr = iaddr;
-        epp.remote.port = port;
-
-        printf("Connecting to host %s port %u\n", host, port);
+        printf("Connecting to %s\n", hostport);
+        char *s;
+        rc = inet_addr_format(&epp.remote.addr, &s);
+        if (rc != EOK)
+                goto error;
 
         rc = tcp_create(&tcp);

uspace/app/nterm/conn.h

@@ -39 +39 @@
 #include <sys/types.h>
 
-extern int conn_open(const char *, const char *);
+extern int conn_open(const char *);
 extern int conn_send(void *, size_t);
 

uspace/app/nterm/nterm.c

@@ -104 +104 @@
 static void print_syntax(void)
 {
-        printf("syntax: nterm <host> <port>\n");
+        printf("syntax: nterm <host>:<port>\n");
 }
 
@@ -112 +112 @@
         int rc;
 
-        if (argc != 3) {
+        if (argc != 2) {
                 print_syntax();
                 return 1;
         }
 
-        rc = conn_open(argv[1], argv[2]);
+        rc = conn_open(argv[1]);
         if (rc != EOK) {
                 printf("Error connecting.\n");