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

10 files changed, 21 insertions, 19 deletions

diff --git a/src/dns/dnsparser.c b/src/dns/dnsparser.c
index 74ca584c6..369f90215 100644
--- a/src/dns/dnsparser.c
+++ b/src/dns/dnsparser.c
@@ -373,7 +373,7 @@ GNUNET_DNSPARSER_parse_query (const char *udp_payload,
   memcpy (&ql, &udp_payload[*off], sizeof (ql));
   *off += sizeof (ql);
   q->type = ntohs (ql.type);
-  q->class = ntohs (ql.class);
+  q->dns_traffic_class = ntohs (ql.dns_traffic_class);
   return GNUNET_OK;
 }
 
@@ -582,7 +582,7 @@ GNUNET_DNSPARSER_parse_record (const char *udp_payload,
   memcpy (&rl, &udp_payload[*off], sizeof (rl));
   (*off) += sizeof (rl);
   r->type = ntohs (rl.type);
-  r->class = ntohs (rl.class);
+  r->dns_traffic_class = ntohs (rl.dns_traffic_class);
   r->expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
                                                                                         ntohl (rl.ttl)));
   data_len = ntohs (rl.data_len);
@@ -865,7 +865,7 @@ GNUNET_DNSPARSER_builder_add_query (char *dst,
   if (ret != GNUNET_OK)
     return ret;
   ql.type = htons (query->type);
-  ql.class = htons (query->class);
+  ql.dns_traffic_class = htons (query->dns_traffic_class);
   memcpy (&dst[*off], &ql, sizeof (ql));
   (*off) += sizeof (ql);
   return GNUNET_OK;
@@ -1064,7 +1064,7 @@ add_record (char *dst,
     return GNUNET_NO;
   }
   rl.type = htons (record->type);
-  rl.class = htons (record->class);
+  rl.dns_traffic_class = htons (record->dns_traffic_class);
   rl.ttl = htonl (GNUNET_TIME_absolute_get_remaining (record->expiration_time).rel_value_us / 1000LL / 1000LL); /* in seconds */
   rl.data_len = htons ((uint16_t) (pos - (*off + sizeof (struct GNUNET_TUN_DnsRecordLine))));
   memcpy (&dst[*off], &rl, sizeof (struct GNUNET_TUN_DnsRecordLine));
diff --git a/src/dns/gnunet-dns-monitor.c b/src/dns/gnunet-dns-monitor.c
index ed09d49b1..4c92009eb 100644
--- a/src/dns/gnunet-dns-monitor.c
+++ b/src/dns/gnunet-dns-monitor.c
@@ -113,7 +113,7 @@ display_query (const struct GNUNET_DNSPARSER_Query *query)
 {
   fprintf (stdout,
            "\t\t%s %s: %s\n",
-           get_class (query->class),
+           get_class (query->dns_traffic_class),
            get_type (query->type),
            query->name);
 }
@@ -210,7 +210,7 @@ display_record (const struct GNUNET_DNSPARSER_Record *record)
   }
   fprintf (stdout,
            "\t\t%s %s: %s = %s (%u s)\n",
-           get_class (record->class),
+           get_class (record->dns_traffic_class),
            get_type (record->type),
            record->name,
            format,
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,
         case GNUNET_DNSPARSER_TYPE_A:
           GNUNET_assert (sizeof (struct in_addr) == rd[i].data_size);
           rec.name = GNUNET_strdup (packet->queries[0].name);
-          rec.class = GNUNET_TUN_DNS_CLASS_INTERNET;
+          rec.dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET;
           rec.type = GNUNET_DNSPARSER_TYPE_A;
           rec.data.raw.data = GNUNET_new (struct in_addr);
           memcpy (rec.data.raw.data,
@@ -339,7 +339,7 @@ result_processor (void *cls,
           GNUNET_assert (sizeof (struct in6_addr) == rd[i].data_size);
           rec.name = GNUNET_strdup (packet->queries[0].name);
           rec.data.raw.data = GNUNET_malloc (sizeof (struct in6_addr));
-          rec.class = GNUNET_TUN_DNS_CLASS_INTERNET;
+          rec.dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET;
           rec.type = GNUNET_DNSPARSER_TYPE_AAAA;
           memcpy (rec.data.raw.data,
                   rd[i].data,
@@ -352,7 +352,7 @@ result_processor (void *cls,
         case GNUNET_DNSPARSER_TYPE_CNAME:
           rec.name = GNUNET_strdup (packet->queries[0].name);
           rec.data.hostname = strdup (rd[i].data);
-          rec.class = GNUNET_TUN_DNS_CLASS_INTERNET;
+          rec.dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET;
           rec.type = GNUNET_DNSPARSER_TYPE_CNAME;
           memcpy (rec.data.hostname,
                   rd[i].data,
diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c
index 3f4c0664f..be7a46f51 100644
--- a/src/gns/gnunet-service-gns_interceptor.c
+++ b/src/gns/gnunet-service-gns_interceptor.c
@@ -185,7 +185,7 @@ reply_to_dns (void *cls, uint32_t rd_count,
         }
         GNUNET_break (0 == (rd[i - skip_answers].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
         answer_records[i - skip_answers].expiration_time.abs_value_us = rd[i].expiration_time;
-        answer_records[i - skip_answers].class = GNUNET_TUN_DNS_CLASS_INTERNET;
+        answer_records[i - skip_answers].dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET;
       }
       else
       {
@@ -242,7 +242,7 @@ reply_to_dns (void *cls, uint32_t rd_count,
         }
         GNUNET_break (0 == (rd[i - skip_additional].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
         additional_records[i - skip_additional].expiration_time.abs_value_us = rd[i].expiration_time;
-        additional_records[i - skip_additional].class = GNUNET_TUN_DNS_CLASS_INTERNET; 
+        additional_records[i - skip_additional].dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET; 
       }
     }
     packet->num_answers = num_answers - skip_answers;
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index 75a49a575..a145c1bfb 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -920,7 +920,7 @@ recursive_dns_resolution (struct GNS_ResolverHandle *rh)
   query = GNUNET_new (struct GNUNET_DNSPARSER_Query);
   query->name = GNUNET_strdup (ac->label);
   query->type = rh->record_type;
-  query->class = GNUNET_TUN_DNS_CLASS_INTERNET;
+  query->dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET;
   p = GNUNET_new (struct GNUNET_DNSPARSER_Packet);
   p->queries = query;
   p->num_queries = 1;
diff --git a/src/include/gnunet_dnsparser_lib.h b/src/include/gnunet_dnsparser_lib.h
index fb0ab1149..c4b4546c8 100644
--- a/src/include/gnunet_dnsparser_lib.h
+++ b/src/include/gnunet_dnsparser_lib.h
@@ -79,7 +79,7 @@ struct GNUNET_DNSPARSER_Query
   /**
    * See GNUNET_TUN_DNS_CLASS_*.
    */
-  uint16_t class;
+  uint16_t dns_traffic_class;
 
 };
 
@@ -318,7 +318,7 @@ struct GNUNET_DNSPARSER_Record
   /**
    * See GNUNET_TUN_DNS_CLASS_*.
    */
-  uint16_t class;
+  uint16_t dns_traffic_class;
 
 };
 
diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h
index fbb3a285c..ad98f745d 100644
--- a/src/include/gnunet_namestore_service.h
+++ b/src/include/gnunet_namestore_service.h
@@ -563,7 +563,7 @@ GNUNET_NAMESTORE_string_to_value (uint32_t type,
  * @return corresponding number, UINT32_MAX on error
  */
 uint32_t
-GNUNET_NAMESTORE_typename_to_number (const char *typename);
+GNUNET_NAMESTORE_typename_to_number (const char *dns_typename);
 
 
 /**
diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h
index e2ebd450e..d728414e7 100644
--- a/src/include/gnunet_network_lib.h
+++ b/src/include/gnunet_network_lib.h
@@ -27,6 +27,8 @@
 #ifndef GNUNET_NETWORK_LIB_H
 #define GNUNET_NETWORK_LIB_H
 
+#include "platform.h"
+
 #ifdef __cplusplus
 extern "C"
 {
diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h
index 8383da0c3..ff24cb542 100644
--- a/src/include/gnunet_tun_lib.h
+++ b/src/include/gnunet_tun_lib.h
@@ -601,7 +601,7 @@ struct GNUNET_TUN_DnsQueryLine
   /**
    * Desired class (usually GNUNET_TUN_DNS_CLASS_INTERNET). (NBO)
    */
-  uint16_t class GNUNET_PACKED;
+  uint16_t dns_traffic_class GNUNET_PACKED;
 };
 
 
@@ -618,7 +618,7 @@ struct GNUNET_TUN_DnsRecordLine
   /**
    * Record class (usually GNUNET_TUN_DNS_CLASS_INTERNET). (NBO)
    */
-  uint16_t class GNUNET_PACKED;
+  uint16_t dns_traffic_class GNUNET_PACKED;
 
   /**
    * Expiration for the record (in seconds). (NBO)
diff --git a/src/namestore/namestore_api_common.c b/src/namestore/namestore_api_common.c
index b5a777083..55c9055ff 100644
--- a/src/namestore/namestore_api_common.c
+++ b/src/namestore/namestore_api_common.c
@@ -1069,13 +1069,13 @@ static struct {
  * @return corresponding number, UINT32_MAX on error
  */
 uint32_t
-GNUNET_NAMESTORE_typename_to_number (const char *typename)
+GNUNET_NAMESTORE_typename_to_number (const char *dns_typename)
 {
   unsigned int i;
 
   i=0;
   while ( (name_map[i].name != NULL) &&
-          (0 != strcasecmp (typename, name_map[i].name)) )
+          (0 != strcasecmp (dns_typename, name_map[i].name)) )
     i++;
   return name_map[i].number;  
 }