diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-09-28 09:58:07 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-09-28 09:58:07 +0000 |
commit | ae4f506a574161c3baaf071d491f8c4987bc0623 (patch) | |
tree | 6cf85f6933fdfdb562bcc85e7d4926cab0dc2d50 /src/gns/gnunet-dns2gns.c | |
parent | bc0b7fac93289d5b310a23837c55acd5ee11027b (diff) | |
download | gnunet-ae4f506a574161c3baaf071d491f8c4987bc0623.tar.gz gnunet-ae4f506a574161c3baaf071d491f8c4987bc0623.zip |
Andrew Cann wrote:
This patch changes the name of a couple of variables that had
c++-incompatible names and adds a header file to gnunet_network_lib.h
https://canndrew.org/misc/change_cpp_incompatible_variable_names.diff
Diffstat (limited to 'src/gns/gnunet-dns2gns.c')
-rw-r--r-- | src/gns/gnunet-dns2gns.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c index 8bbf22c46..a6d57f3a9 100644 --- a/src/gns/gnunet-dns2gns.c +++ b/src/gns/gnunet-dns2gns.c | |||
@@ -324,7 +324,7 @@ result_processor (void *cls, | |||
324 | case GNUNET_DNSPARSER_TYPE_A: | 324 | case GNUNET_DNSPARSER_TYPE_A: |
325 | GNUNET_assert (sizeof (struct in_addr) == rd[i].data_size); | 325 | GNUNET_assert (sizeof (struct in_addr) == rd[i].data_size); |
326 | rec.name = GNUNET_strdup (packet->queries[0].name); | 326 | rec.name = GNUNET_strdup (packet->queries[0].name); |
327 | rec.class = GNUNET_TUN_DNS_CLASS_INTERNET; | 327 | rec.dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET; |
328 | rec.type = GNUNET_DNSPARSER_TYPE_A; | 328 | rec.type = GNUNET_DNSPARSER_TYPE_A; |
329 | rec.data.raw.data = GNUNET_new (struct in_addr); | 329 | rec.data.raw.data = GNUNET_new (struct in_addr); |
330 | memcpy (rec.data.raw.data, | 330 | memcpy (rec.data.raw.data, |
@@ -339,7 +339,7 @@ result_processor (void *cls, | |||
339 | GNUNET_assert (sizeof (struct in6_addr) == rd[i].data_size); | 339 | GNUNET_assert (sizeof (struct in6_addr) == rd[i].data_size); |
340 | rec.name = GNUNET_strdup (packet->queries[0].name); | 340 | rec.name = GNUNET_strdup (packet->queries[0].name); |
341 | rec.data.raw.data = GNUNET_malloc (sizeof (struct in6_addr)); | 341 | rec.data.raw.data = GNUNET_malloc (sizeof (struct in6_addr)); |
342 | rec.class = GNUNET_TUN_DNS_CLASS_INTERNET; | 342 | rec.dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET; |
343 | rec.type = GNUNET_DNSPARSER_TYPE_AAAA; | 343 | rec.type = GNUNET_DNSPARSER_TYPE_AAAA; |
344 | memcpy (rec.data.raw.data, | 344 | memcpy (rec.data.raw.data, |
345 | rd[i].data, | 345 | rd[i].data, |
@@ -352,7 +352,7 @@ result_processor (void *cls, | |||
352 | case GNUNET_DNSPARSER_TYPE_CNAME: | 352 | case GNUNET_DNSPARSER_TYPE_CNAME: |
353 | rec.name = GNUNET_strdup (packet->queries[0].name); | 353 | rec.name = GNUNET_strdup (packet->queries[0].name); |
354 | rec.data.hostname = strdup (rd[i].data); | 354 | rec.data.hostname = strdup (rd[i].data); |
355 | rec.class = GNUNET_TUN_DNS_CLASS_INTERNET; | 355 | rec.dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET; |
356 | rec.type = GNUNET_DNSPARSER_TYPE_CNAME; | 356 | rec.type = GNUNET_DNSPARSER_TYPE_CNAME; |
357 | memcpy (rec.data.hostname, | 357 | memcpy (rec.data.hostname, |
358 | rd[i].data, | 358 | rd[i].data, |