complete testcase template, currently functionally blocked by two issues in the testb...

[oweals/gnunet.git] / src / conversation / conversation_api.c

diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c
index aca0155c81d3f7a9e64e88d48ff44ac4170e5303..58945d447df43b012323843e3533593e666b06ba 100644 (file)
--- a/src/conversation/conversation_api.c
+++ b/src/conversation/conversation_api.c
@@ -163,14 +163,14 @@ handle_caller_name (void *cls,
                     const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
                     const char *label,
                     unsigned int rd_count,
-                    const struct GNUNET_NAMESTORE_RecordData *rd)
+                    const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct GNUNET_CONVERSATION_Phone *phone = cls;
   char *name;
 
   phone->qe = NULL;
   if (NULL == label)
-    name = GNUNET_strdup (GNUNET_NAMESTORE_pkey_to_zkey (&phone->caller_id));
+    name = GNUNET_strdup (GNUNET_GNSRECORD_pkey_to_zkey (&phone->caller_id));
   else
     GNUNET_asprintf (&name, "%.gnu", label);
   phone->event_handler (phone->event_handler_cls,
@@ -452,13 +452,13 @@ GNUNET_CONVERSATION_phone_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
  */
 void
 GNUNET_CONVERSATION_phone_get_record (struct GNUNET_CONVERSATION_Phone *phone,
-                                     struct GNUNET_NAMESTORE_RecordData *rd)
+                                     struct GNUNET_GNSRECORD_Data *rd)
 {
   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->flags = GNUNET_NAMESTORE_RF_NONE;
+  rd->record_type = GNUNET_GNSRECORD_TYPE_PHONE;
+  rd->flags = GNUNET_GNSRECORD_RF_NONE;
 }
 
 
@@ -904,7 +904,7 @@ handle_call_audio_message (void *cls,
 static void
 handle_gns_response (void *cls,
                      uint32_t rd_count,
-                     const struct GNUNET_NAMESTORE_RecordData *rd)
+                     const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct GNUNET_CONVERSATION_Call *call = cls;
   uint32_t i;
@@ -914,7 +914,7 @@ handle_gns_response (void *cls,
   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 @@ reconnect_call (struct GNUNET_CONVERSATION_Call *call)
   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);