Merge origin/master

This commit is contained in:
MissValeska 2014-12-03 12:32:28 -08:00
commit 6ef905da67
2 changed files with 10 additions and 2 deletions

9
README
View File

@ -220,12 +220,17 @@ Subscribe to the netsukuku mailing to get help, be updated on the latest news
and discuss on its development.
To subscribe to the list, send a message to:
netsukuku-subscribe@lists.dyne.org
or use the web interface:
http://lists.dyne.org/mailman/listinfo/netsukuku
https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/netsukuku
You can browse the archive here:
http://lists.dyne.org/netsukuku/
https://lists.dyne.org/lurker/list/netsukuku.en.html
http://dir.gmane.org/gmane.network.peer-to-peer.netsukuku

View File

@ -491,6 +491,9 @@ d_a_u(char *start_buf, char *buf, dns_pkt_a ** dpa_orig, int limit_len)
if (dpa->type == T_A) {
memcpy(dpa->rdata, buf, rdlen); /* 32bit address */
count += rdlen;
} else if (dpa->type == T_AAAA) {
memcpy(dpa->rdata, buf, rdlen); /* 128bit address */
count += rdlen;
} else if (dpa->type == T_MX) {
memcpy(dpa->rdata, buf, 2);
if ((ui =