- put record

1 files changed, 83 insertions, 13 deletions

diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c
index 21b24567a..882e5a5de 100644
--- a/src/namestore/namestore_api.c
+++ b/src/namestore/namestore_api.c
@@ -245,12 +245,51 @@ handle_lookup_name_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
   {
     qe->proc (qe->proc_cls, zone_key, expire, name, rd_count, rd, signature);
   }
+  /* Operation done, remove */
+  GNUNET_CONTAINER_DLL_remove(h->op_head, h->op_tail, qe);
+  GNUNET_free (qe);
+}
+
+
+static void
+handle_record_put_response (struct GNUNET_NAMESTORE_QueueEntry *qe,
+                             struct RecordPutResponseMessage* msg,
+                             size_t size)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' \n",
+              "RECORD_PUT_RESPONSE");
+
+  struct GNUNET_NAMESTORE_Handle *h = qe->nsh;
+  int res = GNUNET_OK;
+
+  if (ntohs (msg->op_result) == GNUNET_OK)
+  {
+    res = GNUNET_OK;
+    if (qe->cont != NULL)
+    {
+      qe->cont (qe->cont_cls, res, _("Namestore added record successfully"));
+    }
+
+  }
+  else if (ntohs (msg->op_result) == GNUNET_NO)
+  {
+    res = GNUNET_SYSERR;
+    if (qe->cont != NULL)
+    {
+      qe->cont (qe->cont_cls, res, _("Namestore failed to add record"));
+    }
+  }
+  else
+  {
+    GNUNET_break_op (0);
+    return;
+  }
 
 
   /* Operation done, remove */
   GNUNET_CONTAINER_DLL_remove(h->op_head, h->op_tail, qe);
-  GNUNET_free (qe);
 
+  GNUNET_free (qe);
 }
 
 
@@ -326,6 +365,14 @@ process_namestore_message (void *cls, const struct GNUNET_MessageHeader *msg)
         }
         handle_lookup_name_response (qe, (struct LookupNameResponseMessage *) msg, size);
       break;
+    case GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT_RESPONSE:
+        if (size != sizeof (struct RecordPutResponseMessage))
+        {
+          GNUNET_break_op (0);
+          break;
+        }
+        handle_record_put_response (qe, (struct RecordPutResponseMessage *) msg, size);
+      break;
     default:
       GNUNET_break_op (0);
       break;
@@ -575,7 +622,14 @@ GNUNET_NAMESTORE_record_put (struct GNUNET_NAMESTORE_Handle *h,
 {
   struct GNUNET_NAMESTORE_QueueEntry *qe;
   struct PendingMessage *pe;
+
+  /* pointer to elements */
+  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key_tmp;
+  struct GNUNET_NAMESTORE_RecordData *rd_tmp;
+  char * name_tmp;
+
   size_t msg_size = 0;
+  size_t name_len = strlen(name) + 1;
   uint32_t id = 0;
 
   GNUNET_assert (NULL != h);
@@ -588,24 +642,40 @@ GNUNET_NAMESTORE_record_put (struct GNUNET_NAMESTORE_Handle *h,
   GNUNET_CONTAINER_DLL_insert(h->op_head, h->op_tail, qe);
 
   /* set msg_size*/
-  pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
+  struct RecordPutMessage * msg;
+  msg_size = sizeof (struct RecordPutMessage) + sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) + name_len  + rd_count * (sizeof (struct GNUNET_NAMESTORE_RecordData));
 
   /* create msg here */
+  pe = GNUNET_malloc(sizeof (struct PendingMessage) + msg_size);
+  pe->size = msg_size;
+  pe->is_init = GNUNET_NO;
+  msg = (struct RecordPutMessage *) &pe[1];
+  zone_key_tmp = (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *) &msg[1];
+  name_tmp = (char *) &zone_key_tmp[1];
+  rd_tmp = (struct GNUNET_NAMESTORE_RecordData *) &name_tmp[name_len];
+
+  msg->header.type = htons (GNUNET_MESSAGE_TYPE_NAMESTORE_RECORD_PUT);
+  msg->header.size = htons (msg_size);
+  msg->op_id = htonl (id);
+  memcpy (zone_key_tmp, zone_key, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
+  msg->signature = *signature;
+  msg->name_len = htons (name_len);
+  memcpy (name_tmp, name, name_len);
+  msg->expire = GNUNET_TIME_absolute_hton (expire);
+  msg->rd_count = htonl(rd_count);
+  memcpy (rd_tmp, rd, rd_count * (sizeof (struct GNUNET_NAMESTORE_RecordData)));
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending `%s' message for name `%s' with size %u\n", "NAMESTORE_RECORD_PUT", name, msg_size);
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "CALC: %u %u %u %u\n",
+      sizeof (struct RecordPutMessage),
+      sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+      name_len,
+      rd_count * (sizeof (struct GNUNET_NAMESTORE_RecordData)));
 
   GNUNET_CONTAINER_DLL_insert (h->pending_head, h->pending_tail, pe);
   do_transmit(h);
 
-#if 0
-  struct GNUNET_NAMESTORE_SimpleRecord *sr;
-  sr = GNUNET_malloc(sizeof(struct GNUNET_NAMESTORE_SimpleRecord));
-  sr->name = name;
-  sr->record_type = record_type;
-  sr->expiration = expiration;
-  sr->flags = flags;
-  sr->data_size = data_size;
-  sr->data = data;
-  GNUNET_CONTAINER_DLL_insert(h->records_head, h->records_tail, sr);
-#endif
   return qe;
 }