[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30212 - gnunet/src/conversation gnunet/src/gns gnunet/src/
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r30212 - gnunet/src/conversation gnunet/src/gns gnunet/src/gnsrecord gnunet/src/namestore gnunet/src/pt gnunet-gtk/src/fs gnunet-gtk/src/namestore |
|
Date: |
Wed, 16 Oct 2013 13:39:55 +0200 |
Author: grothoff
Date: 2013-10-16 13:39:55 +0200 (Wed, 16 Oct 2013)
New Revision: 30212
Modified:
gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-search.c
gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
gnunet/src/conversation/conversation_api.c
gnunet/src/conversation/gnunet-conversation.c
gnunet/src/gns/gnunet-gns-proxy.c
gnunet/src/gns/gnunet-gns.c
gnunet/src/gns/gnunet-service-gns_resolver.c
gnunet/src/gns/gnunet-service-gns_shorten.c
gnunet/src/gns/test_gns_proxy.c
gnunet/src/gns/test_gns_pseu_shorten.c
gnunet/src/gns/test_gns_revocation.c
gnunet/src/gns/test_gns_simple_shorten.c
gnunet/src/gns/test_gns_simple_srv_lookup.c
gnunet/src/gns/test_gns_simple_zkey_lookup.c
gnunet/src/gnsrecord/gnsrecord.c
gnunet/src/namestore/gnunet-namestore-fcfsd.c
gnunet/src/namestore/gnunet-namestore.c
gnunet/src/namestore/plugin_namestore_postgres.c
gnunet/src/namestore/plugin_namestore_sqlite.c
gnunet/src/namestore/test_namestore_api_zone_to_name.c
gnunet/src/pt/test_gns_vpn.c
Log:
-rename fest for symbols moved from GNUNET_NAMESTORE_ to new GNUNET_GNSRECORD_
library
Modified: gnunet/src/conversation/conversation_api.c
===================================================================
--- gnunet/src/conversation/conversation_api.c 2013-10-16 11:34:10 UTC (rev
30211)
+++ gnunet/src/conversation/conversation_api.c 2013-10-16 11:39:55 UTC (rev
30212)
@@ -457,7 +457,7 @@
rd->data = &phone->my_record;
rd->expiration_time = 0;
rd->data_size = sizeof (struct GNUNET_CONVERSATION_PhoneRecord);
- rd->record_type = GNUNET_NAMESTORE_TYPE_PHONE;
+ rd->record_type = GNUNET_GNSRECORD_TYPE_PHONE;
rd->flags = GNUNET_NAMESTORE_RF_NONE;
}
@@ -914,7 +914,7 @@
call->gns_lookup = NULL;
for (i=0;i<rd_count;i++)
{
- if (GNUNET_NAMESTORE_TYPE_PHONE == rd[i].record_type)
+ if (GNUNET_GNSRECORD_TYPE_PHONE == rd[i].record_type)
{
if (rd[i].data_size != sizeof (struct GNUNET_CONVERSATION_PhoneRecord))
{
@@ -1017,7 +1017,7 @@
call->gns_lookup = GNUNET_GNS_lookup (call->gns,
call->callee,
&my_zone,
- GNUNET_NAMESTORE_TYPE_PHONE,
+ GNUNET_GNSRECORD_TYPE_PHONE,
GNUNET_NO,
NULL /* FIXME: add shortening support
*/,
&handle_gns_response, call);
Modified: gnunet/src/conversation/gnunet-conversation.c
===================================================================
--- gnunet/src/conversation/gnunet-conversation.c 2013-10-16 11:34:10 UTC
(rev 30211)
+++ gnunet/src/conversation/gnunet-conversation.c 2013-10-16 11:39:55 UTC
(rev 30212)
@@ -244,7 +244,7 @@
GNUNET_CONVERSATION_phone_get_record (phone,
&rd);
GNUNET_free_non_null (address);
- address = GNUNET_NAMESTORE_value_to_string (rd.record_type,
+ address = GNUNET_GNSRECORD_value_to_string (rd.record_type,
rd.data,
rd.data_size);
if (verbose)
Modified: gnunet/src/gns/gnunet-gns-proxy.c
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy.c 2013-10-16 11:34:10 UTC (rev 30211)
+++ gnunet/src/gns/gnunet-gns-proxy.c 2013-10-16 11:39:55 UTC (rev 30212)
@@ -2275,10 +2275,10 @@
#endif
}
break;
- case GNUNET_NAMESTORE_TYPE_VPN:
+ case GNUNET_GNSRECORD_TYPE_VPN:
GNUNET_break (0); /* should have been translated within GNS */
break;
- case GNUNET_NAMESTORE_TYPE_LEHO:
+ case GNUNET_GNSRECORD_TYPE_LEHO:
GNUNET_free_non_null (s5r->leho);
s5r->leho = GNUNET_strndup (r->data,
r->data_size);
Modified: gnunet/src/gns/gnunet-gns.c
===================================================================
--- gnunet/src/gns/gnunet-gns.c 2013-10-16 11:34:10 UTC (rev 30211)
+++ gnunet/src/gns/gnunet-gns.c 2013-10-16 11:39:55 UTC (rev 30212)
@@ -157,10 +157,10 @@
for (i=0; i<rd_count; i++)
{
if ( (rd[i].record_type != rtype) &&
- (GNUNET_NAMESTORE_TYPE_ANY != rtype) )
+ (GNUNET_GNSRECORD_TYPE_ANY != rtype) )
continue;
- typename = GNUNET_NAMESTORE_number_to_typename (rd[i].record_type);
- string_val = GNUNET_NAMESTORE_value_to_string (rd[i].record_type,
+ typename = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type);
+ string_val = GNUNET_GNSRECORD_value_to_string (rd[i].record_type,
rd[i].data,
rd[i].data_size);
if (NULL == string_val)
@@ -196,7 +196,7 @@
const struct GNUNET_CRYPTO_EcdsaPrivateKey *shorten_key)
{
if (NULL != lookup_type)
- rtype = GNUNET_NAMESTORE_typename_to_number (lookup_type);
+ rtype = GNUNET_GNSRECORD_typename_to_number (lookup_type);
else
rtype = GNUNET_DNSPARSER_TYPE_A;
Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c 2013-10-16 11:34:10 UTC
(rev 30211)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c 2013-10-16 11:39:55 UTC
(rev 30212)
@@ -1100,7 +1100,7 @@
rd));
for (i=0;i<vpn_ctx->rd_count;i++)
{
- if (GNUNET_NAMESTORE_TYPE_VPN == rd[i].record_type)
+ if (GNUNET_GNSRECORD_TYPE_VPN == rd[i].record_type)
{
switch (af)
{
@@ -1204,7 +1204,7 @@
{
switch (rd[i].record_type)
{
- case GNUNET_NAMESTORE_TYPE_VPN:
+ case GNUNET_GNSRECORD_TYPE_VPN:
{
af = (GNUNET_DNSPARSER_TYPE_A == rh->record_type) ? AF_INET :
AF_INET6;
if (sizeof (struct GNUNET_TUN_GnsVpnRecord) <
@@ -1247,7 +1247,7 @@
rh);
return;
}
- case GNUNET_NAMESTORE_TYPE_GNS2DNS:
+ case GNUNET_GNSRECORD_TYPE_GNS2DNS:
{
/* delegation to DNS */
goto do_recurse;
@@ -1418,7 +1418,7 @@
GNUNET_DNSPARSER_free_srv (srv);
}
break;
- case GNUNET_NAMESTORE_TYPE_PKEY:
+ case GNUNET_GNSRECORD_TYPE_PKEY:
/* tigger shortening */
if (NULL != rh->shorten_key)
{
@@ -1453,7 +1453,7 @@
{
switch (rd[i].record_type)
{
- case GNUNET_NAMESTORE_TYPE_PKEY:
+ case GNUNET_GNSRECORD_TYPE_PKEY:
/* delegation to another zone */
if (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) !=
rd[i].data_size)
@@ -1484,7 +1484,7 @@
rh->task_id = GNUNET_SCHEDULER_add_now (&recursive_resolution,
rh);
return;
- case GNUNET_NAMESTORE_TYPE_GNS2DNS:
+ case GNUNET_GNSRECORD_TYPE_GNS2DNS:
{
char *ns;
/* resolution continues within DNS */
Modified: gnunet/src/gns/gnunet-service-gns_shorten.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_shorten.c 2013-10-16 11:34:10 UTC (rev
30211)
+++ gnunet/src/gns/gnunet-service-gns_shorten.c 2013-10-16 11:39:55 UTC (rev
30212)
@@ -290,7 +290,7 @@
new_pkey.expiration_time = UINT64_MAX;
new_pkey.data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
new_pkey.data = &gph->target_zone;
- new_pkey.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+ new_pkey.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
new_pkey.flags = GNUNET_NAMESTORE_RF_NONE
| GNUNET_NAMESTORE_RF_PRIVATE
| GNUNET_NAMESTORE_RF_PENDING;
@@ -365,7 +365,7 @@
for (i=0; i < rd_count; i++)
{
- if (GNUNET_NAMESTORE_TYPE_PSEU == rd[i].record_type)
+ if (GNUNET_GNSRECORD_TYPE_PSEU == rd[i].record_type)
{
char pseu[rd[i].data_size + 1];
Modified: gnunet/src/gns/test_gns_proxy.c
===================================================================
--- gnunet/src/gns/test_gns_proxy.c 2013-10-16 11:34:10 UTC (rev 30211)
+++ gnunet/src/gns/test_gns_proxy.c 2013-10-16 11:39:55 UTC (rev 30212)
@@ -423,7 +423,7 @@
host_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (zone_keyfile);
rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
- GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_string_to_value
(GNUNET_DNSPARSER_TYPE_A,
+ GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_string_to_value
(GNUNET_DNSPARSER_TYPE_A,
"127.0.0.1",
(void**)&rd.data,
&rd.data_size));
Modified: gnunet/src/gns/test_gns_pseu_shorten.c
===================================================================
--- gnunet/src/gns/test_gns_pseu_shorten.c 2013-10-16 11:34:10 UTC (rev
30211)
+++ gnunet/src/gns/test_gns_pseu_shorten.c 2013-10-16 11:39:55 UTC (rev
30212)
@@ -272,7 +272,7 @@
rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
rd.data_size = strlen(TEST_PSEU_ALICE)+1;
rd.data = TEST_PSEU_ALICE;
- rd.record_type = GNUNET_NAMESTORE_TYPE_PSEU;
+ rd.record_type = GNUNET_GNSRECORD_TYPE_PSEU;
rd.flags = 0;
sig = GNUNET_NAMESTORE_create_signature(alice_key,
@@ -447,7 +447,7 @@
rd.expiration_time = UINT64_MAX;
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &alice_hash;
- rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+ rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
rd.flags = GNUNET_NAMESTORE_RF_NONE;
sig = GNUNET_NAMESTORE_create_signature (bob_key,
@@ -518,7 +518,7 @@
rd.expiration_time = UINT64_MAX;
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &bob_hash;
- rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+ rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
@@ -539,7 +539,7 @@
rd.expiration_time = UINT64_MAX;
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &short_zone;
- rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+ rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
@@ -640,7 +640,7 @@
rd.expiration_time = UINT64_MAX;
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &priv_zone;
- rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+ rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
Modified: gnunet/src/gns/test_gns_revocation.c
===================================================================
--- gnunet/src/gns/test_gns_revocation.c 2013-10-16 11:34:10 UTC (rev
30211)
+++ gnunet/src/gns/test_gns_revocation.c 2013-10-16 11:39:55 UTC (rev
30212)
@@ -226,7 +226,7 @@
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &bob_hash;
- rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+ rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
@@ -254,7 +254,7 @@
NULL,
NULL);
rd.data_size = 0;
- rd.record_type = GNUNET_NAMESTORE_TYPE_REV;
+ rd.record_type = GNUNET_GNSRECORD_TYPE_REV;
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
bob_key,
Modified: gnunet/src/gns/test_gns_simple_shorten.c
===================================================================
--- gnunet/src/gns/test_gns_simple_shorten.c 2013-10-16 11:34:10 UTC (rev
30211)
+++ gnunet/src/gns/test_gns_simple_shorten.c 2013-10-16 11:39:55 UTC (rev
30212)
@@ -256,7 +256,7 @@
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &bob_hash;
- rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+ rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
rd.flags = GNUNET_NAMESTORE_RF_NONE;
/* put bob into our zone */
@@ -308,7 +308,7 @@
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &alice_hash;
- rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+ rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
GNUNET_free(sig);
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
Modified: gnunet/src/gns/test_gns_simple_srv_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_srv_lookup.c 2013-10-16 11:34:10 UTC (rev
30211)
+++ gnunet/src/gns/test_gns_simple_srv_lookup.c 2013-10-16 11:39:55 UTC (rev
30212)
@@ -234,7 +234,7 @@
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &bob_hash;
- rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+ rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
Modified: gnunet/src/gns/test_gns_simple_zkey_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_zkey_lookup.c 2013-10-16 11:34:10 UTC
(rev 30211)
+++ gnunet/src/gns/test_gns_simple_zkey_lookup.c 2013-10-16 11:39:55 UTC
(rev 30212)
@@ -243,7 +243,7 @@
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &bob_hash;
- rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+ rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (namestore_handle,
Modified: gnunet/src/gnsrecord/gnsrecord.c
===================================================================
--- gnunet/src/gnsrecord/gnsrecord.c 2013-10-16 11:34:10 UTC (rev 30211)
+++ gnunet/src/gnsrecord/gnsrecord.c 2013-10-16 11:39:55 UTC (rev 30212)
@@ -47,7 +47,7 @@
* @return NULL on error, otherwise human-readable representation of the value
*/
char *
-GNUNET_NAMESTORE_value_to_string (uint32_t type,
+GNUNET_GNSRECORD_value_to_string (uint32_t type,
const void *data,
size_t data_size)
{
@@ -176,11 +176,11 @@
if (NULL == inet_ntop (AF_INET6, data, tmp, sizeof (tmp)))
return NULL;
return GNUNET_strdup (tmp);
- case GNUNET_NAMESTORE_TYPE_PKEY:
+ case GNUNET_GNSRECORD_TYPE_PKEY:
if (data_size != sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey))
return NULL;
return GNUNET_CRYPTO_ecdsa_public_key_to_string (data);
- case GNUNET_NAMESTORE_TYPE_PHONE:
+ case GNUNET_GNSRECORD_TYPE_PHONE:
{
const struct GNUNET_CONVERSATION_PhoneRecord *pr;
char *ret;
@@ -199,11 +199,11 @@
GNUNET_free (pkey);
return ret;
}
- case GNUNET_NAMESTORE_TYPE_PSEU:
+ case GNUNET_GNSRECORD_TYPE_PSEU:
return GNUNET_strndup (data, data_size);
- case GNUNET_NAMESTORE_TYPE_LEHO:
+ case GNUNET_GNSRECORD_TYPE_LEHO:
return GNUNET_strndup (data, data_size);
- case GNUNET_NAMESTORE_TYPE_VPN:
+ case GNUNET_GNSRECORD_TYPE_VPN:
{
const struct GNUNET_TUN_GnsVpnRecord *vpn;
char* vpn_str;
@@ -223,7 +223,7 @@
}
return vpn_str;
}
- case GNUNET_NAMESTORE_TYPE_GNS2DNS:
+ case GNUNET_GNSRECORD_TYPE_GNS2DNS:
{
char *ns;
size_t off;
@@ -309,7 +309,7 @@
* @return #GNUNET_OK on success
*/
int
-GNUNET_NAMESTORE_string_to_value (uint32_t type,
+GNUNET_GNSRECORD_string_to_value (uint32_t type,
const char *s,
void **data,
size_t *data_size)
@@ -509,7 +509,7 @@
*data_size = sizeof (struct in6_addr);
memcpy (*data, &value_aaaa, sizeof (value_aaaa));
return GNUNET_OK;
- case GNUNET_NAMESTORE_TYPE_PKEY:
+ case GNUNET_GNSRECORD_TYPE_PKEY:
if (GNUNET_OK !=
GNUNET_CRYPTO_ecdsa_public_key_from_string (s, strlen (s), &pkey))
{
@@ -522,7 +522,7 @@
memcpy (*data, &pkey, sizeof (pkey));
*data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
return GNUNET_OK;
- case GNUNET_NAMESTORE_TYPE_PHONE:
+ case GNUNET_GNSRECORD_TYPE_PHONE:
{
struct GNUNET_CONVERSATION_PhoneRecord *pr;
unsigned int line;
@@ -549,15 +549,15 @@
*data_size = sizeof (struct GNUNET_CONVERSATION_PhoneRecord);
return GNUNET_OK;
}
- case GNUNET_NAMESTORE_TYPE_PSEU:
+ case GNUNET_GNSRECORD_TYPE_PSEU:
*data = GNUNET_strdup (s);
*data_size = strlen (s);
return GNUNET_OK;
- case GNUNET_NAMESTORE_TYPE_LEHO:
+ case GNUNET_GNSRECORD_TYPE_LEHO:
*data = GNUNET_strdup (s);
*data_size = strlen (s);
return GNUNET_OK;
- case GNUNET_NAMESTORE_TYPE_VPN:
+ case GNUNET_GNSRECORD_TYPE_VPN:
if (3 != SSCANF (s,"%u %103s %253s",
&proto, s_peer, s_serv))
{
@@ -579,7 +579,7 @@
vpn->proto = htons ((uint16_t) proto);
strcpy ((char*)&vpn[1], s_serv);
return GNUNET_OK;
- case GNUNET_NAMESTORE_TYPE_GNS2DNS:
+ case GNUNET_GNSRECORD_TYPE_GNS2DNS:
{
char nsbuf[256];
size_t off;
@@ -643,12 +643,12 @@
{ "MX", GNUNET_DNSPARSER_TYPE_MX },
{ "TXT", GNUNET_DNSPARSER_TYPE_TXT },
{ "AAAA", GNUNET_DNSPARSER_TYPE_AAAA },
- { "PKEY", GNUNET_NAMESTORE_TYPE_PKEY },
- { "PSEU", GNUNET_NAMESTORE_TYPE_PSEU },
- { "LEHO", GNUNET_NAMESTORE_TYPE_LEHO },
- { "VPN", GNUNET_NAMESTORE_TYPE_VPN },
- { "GNS2DNS", GNUNET_NAMESTORE_TYPE_GNS2DNS },
- { "PHONE", GNUNET_NAMESTORE_TYPE_PHONE },
+ { "PKEY", GNUNET_GNSRECORD_TYPE_PKEY },
+ { "PSEU", GNUNET_GNSRECORD_TYPE_PSEU },
+ { "LEHO", GNUNET_GNSRECORD_TYPE_LEHO },
+ { "VPN", GNUNET_GNSRECORD_TYPE_VPN },
+ { "GNS2DNS", GNUNET_GNSRECORD_TYPE_GNS2DNS },
+ { "PHONE", GNUNET_GNSRECORD_TYPE_PHONE },
{ "TLSA", GNUNET_DNSPARSER_TYPE_TLSA },
{ NULL, UINT32_MAX }
};
@@ -661,7 +661,7 @@
* @return corresponding number, UINT32_MAX on error
*/
uint32_t
-GNUNET_NAMESTORE_typename_to_number (const char *dns_typename)
+GNUNET_GNSRECORD_typename_to_number (const char *dns_typename)
{
unsigned int i;
@@ -680,7 +680,7 @@
* @return corresponding typestring, NULL on error
*/
const char *
-GNUNET_NAMESTORE_number_to_typename (uint32_t type)
+GNUNET_GNSRECORD_number_to_typename (uint32_t type)
{
unsigned int i;
Modified: gnunet/src/namestore/gnunet-namestore-fcfsd.c
===================================================================
--- gnunet/src/namestore/gnunet-namestore-fcfsd.c 2013-10-16 11:34:10 UTC
(rev 30211)
+++ gnunet/src/namestore/gnunet-namestore-fcfsd.c 2013-10-16 11:39:55 UTC
(rev 30212)
@@ -287,14 +287,14 @@
return;
}
- if (GNUNET_NAMESTORE_TYPE_PKEY != rd->record_type)
+ if (GNUNET_GNSRECORD_TYPE_PKEY != rd->record_type)
{
GNUNET_NAMESTORE_zone_iterator_next (zr->list_it);
return;
}
bytes_free = zr->buf_len - zr->write_offset;
- pkey = GNUNET_NAMESTORE_value_to_string (rd->record_type,
+ pkey = GNUNET_GNSRECORD_value_to_string (rd->record_type,
rd->data,
rd->data_size);
@@ -529,7 +529,7 @@
r.data = &pub;
r.data_size = sizeof (pub);
r.expiration_time = UINT64_MAX;
- r.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+ r.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
r.flags = GNUNET_NAMESTORE_RF_NONE;
request->qe = GNUNET_NAMESTORE_records_store (ns,
&fcfs_zone_pkey,
Modified: gnunet/src/namestore/gnunet-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-namestore.c 2013-10-16 11:34:10 UTC (rev
30211)
+++ gnunet/src/namestore/gnunet-namestore.c 2013-10-16 11:39:55 UTC (rev
30212)
@@ -358,8 +358,8 @@
name);
for (i=0;i<rd_len;i++)
{
- typestring = GNUNET_NAMESTORE_number_to_typename (rd[i].record_type);
- s = GNUNET_NAMESTORE_value_to_string (rd[i].record_type,
+ typestring = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type);
+ s = GNUNET_GNSRECORD_value_to_string (rd[i].record_type,
rd[i].data,
rd[i].data_size);
if (NULL == s)
@@ -495,8 +495,8 @@
name);
for (i=0;i<rd_len;i++)
{
- typestring = GNUNET_NAMESTORE_number_to_typename (rd[i].record_type);
- s = GNUNET_NAMESTORE_value_to_string (rd[i].record_type,
+ typestring = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type);
+ s = GNUNET_GNSRECORD_value_to_string (rd[i].record_type,
rd[i].data,
rd[i].data_size);
if (NULL == s)
@@ -639,7 +639,7 @@
ret = 1;
return;
}
- type = GNUNET_NAMESTORE_typename_to_number (typestring);
+ type = GNUNET_GNSRECORD_typename_to_number (typestring);
if (UINT32_MAX == type)
{
fprintf (stderr, _("Unsupported type `%s'\n"), typestring);
@@ -657,7 +657,7 @@
return;
}
if (GNUNET_OK !=
- GNUNET_NAMESTORE_string_to_value (type,
+ GNUNET_GNSRECORD_string_to_value (type,
value,
&data,
&data_size))
@@ -795,7 +795,7 @@
memset (&rd, 0, sizeof (rd));
rd.data = &pkey;
rd.data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
- rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+ rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
if (GNUNET_YES == etime_is_rel)
{
rd.expiration_time = etime_rel.rel_value_us;
Modified: gnunet/src/namestore/plugin_namestore_postgres.c
===================================================================
--- gnunet/src/namestore/plugin_namestore_postgres.c 2013-10-16 11:34:10 UTC
(rev 30211)
+++ gnunet/src/namestore/plugin_namestore_postgres.c 2013-10-16 11:39:55 UTC
(rev 30212)
@@ -476,7 +476,7 @@
memset (&pkey, 0, sizeof (pkey));
for (i=0;i<rd_count;i++)
- if (GNUNET_NAMESTORE_TYPE_PKEY == rd[i].record_type)
+ if (GNUNET_GNSRECORD_TYPE_PKEY == rd[i].record_type)
{
GNUNET_break (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) ==
rd[i].data_size);
memcpy (&pkey,
Modified: gnunet/src/namestore/plugin_namestore_sqlite.c
===================================================================
--- gnunet/src/namestore/plugin_namestore_sqlite.c 2013-10-16 11:34:10 UTC
(rev 30211)
+++ gnunet/src/namestore/plugin_namestore_sqlite.c 2013-10-16 11:39:55 UTC
(rev 30212)
@@ -671,7 +671,7 @@
memset (&pkey, 0, sizeof (pkey));
for (i=0;i<rd_count;i++)
- if (GNUNET_NAMESTORE_TYPE_PKEY == rd[i].record_type)
+ if (GNUNET_GNSRECORD_TYPE_PKEY == rd[i].record_type)
{
GNUNET_break (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) ==
rd[i].data_size);
memcpy (&pkey,
Modified: gnunet/src/namestore/test_namestore_api_zone_to_name.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_to_name.c 2013-10-16
11:34:10 UTC (rev 30211)
+++ gnunet/src/namestore/test_namestore_api_zone_to_name.c 2013-10-16
11:39:55 UTC (rev 30212)
@@ -186,7 +186,7 @@
struct GNUNET_NAMESTORE_RecordData rd;
rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
- rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+ rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
rd.data_size = sizeof (struct GNUNET_CRYPTO_ShortHashCode);
rd.data = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_ShortHashCode));
memcpy ((char *) rd.data, &s_zone_value, sizeof (struct
GNUNET_CRYPTO_ShortHashCode));
Modified: gnunet/src/pt/test_gns_vpn.c
===================================================================
--- gnunet/src/pt/test_gns_vpn.c 2013-10-16 11:34:10 UTC (rev 30211)
+++ gnunet/src/pt/test_gns_vpn.c 2013-10-16 11:39:55 UTC (rev 30212)
@@ -395,11 +395,11 @@
host_key = GNUNET_CRYPTO_eddsa_key_create_from_file (zone_keyfile);
rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
GNUNET_asprintf (&rd_string, "6 %s %s", (char*)&peername, "www.gnu.");
- GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_string_to_value
(GNUNET_NAMESTORE_TYPE_VPN,
+ GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_string_to_value
(GNUNET_GNSRECORD_TYPE_VPN,
rd_string,
(void**)&rd.data,
&rd.data_size));
- rd.record_type = GNUNET_NAMESTORE_TYPE_VPN;
+ rd.record_type = GNUNET_GNSRECORD_TYPE_VPN;
GNUNET_NAMESTORE_records_store (namestore,
host_key,
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-search.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-search.c 2013-10-16
11:34:10 UTC (rev 30211)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_main-window-search.c 2013-10-16
11:39:55 UTC (rev 30212)
@@ -26,6 +26,7 @@
#include "gnunet-fs-gtk_common.h"
#include "gnunet-fs-gtk.h"
#include "gnunet-fs-gtk_anonymity-widgets.h"
+#include <gnunet/gnunet_gnsrecord_lib.h>
/**
@@ -74,7 +75,7 @@
sl->gns = NULL;
}
g_free (sl->keywords);
- GNUNET_free (sl);
+ GNUNET_free (sl);
}
@@ -118,7 +119,7 @@
sl->gns = NULL;
for (i=0;i<rd_count;i++)
{
- if (GNUNET_NAMESTORE_TYPE_PKEY != rd[i].record_type)
+ if (GNUNET_GNSRECORD_TYPE_PKEY != rd[i].record_type)
continue;
if (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) != rd[i].data_size)
{
@@ -229,7 +230,7 @@
sl->gns = GNUNET_GNS_lookup (main_ctx->gns,
nsid,
&pub_sks_zone,
- GNUNET_NAMESTORE_TYPE_PKEY,
+ GNUNET_GNSRECORD_TYPE_PKEY,
GNUNET_NO,
NULL /* no shortening */,
&handle_gns_result,
@@ -420,7 +421,7 @@
rd.data = &lctx->pkey;
rd.flags = GNUNET_NAMESTORE_RF_PRIVATE;
rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
- rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+ rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
main_ctx = GNUNET_FS_GTK_get_main_context ();
lctx->namestore = GNUNET_NAMESTORE_connect (main_ctx->cfg);
GNUNET_assert (NULL != lctx->namestore);
@@ -554,7 +555,7 @@
}
for (i=0;i<rd_count;i++)
{
- if (GNUNET_NAMESTORE_TYPE_PSEU == rd[i].record_type)
+ if (GNUNET_GNSRECORD_TYPE_PSEU == rd[i].record_type)
{
nick = rd[i].data;
if ('\0' != nick[rd[i].data_size - 1])
@@ -696,7 +697,7 @@
lctx->lr = GNUNET_GNS_lookup (main_ctx->gns,
GNUNET_GNS_MASTERZONE_STR,
&pkey,
- GNUNET_NAMESTORE_TYPE_PSEU,
+ GNUNET_GNSRECORD_TYPE_PSEU,
GNUNET_NO,
NULL,
&lookup_finished,
Modified: gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
===================================================================
--- gnunet-gtk/src/namestore/gnunet-namestore-gtk.c 2013-10-16 11:34:10 UTC
(rev 30211)
+++ gnunet-gtk/src/namestore/gnunet-namestore-gtk.c 2013-10-16 11:39:55 UTC
(rev 30212)
@@ -629,7 +629,7 @@
(GNUNET_DNSPARSER_TYPE_AAAA == n_type) )
return GNUNET_OK;
return GNUNET_NO;
- case GNUNET_NAMESTORE_TYPE_PKEY:
+ case GNUNET_GNSRECORD_TYPE_PKEY:
return GNUNET_NO;
default:
break;
@@ -647,7 +647,7 @@
(GNUNET_DNSPARSER_TYPE_AAAA != rd[i].record_type) )
return GNUNET_NO;
return GNUNET_OK;
- case GNUNET_NAMESTORE_TYPE_PKEY:
+ case GNUNET_GNSRECORD_TYPE_PKEY:
return GNUNET_NO;
default:
break;
@@ -911,7 +911,7 @@
free_edit_dialog_context (edc);
return;
}
- if (GNUNET_OK != GNUNET_NAMESTORE_string_to_value (edc->record_type,
edc->n_value,
+ if (GNUNET_OK != GNUNET_GNSRECORD_string_to_value (edc->record_type,
edc->n_value,
&data, &data_size))
{
GNUNET_break (0);
@@ -1072,7 +1072,7 @@
ri->data,
ri->rd_count,
rd_old));
- edc->n_value = GNUNET_NAMESTORE_value_to_string (n_type,
+ edc->n_value = GNUNET_GNSRECORD_value_to_string (n_type,
rd_old[off].data,
rd_old[off].data_size);
edc->n_public = (0 == (rd_old[off].flags & GNUNET_NAMESTORE_RF_PRIVATE));
@@ -1103,13 +1103,13 @@
case GNUNET_DNSPARSER_TYPE_CNAME:
GNS_edit_dialog_cname (edc);
break;
- case GNUNET_NAMESTORE_TYPE_LEHO:
+ case GNUNET_GNSRECORD_TYPE_LEHO:
GNS_edit_dialog_leho (edc);
break;
- case GNUNET_NAMESTORE_TYPE_PHONE:
+ case GNUNET_GNSRECORD_TYPE_PHONE:
GNS_edit_dialog_phone (edc);
break;
- case GNUNET_NAMESTORE_TYPE_PKEY:
+ case GNUNET_GNSRECORD_TYPE_PKEY:
GNS_edit_dialog_pkey (edc);
break;
case GNUNET_DNSPARSER_TYPE_PTR:
@@ -1118,7 +1118,7 @@
case GNUNET_DNSPARSER_TYPE_MX:
GNS_edit_dialog_mx (edc);
break;
- case GNUNET_NAMESTORE_TYPE_GNS2DNS:
+ case GNUNET_GNSRECORD_TYPE_GNS2DNS:
GNS_edit_dialog_gns2dns (edc);
break;
case GNUNET_DNSPARSER_TYPE_SOA:
@@ -1130,7 +1130,7 @@
case GNUNET_DNSPARSER_TYPE_TXT:
GNS_edit_dialog_txt (edc);
break;
- case GNUNET_NAMESTORE_TYPE_VPN:
+ case GNUNET_GNSRECORD_TYPE_VPN:
GNS_edit_dialog_vpn (edc);
break;
case GNUNET_DNSPARSER_TYPE_TLSA:
@@ -1251,7 +1251,7 @@
if (0 == strcmp (new_text, _(NEW_RECORD_STR)))
return; /* no record type was selected */
- type = GNUNET_NAMESTORE_typename_to_number (new_text);
+ type = GNUNET_GNSRECORD_typename_to_number (new_text);
if (UINT32_MAX == type)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -1533,7 +1533,7 @@
rd.record_type = n_type;
rd.expiration_time = n_exp_time;
if (GNUNET_OK !=
- GNUNET_NAMESTORE_string_to_value (n_type, n_value,
+ GNUNET_GNSRECORD_string_to_value (n_type, n_value,
(void**)&rd.data, &rd.data_size))
{
/* can't remove, value invalid */
@@ -1640,7 +1640,7 @@
rd_old));
memcpy (rd_new, rd_old, sizeof (struct GNUNET_NAMESTORE_RecordData) *
rd_count);
for (off=0;off<rd_count;off++)
- if (GNUNET_NAMESTORE_TYPE_PSEU == rd_new[off].record_type)
+ if (GNUNET_GNSRECORD_TYPE_PSEU == rd_new[off].record_type)
break;
if (off == rd_count)
total++;
@@ -1652,7 +1652,7 @@
}
else
{
- rd_new[off].record_type = GNUNET_NAMESTORE_TYPE_PSEU;
+ rd_new[off].record_type = GNUNET_GNSRECORD_TYPE_PSEU;
rd_new[off].expiration_time = UINT64_MAX;
rd_new[off].flags = GNUNET_NAMESTORE_RF_NONE;
rd_new[off].data_size = strlen (pseu) + 1;
@@ -1802,7 +1802,7 @@
gtk_tree_store_set (ts, &iter_name,
GNS_TREESTORE_COL_NAME, name,
GNS_TREESTORE_COL_NAME_IS_VISIBLE, TRUE,
- GNS_TREESTORE_COL_RECORD_TYPE,
GNUNET_NAMESTORE_TYPE_ANY,
+ GNS_TREESTORE_COL_RECORD_TYPE,
GNUNET_GNSRECORD_TYPE_ANY,
GNS_TREESTORE_COL_RECORD_TYPE_AS_STR, _(NEW_RECORD_STR),
GNS_TREESTORE_COL_IS_RECORD_ROW, TRUE,
GNS_TREESTORE_COL_NOT_DUMMY_ROW, FALSE,
@@ -1876,19 +1876,19 @@
exp = GNUNET_STRINGS_absolute_time_to_string (exp_abs);
}
/* value */
- val = GNUNET_NAMESTORE_value_to_string (rd[c].record_type,
+ val = GNUNET_GNSRECORD_value_to_string (rd[c].record_type,
rd[c].data,
rd[c].data_size);
if (NULL == val)
GNUNET_asprintf (&val, "%s", EXPIRE_INVALID_STRING);
- if (NULL != GNUNET_NAMESTORE_number_to_typename (rd[c].record_type))
- type_str = strdup (GNUNET_NAMESTORE_number_to_typename
(rd[c].record_type));
+ if (NULL != GNUNET_GNSRECORD_number_to_typename (rd[c].record_type))
+ type_str = strdup (GNUNET_GNSRECORD_number_to_typename
(rd[c].record_type));
else
GNUNET_asprintf (&type_str, "%s", EXPIRE_INVALID_STRING);
if ( (0 == strcmp (name, GNUNET_GNS_MASTERZONE_STR)) &&
- (GNUNET_NAMESTORE_TYPE_PSEU == rd[c].record_type) &&
+ (GNUNET_GNSRECORD_TYPE_PSEU == rd[c].record_type) &&
(NULL == current_pseudonym) )
{
pseu_entry = GTK_ENTRY((get_object ("gnunet_namestore_gtk_pseu_entry")));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30212 - gnunet/src/conversation gnunet/src/gns gnunet/src/gnsrecord gnunet/src/namestore gnunet/src/pt gnunet-gtk/src/fs gnunet-gtk/src/namestore,
gnunet <=