[GNUnet-SVN] r29670 - in gnunet/src: dns gns include namestore

[gnunet]

Author: grothoff
Date: 2013-09-28 11:58:07 +0200 (Sat, 28 Sep 2013)
New Revision: 29670

Modified:
   gnunet/src/dns/dnsparser.c
   gnunet/src/dns/gnunet-dns-monitor.c
   gnunet/src/gns/gnunet-dns2gns.c
   gnunet/src/gns/gnunet-service-gns_interceptor.c
   gnunet/src/gns/gnunet-service-gns_resolver.c
   gnunet/src/include/gnunet_dnsparser_lib.h
   gnunet/src/include/gnunet_namestore_service.h
   gnunet/src/include/gnunet_network_lib.h
   gnunet/src/include/gnunet_tun_lib.h
   gnunet/src/namestore/namestore_api_common.c
Log:
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



Modified: gnunet/src/dns/dnsparser.c
===================================================================
--- gnunet/src/dns/dnsparser.c  2013-09-27 20:01:46 UTC (rev 29669)
+++ gnunet/src/dns/dnsparser.c  2013-09-28 09:58:07 UTC (rev 29670)
@@ -373,7 +373,7 @@
   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 @@
   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 @@
   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 @@
     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));

Modified: gnunet/src/dns/gnunet-dns-monitor.c
===================================================================
--- gnunet/src/dns/gnunet-dns-monitor.c 2013-09-27 20:01:46 UTC (rev 29669)
+++ gnunet/src/dns/gnunet-dns-monitor.c 2013-09-28 09:58:07 UTC (rev 29670)
@@ -113,7 +113,7 @@
 {
   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 @@
   }
   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,

Modified: gnunet/src/gns/gnunet-dns2gns.c
===================================================================
--- gnunet/src/gns/gnunet-dns2gns.c     2013-09-27 20:01:46 UTC (rev 29669)
+++ gnunet/src/gns/gnunet-dns2gns.c     2013-09-28 09:58:07 UTC (rev 29670)
@@ -324,7 +324,7 @@
        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 @@
          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 @@
        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,

Modified: gnunet/src/gns/gnunet-service-gns_interceptor.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_interceptor.c     2013-09-27 20:01:46 UTC 
(rev 29669)
+++ gnunet/src/gns/gnunet-service-gns_interceptor.c     2013-09-28 09:58:07 UTC 
(rev 29670)
@@ -185,7 +185,7 @@
        }
        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 @@
        }
        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;

Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c        2013-09-27 20:01:46 UTC 
(rev 29669)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c        2013-09-28 09:58:07 UTC 
(rev 29670)
@@ -920,7 +920,7 @@
   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;

Modified: gnunet/src/include/gnunet_dnsparser_lib.h
===================================================================
--- gnunet/src/include/gnunet_dnsparser_lib.h   2013-09-27 20:01:46 UTC (rev 
29669)
+++ gnunet/src/include/gnunet_dnsparser_lib.h   2013-09-28 09:58:07 UTC (rev 
29670)
@@ -79,7 +79,7 @@
   /**
    * See GNUNET_TUN_DNS_CLASS_*.
    */
-  uint16_t class;
+  uint16_t dns_traffic_class;
 
 };
 
@@ -318,7 +318,7 @@
   /**
    * See GNUNET_TUN_DNS_CLASS_*.
    */
-  uint16_t class;
+  uint16_t dns_traffic_class;
 
 };
 

Modified: gnunet/src/include/gnunet_namestore_service.h
===================================================================
--- gnunet/src/include/gnunet_namestore_service.h       2013-09-27 20:01:46 UTC 
(rev 29669)
+++ gnunet/src/include/gnunet_namestore_service.h       2013-09-28 09:58:07 UTC 
(rev 29670)
@@ -563,7 +563,7 @@
  * @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);
 
 
 /**

Modified: gnunet/src/include/gnunet_network_lib.h
===================================================================
--- gnunet/src/include/gnunet_network_lib.h     2013-09-27 20:01:46 UTC (rev 
29669)
+++ gnunet/src/include/gnunet_network_lib.h     2013-09-28 09:58:07 UTC (rev 
29670)
@@ -27,6 +27,8 @@
 #ifndef GNUNET_NETWORK_LIB_H
 #define GNUNET_NETWORK_LIB_H
 
+#include "platform.h"
+
 #ifdef __cplusplus
 extern "C"
 {

Modified: gnunet/src/include/gnunet_tun_lib.h
===================================================================
--- gnunet/src/include/gnunet_tun_lib.h 2013-09-27 20:01:46 UTC (rev 29669)
+++ gnunet/src/include/gnunet_tun_lib.h 2013-09-28 09:58:07 UTC (rev 29670)
@@ -601,7 +601,7 @@
   /**
    * 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 @@
   /**
    * 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)

Modified: gnunet/src/namestore/namestore_api_common.c
===================================================================
--- gnunet/src/namestore/namestore_api_common.c 2013-09-27 20:01:46 UTC (rev 
29669)
+++ gnunet/src/namestore/namestore_api_common.c 2013-09-28 09:58:07 UTC (rev 
29670)
@@ -1069,13 +1069,13 @@
  * @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;  
 }