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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/nettest1/nettest1.c

    rb08879c2 rbdae198  
    253253       
    254254        rc = sockets_sendto_recvfrom(verbose, socket_ids, nsockets, address,
    255             &addrlen, data, size, nmessages);
     255            &addrlen, data, size, nmessages, type);
    256256        if (rc != EOK)
    257257                return rc;
     
    278278       
    279279        rc = sockets_sendto(verbose, socket_ids, nsockets, address, addrlen,
    280             data, size, nmessages);
     280            data, size, nmessages, type);
    281281        if (rc != EOK)
    282282                return rc;
     
    335335                /* Interpret as a host name */
    336336                dnsr_hostinfo_t *hinfo = NULL;
    337                 rc = dnsr_name2host(addr_s, &hinfo);
     337                rc = dnsr_name2host(addr_s, &hinfo, family);
    338338               
    339339                if (rc != EOK) {
Note: See TracChangeset for help on using the changeset viewer.