Changeset a62ceaf in mainline for uspace/app/netecho/comm.c

Timestamp:

2016-02-29T19:19:19Z (8 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.

File:

• uspace/app/netecho/comm.c (modified) (3 diffs)

uspace/app/netecho/comm.c

@@ -37 +37 @@
 #include <errno.h>
 #include <fibril.h>
-#include <inet/dnsr.h>
 #include <inet/endpoint.h>
+#include <inet/hostport.h>
 #include <inet/udp.h>
 #include <macros.h>
@@ -109 +109 @@
 }
 
-int comm_open(const char *host, const char *port_s)
+int comm_open_listen(const char *port_s)
 {
         inet_ep2_t epp;
-        inet_addr_t iaddr;
         int rc;
-
-        if (host != NULL) {
-                /* Interpret as address */
-                inet_addr_t iaddr;
-                int rc = inet_addr_parse(host, &iaddr);
-
-                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;
@@ -142 +122 @@
 
         inet_ep2_init(&epp);
-        if (host != NULL) {
-                /* Talk to remote host */
-                remote.addr = iaddr;
-                remote.port = port;
+        epp.local.port = port;
 
-                printf("Talking to host %s port %u\n", host, port);
-        } else {
-                /* Listen on local port */
-                epp.local.port = port;
+        printf("Listening on port %u\n", port);
 
-                printf("Listening on port %u\n", port);
+        rc = udp_create(&udp);
+        if (rc != EOK)
+                goto error;
+
+        rc = udp_assoc_create(udp, &epp, &comm_udp_cb, NULL, &assoc);
+        if (rc != EOK)
+                goto error;
+
+        return EOK;
+error:
+        udp_assoc_destroy(assoc);
+        udp_destroy(udp);
+
+        return EIO;
+}
+
+int comm_open_talkto(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);
+                goto error;
         }
+
+        printf("Talking to %s\n", hostport);
 
         rc = udp_create(&udp);