Changeset 03c971f in mainline for uspace/app/nettest3/nettest3.c

Timestamp:

2013-08-15T14:20:16Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

bb2a5b2

Parents:

f2c19b0 (diff), 2921602 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline changes.

File:

• uspace/app/nettest3/nettest3.c (modified) (1 diff)

uspace/app/nettest3/nettest3.c

@@ -78 +78 @@
                 if (rc != EOK) {
                         /* Try interpreting as a host name */
-                        rc = dnsr_name2host(argv[1], &hinfo);
+                        rc = dnsr_name2host(argv[1], &hinfo, AF_INET);
                         if (rc != EOK) {
                                 printf("Error resolving host '%s'.\n", argv[1]);
                                 return rc;
                         }
-
-                        addr.sin_addr.s_addr = host2uint32_t_be(hinfo->addr.ipv4);
-                        addr.sin_family = AF_INET;
+                        
+                        uint16_t af = inet_addr_sockaddr_in(&hinfo->addr, &addr, NULL);
+                        if (af != AF_INET) {
+                                printf("Host '%s' not resolved as IPv4 address.\n", argv[1]);
+                                return rc;
+                        }
                 }
                 printf("result: rc=%d, family=%d, addr=%x\n", rc,