From 674e485bc34defc68cf1a8b4909cec9a4c5040d9 Mon Sep 17 00:00:00 2001 From: Martin Schanzenbach Date: Fri, 29 Jun 2012 09:45:43 +0000 Subject: [PATCH] -fix inconsisten record naming --- src/gns/gnunet-gns.c | 2 +- src/gns/gnunet-service-gns.c | 2 +- src/gns/gnunet-service-gns_interceptor.c | 16 +++---- src/gns/gnunet-service-gns_resolver.c | 50 +++++++++++----------- src/gns/test_gns_cname_lookup.c | 22 +++++----- src/gns/test_gns_dht_delegated_lookup.c | 4 +- src/gns/test_gns_dht_threepeer.c | 4 +- src/gns/test_gns_max_queries.c | 6 +-- src/gns/test_gns_ns_lookup.c | 14 +++--- src/gns/test_gns_pseu_shorten.c | 4 +- src/gns/test_gns_revocation.c | 4 +- src/gns/test_gns_simple_delegated_lookup.c | 4 +- src/gns/test_gns_simple_lookup.c | 4 +- src/gns/test_gns_simple_srv_lookup.c | 6 +-- src/gns/test_gns_simple_zkey_lookup.c | 4 +- src/include/gnunet_gns_service.h | 12 +++--- 16 files changed, 79 insertions(+), 79 deletions(-) diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c index a1614e7dd..069dc2121 100644 --- a/src/gns/gnunet-gns.c +++ b/src/gns/gnunet-gns.c @@ -201,7 +201,7 @@ run (void *cls, char *const *args, const char *cfgfile, 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) { diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c index 1ebfd5e93..aac54dafa 100644 --- a/src/gns/gnunet-service-gns.c +++ b/src/gns/gnunet-service-gns.c @@ -954,7 +954,7 @@ handle_lookup(void *cls, 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, diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c index 5956e5223..34f1f2eb3 100644 --- a/src/gns/gnunet-service-gns_interceptor.c +++ b/src/gns/gnunet-service-gns_interceptor.c @@ -127,12 +127,12 @@ reply_to_dns(void* cls, uint32_t rd_count, 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 @@ reply_to_dns(void* cls, uint32_t rd_count, 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; diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c index bc6f322ae..5b54cf576 100644 --- a/src/gns/gnunet-service-gns_resolver.c +++ b/src/gns/gnunet-service-gns_resolver.c @@ -1497,7 +1497,7 @@ process_record_result_vpn (void* cls, int af, const void *address) 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 @@ process_record_result_vpn (void* cls, int af, const void *address) 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 @@ handle_dns_resolver (void *cls, 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 @@ resolve_dns_name (struct ResolverHandle *rh) 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 @@ resolve_dns_name (struct ResolverHandle *rh) 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 @@ read_dns_response (void *cls, 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 @@ read_dns_response (void *cls, 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 @@ read_dns_response (void *cls, 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 @@ resolve_record_dns (struct ResolverHandle *rh, 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 @@ resolve_record_dns (struct ResolverHandle *rh, 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 @@ resolve_record_vpn (struct ResolverHandle *rh, 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 @@ process_delegation_result_dht(void* cls, 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 @@ finish_lookup (struct ResolverHandle *rh, 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 @@ finish_lookup (struct ResolverHandle *rh, 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 @@ finish_lookup (struct ResolverHandle *rh, 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 @@ handle_delegation_ns (void* cls, struct ResolverHandle *rh, 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 @@ handle_delegation_ns (void* cls, struct ResolverHandle *rh, } 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 @@ handle_delegation_ns (void* cls, struct ResolverHandle *rh, 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 @@ process_delegation_result_ns (void* cls, * 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 @@ process_delegation_result_ns (void* cls, * 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", diff --git a/src/gns/test_gns_cname_lookup.c b/src/gns/test_gns_cname_lookup.c index f1045fda7..9cc87d5c6 100644 --- a/src/gns/test_gns_cname_lookup.c +++ b/src/gns/test_gns_cname_lookup.c @@ -115,7 +115,7 @@ on_lookup_result_cname (void *cls, uint32_t rd_count, for (i=0; iweight = 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, diff --git a/src/gns/test_gns_simple_zkey_lookup.c b/src/gns/test_gns_simple_zkey_lookup.c index 19dbc6a9b..136b3b7db 100644 --- a/src/gns/test_gns_simple_zkey_lookup.c +++ b/src/gns/test_gns_simple_zkey_lookup.c @@ -111,7 +111,7 @@ on_lookup_result(void *cls, uint32_t rd_count, for (i=0; i