Changeset 98abd40 in mainline for uspace/app/nettest3/nettest3.c

Timestamp:

2013-07-06T21:57:22Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (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:

Merge mainline changes

File:

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

uspace/app/nettest3/nettest3.c

@@ -83 +83 @@
                                 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,