[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22375 - in gnunet/src: gns include
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r22375 - in gnunet/src: gns include |
|
Date: |
Fri, 29 Jun 2012 11:45:43 +0200 |
Author: schanzen
Date: 2012-06-29 11:45:43 +0200 (Fri, 29 Jun 2012)
New Revision: 22375
Modified:
gnunet/src/gns/gnunet-gns.c
gnunet/src/gns/gnunet-service-gns.c
gnunet/src/gns/gnunet-service-gns_interceptor.c
gnunet/src/gns/gnunet-service-gns_resolver.c
gnunet/src/gns/test_gns_cname_lookup.c
gnunet/src/gns/test_gns_dht_delegated_lookup.c
gnunet/src/gns/test_gns_dht_threepeer.c
gnunet/src/gns/test_gns_max_queries.c
gnunet/src/gns/test_gns_ns_lookup.c
gnunet/src/gns/test_gns_pseu_shorten.c
gnunet/src/gns/test_gns_revocation.c
gnunet/src/gns/test_gns_simple_delegated_lookup.c
gnunet/src/gns/test_gns_simple_lookup.c
gnunet/src/gns/test_gns_simple_srv_lookup.c
gnunet/src/gns/test_gns_simple_zkey_lookup.c
gnunet/src/include/gnunet_gns_service.h
Log:
-fix inconsisten record naming
Modified: gnunet/src/gns/gnunet-gns.c
===================================================================
--- gnunet/src/gns/gnunet-gns.c 2012-06-29 09:34:33 UTC (rev 22374)
+++ gnunet/src/gns/gnunet-gns.c 2012-06-29 09:45:43 UTC (rev 22375)
@@ -201,7 +201,7 @@
if (lookup_type != NULL)
rtype = GNUNET_NAMESTORE_typename_to_number(lookup_type);
else
- rtype = GNUNET_GNS_RECORD_TYPE_A;
+ rtype = GNUNET_GNS_RECORD_A;
if (NULL == gns)
{
Modified: gnunet/src/gns/gnunet-service-gns.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns.c 2012-06-29 09:34:33 UTC (rev 22374)
+++ gnunet/src/gns/gnunet-service-gns.c 2012-06-29 09:45:43 UTC (rev 22375)
@@ -954,7 +954,7 @@
return;
}
- if ((clh->type == GNUNET_GNS_RECORD_TYPE_A) &&
+ if ((clh->type == GNUNET_GNS_RECORD_A) &&
(GNUNET_OK != v4_enabled))
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
Modified: gnunet/src/gns/gnunet-service-gns_interceptor.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_interceptor.c 2012-06-29 09:34:33 UTC
(rev 22374)
+++ gnunet/src/gns/gnunet-service-gns_interceptor.c 2012-06-29 09:45:43 UTC
(rev 22375)
@@ -127,12 +127,12 @@
answer_records[i].type = rd[i].record_type;
switch(rd[i].record_type)
{
- case GNUNET_GNS_RECORD_TYPE_NS:
- case GNUNET_GNS_RECORD_TYPE_CNAME:
- case GNUNET_GNS_RECORD_TYPE_PTR:
+ case GNUNET_GNS_RECORD_NS:
+ case GNUNET_GNS_RECORD_CNAME:
+ case GNUNET_GNS_RECORD_PTR:
answer_records[i].data.hostname = (char*)rd[i].data;
break;
- case GNUNET_GNS_RECORD_TYPE_SOA:
+ case GNUNET_GNS_RECORD_SOA:
answer_records[i].data.soa =
(struct GNUNET_DNSPARSER_SoaRecord *)rd[i].data;
break;
@@ -154,12 +154,12 @@
additional_records[i].type = rd[i].record_type;
switch(rd[i].record_type)
{
- case GNUNET_GNS_RECORD_TYPE_NS:
- case GNUNET_GNS_RECORD_TYPE_CNAME:
- case GNUNET_GNS_RECORD_TYPE_PTR:
+ case GNUNET_GNS_RECORD_NS:
+ case GNUNET_GNS_RECORD_CNAME:
+ case GNUNET_GNS_RECORD_PTR:
additional_records[i].data.hostname = (char*)rd[i].data;
break;
- case GNUNET_GNS_RECORD_TYPE_SOA:
+ case GNUNET_GNS_RECORD_SOA:
additional_records[i].data.soa =
(struct GNUNET_DNSPARSER_SoaRecord *)rd[i].data;
break;
Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c 2012-06-29 09:34:33 UTC
(rev 22374)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c 2012-06-29 09:45:43 UTC
(rev 22375)
@@ -1497,7 +1497,7 @@
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_REC-%d: Answer is IPv4!\n",
rh->id);
- if (rlh->record_type != GNUNET_GNS_RECORD_TYPE_A)
+ if (rlh->record_type != GNUNET_GNS_RECORD_A)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_REC-%d: Requested record is not IPv4!\n",
@@ -1505,7 +1505,7 @@
rh->proc (rh->proc_cls, rh, 0, NULL);
return;
}
- rd.record_type = GNUNET_GNS_RECORD_TYPE_A;
+ rd.record_type = GNUNET_GNS_RECORD_A;
rd.expiration_time = UINT64_MAX; /* FIXME: should probably pick something
shorter... */
rd.data = address;
rd.data_size = sizeof (struct in_addr);
@@ -1609,7 +1609,7 @@
if (addrlen == sizeof (struct sockaddr_in))
{
sai = (struct sockaddr_in*) addr;
- rd.record_type = GNUNET_GNS_RECORD_TYPE_A;
+ rd.record_type = GNUNET_GNS_RECORD_A;
rd.data_size = sizeof (struct in_addr);
rd.data = &sai->sin_addr;
}
@@ -1639,7 +1639,7 @@
struct RecordLookupHandle *rlh = rh->proc_cls;
int af;
- if ((rlh->record_type != GNUNET_GNS_RECORD_TYPE_A) &&
+ if ((rlh->record_type != GNUNET_GNS_RECORD_A) &&
(rlh->record_type != GNUNET_GNS_RECORD_AAAA))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1648,7 +1648,7 @@
return;
}
- if (rlh->record_type == GNUNET_GNS_RECORD_TYPE_A)
+ if (rlh->record_type == GNUNET_GNS_RECORD_A)
af = AF_INET;
else
af = AF_INET6;
@@ -1727,7 +1727,7 @@
packet->answers[i].type,
rlh->record_type);
/* http://tools.ietf.org/html/rfc1034#section-3.6.2 */
- if (packet->answers[i].type == GNUNET_GNS_RECORD_TYPE_CNAME)
+ if (packet->answers[i].type == GNUNET_GNS_RECORD_CNAME)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"CNAME... restarting query with %s\n",
@@ -1784,7 +1784,7 @@
for (i = 0; i < packet->num_authority_records; i++)
{
- if (packet->authority_records[i].type == GNUNET_GNS_RECORD_TYPE_NS)
+ if (packet->authority_records[i].type == GNUNET_GNS_RECORD_NS)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Found NS delegation!\n");
@@ -1799,7 +1799,7 @@
if (found_delegation == GNUNET_NO)
break;
- if ((packet->additional_records[i].type == GNUNET_GNS_RECORD_TYPE_A) &&
+ if ((packet->additional_records[i].type == GNUNET_GNS_RECORD_A) &&
(0 == strcmp (packet->additional_records[i].name, delegation_name)))
{
GNUNET_assert (sizeof (struct in_addr) ==
@@ -1895,7 +1895,7 @@
for (i = 0; i < rd_count; i++)
{
/* Synthesize dns name */
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_NS)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_NS)
{
strcpy (rh->dns_zone, (char*)rd[i].data);
if (0 == strcmp (rh->name, ""))
@@ -1904,7 +1904,7 @@
sprintf (rh->dns_name, "%s.%s", rh->name, (char*)rd[i].data);
}
/* The glue */
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_A)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
dnsip = *((struct in_addr*)rd[i].data);
}
@@ -2039,7 +2039,7 @@
return;
}
- if (rlh->record_type == GNUNET_GNS_RECORD_TYPE_A)
+ if (rlh->record_type == GNUNET_GNS_RECORD_A)
af = AF_INET;
else
af = AF_INET6;
@@ -2405,8 +2405,8 @@
rh->id, rd[i].flags);
if ((rd[i].record_type == GNUNET_GNS_RECORD_VPN) ||
- (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_NS) ||
- (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_CNAME))
+ (rd[i].record_type == GNUNET_GNS_RECORD_NS) ||
+ (rd[i].record_type == GNUNET_GNS_RECORD_CNAME))
{
/**
* This is a VPN,NS,CNAME entry. Let namestore handle this after
caching
@@ -2622,12 +2622,12 @@
for (i = 0; i < rd_count; i++)
{
- if (rd[i].record_type != GNUNET_GNS_RECORD_TYPE_NS &&
- rd[i].record_type != GNUNET_GNS_RECORD_TYPE_PTR &&
- rd[i].record_type != GNUNET_GNS_RECORD_TYPE_CNAME &&
+ if (rd[i].record_type != GNUNET_GNS_RECORD_NS &&
+ rd[i].record_type != GNUNET_GNS_RECORD_PTR &&
+ rd[i].record_type != GNUNET_GNS_RECORD_CNAME &&
rd[i].record_type != GNUNET_GNS_RECORD_MX &&
- rd[i].record_type != GNUNET_GNS_RECORD_TYPE_SOA &&
- rd[i].record_type != GNUNET_GNS_RECORD_TYPE_SRV)
+ rd[i].record_type != GNUNET_GNS_RECORD_SOA &&
+ rd[i].record_type != GNUNET_GNS_RECORD_SRV)
{
p_rd[i].data = rd[i].data;
continue;
@@ -2659,7 +2659,7 @@
p_rd[i].data = new_mx_data;
p_rd[i].data_size = offset;
}
- else if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_SRV)
+ else if (rd[i].record_type == GNUNET_GNS_RECORD_SRV)
{
/*
* Prio, weight and port
@@ -2674,7 +2674,7 @@
p_rd[i].data = new_srv_data;
p_rd[i].data_size = sizeof (struct srv_data) + strlen
((char*)&new_srv[1]) + 1;
}
- else if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_SOA)
+ else if (rd[i].record_type == GNUNET_GNS_RECORD_SOA)
{
/* expand mname and rname */
old_soa = (struct soa_data*)rd[i].data;
@@ -3044,7 +3044,7 @@
rh->id);
if (rh->status & RSL_CNAME_FOUND)
{
- if (rlh->record_type == GNUNET_GNS_RECORD_TYPE_CNAME)
+ if (rlh->record_type == GNUNET_GNS_RECORD_CNAME)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_NS-%llu: Resolved queried CNAME in
NS.\n",
@@ -3108,7 +3108,7 @@
}
else if (rh->status & RSL_DELEGATE_NS)
{
- if (rlh->record_type == GNUNET_GNS_RECORD_TYPE_NS)
+ if (rlh->record_type == GNUNET_GNS_RECORD_NS)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_NS-%llu: Resolved queried NSRR in
NS.\n",
@@ -3156,7 +3156,7 @@
if (rh->status & RSL_DELEGATE_NS)
{
- if (rlh->record_type == GNUNET_GNS_RECORD_TYPE_NS)
+ if (rlh->record_type == GNUNET_GNS_RECORD_NS)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_NS-%llu: Resolved queried NSRR in NS.\n",
@@ -3335,7 +3335,7 @@
* A CNAME. Like regular DNS this means the is no other record for this
* name.
*/
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_CNAME)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_CNAME)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_NS-%llu: CNAME found.\n",
@@ -3363,7 +3363,7 @@
* Redirect via NS
* FIXME make optional
*/
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_NS)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_NS)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_NS-%llu: NS found.\n",
Modified: gnunet/src/gns/test_gns_cname_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_cname_lookup.c 2012-06-29 09:34:33 UTC (rev
22374)
+++ gnunet/src/gns/test_gns_cname_lookup.c 2012-06-29 09:45:43 UTC (rev
22375)
@@ -115,7 +115,7 @@
for (i=0; i<rd_count; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_CNAME)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_CNAME)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "CNAME: %s\n", rd[i].data);
if (0 == strcmp(rd[i].data, TEST_RECORD_CNAME_SERVER))
@@ -157,7 +157,7 @@
for (i=0; i<rd_count; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_A)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
memcpy(&a, rd[i].data, sizeof(a));
addr = inet_ntoa(a);
@@ -176,7 +176,7 @@
}
}
- GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_PLUS,
GNUNET_GNS_RECORD_TYPE_CNAME,
+ GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_PLUS, GNUNET_GNS_RECORD_CNAME,
GNUNET_YES,
NULL,
&on_lookup_result_cname, TEST_DOMAIN_PLUS);
@@ -203,7 +203,7 @@
for (i=0; i<rd_count; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_A)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
memcpy(&a, rd[i].data, sizeof(a));
addr = inet_ntoa(a);
@@ -222,7 +222,7 @@
}
}
- GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN_DNS, GNUNET_GNS_RECORD_TYPE_A,
+ GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN_DNS, GNUNET_GNS_RECORD_A,
GNUNET_YES,
NULL,
&on_lookup_result_dns, TEST_DOMAIN_DNS);
@@ -249,7 +249,7 @@
for (i=0; i<rd_count; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_A)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
memcpy(&a, rd[i].data, sizeof(a));
addr = inet_ntoa(a);
@@ -268,7 +268,7 @@
}
}
- GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN_ZKEY, GNUNET_GNS_RECORD_TYPE_A,
+ GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN_ZKEY, GNUNET_GNS_RECORD_A,
GNUNET_YES,
NULL,
&on_lookup_result_zkey, TEST_DOMAIN_ZKEY);
@@ -300,7 +300,7 @@
ok = 2;
}
- GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN_PLUS, GNUNET_GNS_RECORD_TYPE_A,
+ GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN_PLUS, GNUNET_GNS_RECORD_A,
GNUNET_YES,
NULL,
&on_lookup_result_plus, TEST_DOMAIN_PLUS);
@@ -393,7 +393,7 @@
rd.data_size = strlen (TEST_RECORD_CNAME_PLUS);
rd.data = TEST_RECORD_CNAME_PLUS;
- rd.record_type = GNUNET_GNS_RECORD_TYPE_CNAME;
+ rd.record_type = GNUNET_GNS_RECORD_CNAME;
GNUNET_NAMESTORE_record_create (namestore_handle,
alice_key,
@@ -404,7 +404,7 @@
rd.data_size = strlen (TEST_RECORD_CNAME_ZKEY);
rd.data = TEST_RECORD_CNAME_ZKEY;
- rd.record_type = GNUNET_GNS_RECORD_TYPE_CNAME;
+ rd.record_type = GNUNET_GNS_RECORD_CNAME;
GNUNET_NAMESTORE_record_create (namestore_handle,
alice_key,
@@ -415,7 +415,7 @@
rd.data_size = strlen (TEST_RECORD_CNAME_DNS);
rd.data = TEST_RECORD_CNAME_DNS;
- rd.record_type = GNUNET_GNS_RECORD_TYPE_CNAME;
+ rd.record_type = GNUNET_GNS_RECORD_CNAME;
GNUNET_NAMESTORE_record_create (namestore_handle,
alice_key,
Modified: gnunet/src/gns/test_gns_dht_delegated_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_dht_delegated_lookup.c 2012-06-29 09:34:33 UTC
(rev 22374)
+++ gnunet/src/gns/test_gns_dht_delegated_lookup.c 2012-06-29 09:45:43 UTC
(rev 22375)
@@ -122,7 +122,7 @@
for (i=0; i<rd_count; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_A)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
memcpy(&a, rd[i].data, sizeof(a));
addr = inet_ntoa(a);
@@ -163,7 +163,7 @@
"Failed to connect to GNS!\n");
}
- GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_TYPE_A,
+ GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_A,
GNUNET_NO,
NULL,
&on_lookup_result, TEST_DOMAIN);
Modified: gnunet/src/gns/test_gns_dht_threepeer.c
===================================================================
--- gnunet/src/gns/test_gns_dht_threepeer.c 2012-06-29 09:34:33 UTC (rev
22374)
+++ gnunet/src/gns/test_gns_dht_threepeer.c 2012-06-29 09:45:43 UTC (rev
22375)
@@ -201,7 +201,7 @@
gh = GNUNET_GNS_connect(alice_cfg);
- GNUNET_GNS_lookup(gh, TEST_DOMAIN, GNUNET_GNS_RECORD_TYPE_A,
+ GNUNET_GNS_lookup(gh, TEST_DOMAIN, GNUNET_GNS_RECORD_A,
GNUNET_NO,
NULL,
&on_lookup_result, TEST_DOMAIN);
@@ -330,7 +330,7 @@
GNUNET_assert(1 == inet_pton (AF_INET, TEST_IP, web));
rd.data_size = sizeof(struct in_addr);
rd.data = web;
- rd.record_type = GNUNET_GNS_RECORD_TYPE_A;
+ rd.record_type = GNUNET_GNS_RECORD_A;
rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
GNUNET_NAMESTORE_record_create (ns, key, "www", &rd, NULL, NULL);
Modified: gnunet/src/gns/test_gns_max_queries.c
===================================================================
--- gnunet/src/gns/test_gns_max_queries.c 2012-06-29 09:34:33 UTC (rev
22374)
+++ gnunet/src/gns/test_gns_max_queries.c 2012-06-29 09:45:43 UTC (rev
22375)
@@ -125,7 +125,7 @@
for (i=0; i<rd_count; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_A)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
memcpy(&a, rd[i].data, sizeof(a));
addr = inet_ntoa(a);
@@ -178,13 +178,13 @@
GNUNET_snprintf(lookup_name,
MAX_DNS_NAME_LENGTH,
"www.doesnotexist-%d.bob.gnunet", i);
- GNUNET_GNS_lookup(gns_handle, lookup_name, GNUNET_GNS_RECORD_TYPE_A,
+ GNUNET_GNS_lookup(gns_handle, lookup_name, GNUNET_GNS_RECORD_A,
GNUNET_NO,
NULL,
&on_lookup_result_dummy, NULL);
}
- GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_TYPE_A,
+ GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_A,
GNUNET_NO,
NULL,
&on_lookup_result, TEST_DOMAIN);
Modified: gnunet/src/gns/test_gns_ns_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_ns_lookup.c 2012-06-29 09:34:33 UTC (rev 22374)
+++ gnunet/src/gns/test_gns_ns_lookup.c 2012-06-29 09:45:43 UTC (rev 22375)
@@ -110,7 +110,7 @@
for (i=0; i<rd_count; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_A)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
memcpy(&a, rd[i].data, sizeof(a));
addr = inet_ntoa(a);
@@ -154,7 +154,7 @@
for (i=0; i<rd_count; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_A)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
memcpy(&a, rd[i].data, sizeof(a));
addr = inet_ntoa(a);
@@ -173,7 +173,7 @@
}
}
- GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN_ALT2, GNUNET_GNS_RECORD_TYPE_A,
+ GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN_ALT2, GNUNET_GNS_RECORD_A,
GNUNET_YES,
NULL,
&on_lookup_result_alt2, TEST_DOMAIN_ALT2);
@@ -200,7 +200,7 @@
for (i=0; i<rd_count; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_A)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
memcpy(&a, rd[i].data, sizeof(a));
addr = inet_ntoa(a);
@@ -219,7 +219,7 @@
}
}
- GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN_ALT, GNUNET_GNS_RECORD_TYPE_A,
+ GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN_ALT, GNUNET_GNS_RECORD_A,
GNUNET_YES,
NULL,
&on_lookup_result_alt, TEST_DOMAIN_ALT);
@@ -241,7 +241,7 @@
ok = 2;
}
- GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_TYPE_A,
+ GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_A,
GNUNET_YES,
NULL,
&on_lookup_result, TEST_DOMAIN);
@@ -386,7 +386,7 @@
rd.data_size = strlen (TEST_RECORD_NS);
rd.data = TEST_RECORD_NS;
- rd.record_type = GNUNET_GNS_RECORD_TYPE_NS;
+ rd.record_type = GNUNET_GNS_RECORD_NS;
GNUNET_NAMESTORE_record_create (namestore_handle,
alice_key,
Modified: gnunet/src/gns/test_gns_pseu_shorten.c
===================================================================
--- gnunet/src/gns/test_gns_pseu_shorten.c 2012-06-29 09:34:33 UTC (rev
22374)
+++ gnunet/src/gns/test_gns_pseu_shorten.c 2012-06-29 09:45:43 UTC (rev
22375)
@@ -199,7 +199,7 @@
for (i=0; i<rd_count; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_A)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
memcpy(&a, rd[i].data, sizeof(a));
addr = inet_ntoa(a);
@@ -247,7 +247,7 @@
GNUNET_GNS_lookup_zone (gns_handle, TEST_DOMAIN,
&our_zone,
- GNUNET_GNS_RECORD_TYPE_A,
+ GNUNET_GNS_RECORD_A,
GNUNET_NO,
short_key,
&on_lookup_result, TEST_DOMAIN);
Modified: gnunet/src/gns/test_gns_revocation.c
===================================================================
--- gnunet/src/gns/test_gns_revocation.c 2012-06-29 09:34:33 UTC (rev
22374)
+++ gnunet/src/gns/test_gns_revocation.c 2012-06-29 09:45:43 UTC (rev
22375)
@@ -109,7 +109,7 @@
for (i=0; i<rd_count; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_A)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
memcpy(&a, rd[i].data, sizeof(a));
addr = inet_ntoa(a);
@@ -149,7 +149,7 @@
"Failed to connect to GNS!\n");
}
- GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_TYPE_A,
+ GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_A,
GNUNET_NO,
NULL,
&on_lookup_result, TEST_DOMAIN);
Modified: gnunet/src/gns/test_gns_simple_delegated_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_delegated_lookup.c 2012-06-29 09:34:33 UTC
(rev 22374)
+++ gnunet/src/gns/test_gns_simple_delegated_lookup.c 2012-06-29 09:45:43 UTC
(rev 22375)
@@ -123,7 +123,7 @@
for (i=0; i<rd_count; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_A)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
memcpy(&a, rd[i].data, sizeof(a));
addr = inet_ntoa(a);
@@ -163,7 +163,7 @@
"Failed to connect to GNS!\n");
}
- GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_TYPE_A,
+ GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_A,
GNUNET_NO,
NULL,
&on_lookup_result, TEST_DOMAIN);
Modified: gnunet/src/gns/test_gns_simple_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_lookup.c 2012-06-29 09:34:33 UTC (rev
22374)
+++ gnunet/src/gns/test_gns_simple_lookup.c 2012-06-29 09:45:43 UTC (rev
22375)
@@ -105,7 +105,7 @@
for (i=0; i<rd_count; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_A)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
memcpy(&a, rd[i].data, sizeof(a));
addr = inet_ntoa(a);
@@ -148,7 +148,7 @@
ok = 2;
}
- GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_TYPE_A,
+ GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_A,
GNUNET_YES,
NULL,
&on_lookup_result, TEST_DOMAIN);
Modified: gnunet/src/gns/test_gns_simple_srv_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_srv_lookup.c 2012-06-29 09:34:33 UTC (rev
22374)
+++ gnunet/src/gns/test_gns_simple_srv_lookup.c 2012-06-29 09:45:43 UTC (rev
22375)
@@ -113,7 +113,7 @@
for (i=0; i<rd_count; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_SRV)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_SRV)
{
srv_data = (uint16_t*)rd[i].data;
srv = (char*)&srv_data[3];
@@ -153,7 +153,7 @@
"Failed to connect to GNS!\n");
}
- GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_TYPE_SRV,
+ GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_SRV,
GNUNET_NO,
NULL,
&on_lookup_result, TEST_DOMAIN);
@@ -279,7 +279,7 @@
srv_data->weight = srv_weight;
strcpy((char*)&srv_data[1], TEST_SRV_NAME);
rd.data = srv_data;
- rd.record_type = GNUNET_GNS_RECORD_TYPE_SRV;
+ rd.record_type = GNUNET_GNS_RECORD_SRV;
sig = GNUNET_NAMESTORE_create_signature(bob_key,
GNUNET_TIME_UNIT_FOREVER_ABS,
TEST_RECORD_NAME_SRV,
Modified: gnunet/src/gns/test_gns_simple_zkey_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_zkey_lookup.c 2012-06-29 09:34:33 UTC
(rev 22374)
+++ gnunet/src/gns/test_gns_simple_zkey_lookup.c 2012-06-29 09:45:43 UTC
(rev 22375)
@@ -111,7 +111,7 @@
for (i=0; i<rd_count; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_A)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
memcpy(&a, rd[i].data, sizeof(a));
addr = inet_ntoa(a);
@@ -167,7 +167,7 @@
pos++;
strcpy(pos, GNUNET_GNS_TLD_ZKEY);
- GNUNET_GNS_lookup(gns_handle, name, GNUNET_GNS_RECORD_TYPE_A,
+ GNUNET_GNS_lookup(gns_handle, name, GNUNET_GNS_RECORD_A,
GNUNET_NO,
NULL,
&on_lookup_result, NULL);
Modified: gnunet/src/include/gnunet_gns_service.h
===================================================================
--- gnunet/src/include/gnunet_gns_service.h 2012-06-29 09:34:33 UTC (rev
22374)
+++ gnunet/src/include/gnunet_gns_service.h 2012-06-29 09:45:43 UTC (rev
22375)
@@ -67,12 +67,12 @@
enum GNUNET_GNS_RecordType
{
/* Standard DNS */
- GNUNET_GNS_RECORD_TYPE_A = GNUNET_DNSPARSER_TYPE_A,
- GNUNET_GNS_RECORD_TYPE_NS = GNUNET_DNSPARSER_TYPE_NS,
- GNUNET_GNS_RECORD_TYPE_CNAME = GNUNET_DNSPARSER_TYPE_CNAME,
- GNUNET_GNS_RECORD_TYPE_SOA = GNUNET_DNSPARSER_TYPE_SOA,
- GNUNET_GNS_RECORD_TYPE_SRV = GNUNET_DNSPARSER_TYPE_SRV,
- GNUNET_GNS_RECORD_TYPE_PTR = GNUNET_DNSPARSER_TYPE_PTR,
+ GNUNET_GNS_RECORD_A = GNUNET_DNSPARSER_TYPE_A,
+ GNUNET_GNS_RECORD_NS = GNUNET_DNSPARSER_TYPE_NS,
+ GNUNET_GNS_RECORD_CNAME = GNUNET_DNSPARSER_TYPE_CNAME,
+ GNUNET_GNS_RECORD_SOA = GNUNET_DNSPARSER_TYPE_SOA,
+ GNUNET_GNS_RECORD_SRV = GNUNET_DNSPARSER_TYPE_SRV,
+ GNUNET_GNS_RECORD_PTR = GNUNET_DNSPARSER_TYPE_PTR,
GNUNET_GNS_RECORD_MX = GNUNET_DNSPARSER_TYPE_MX,
GNUNET_GNS_RECORD_TXT = GNUNET_DNSPARSER_TYPE_TXT,
GNUNET_GNS_RECORD_AAAA = GNUNET_DNSPARSER_TYPE_AAAA,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22375 - in gnunet/src: gns include,
gnunet <=