Changeset f3386d7 in mainline for uspace/srv/net/dnsrsrv/query.c


Ignore:
Timestamp:
2013-07-15T20:44:54Z (11 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f8d3df3
Parents:
273c976 (diff), a940f1d (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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/dnsrsrv/query.c

    r273c976 rf3386d7  
    128128
    129129                        info->cname = str_dup(rr->name);
    130                         info->addr.ipv4 = dns_uint32_t_decode(rr->rdata, rr->rdata_size);
    131                         log_msg(LOG_DEFAULT, LVL_DEBUG, "info->name = '%s' "
    132                             "info->addr = %x", info->cname, info->addr.ipv4);
    133 
     130                        inet_addr_set(dns_uint32_t_decode(rr->rdata, rr->rdata_size),
     131                            &info->addr);
     132                       
    134133                        dns_message_destroy(msg);
    135134                        dns_message_destroy(amsg);
Note: See TracChangeset for help on using the changeset viewer.