Changeset bdae198 in mainline for uspace/app/nettest2/nettest2.c

Timestamp:

2013-08-04T12:01:10Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ea509069

Parents:

b08879c2 (diff), d856110 (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/nettest2/nettest2.c (modified) (3 diffs)

uspace/app/nettest2/nettest2.c

@@ -271 +271 @@
                 /* Interpret as a host name */
                 dnsr_hostinfo_t *hinfo = NULL;
-                rc = dnsr_name2host(addr_s, &hinfo);
+                rc = dnsr_name2host(addr_s, &hinfo, family);
                 
                 if (rc != EOK) {
@@ -375 +375 @@
         
         rc = sockets_sendto_recvfrom(verbose, socket_ids, sockets, address,
-            &addrlen, data, size, messages);
+            &addrlen, data, size, messages, type);
         if (rc != EOK)
                 return rc;
@@ -399 +399 @@
         
         rc = sockets_sendto(verbose, socket_ids, sockets, address, addrlen,
-            data, size, messages);
+            data, size, messages, type);
         if (rc != EOK)
                 return rc;