[GNUnet-SVN] r22161 - gnunet/src/namestore

[gnunet]

Author: wachs
Date: 2012-06-20 17:26:30 +0200 (Wed, 20 Jun 2012)
New Revision: 22161

Modified:
   gnunet/src/namestore/gnunet-service-namestore.c
   gnunet/src/namestore/namestore_api.c
Log:
- docu

Modified: gnunet/src/namestore/gnunet-service-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-service-namestore.c     2012-06-20 15:14:44 UTC 
(rev 22160)
+++ gnunet/src/namestore/gnunet-service-namestore.c     2012-06-20 15:26:30 UTC 
(rev 22161)
@@ -408,6 +408,7 @@
   return nc;
 }
 
+
 /**
  * Called whenever a client is disconnected.
  * Frees our resources associated with that client.
@@ -444,6 +445,7 @@
   nc = NULL;
 }
 
+
 /**
  * Handles a 'GNUNET_MESSAGE_TYPE_NAMESTORE_START' message
  *
@@ -467,17 +469,52 @@
 }
 
 
+/**
+ * LookupNameContext
+ *
+ * Context for name lookups passed from 'handle_lookup_name' to
+ * 'handle_lookup_name_it' as closure
+ */
 struct LookupNameContext
 {
+  /**
+   * The client to send the response to
+   */
+  struct GNUNET_NAMESTORE_Client *nc;
 
-  struct GNUNET_NAMESTORE_Client *nc;
+  /**
+   * Operation id for the name lookup
+   */
   uint32_t request_id;
+
+  /**
+   * Requested specific record type
+   */
   uint32_t record_type;
+
+  /**
+   * Requested zone
+   */
   struct GNUNET_CRYPTO_ShortHashCode *zone;
+
+  /**
+   * Requested name
+   */
   char *name;
 };
 
 
+/**
+ * A 'GNUNET_NAMESTORE_RecordIterator' for name lookups in handle_lookup_name
+ *
+ * @param cls a 'struct LookupNameContext *' with information about the request
+ * @param zone_key zone key of the zone
+ * @param expire expiration time
+ * @param name name
+ * @param rd_count number of records
+ * @param rd array of records
+ * @param signature signature
+ */
 static void
 handle_lookup_name_it (void *cls,
     const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
@@ -829,17 +866,62 @@
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
+
+/**
+ * CreateRecordContext
+ *
+ * Context for record create operations passed from 'handle_record_create' to
+ * 'handle_create_record_it' as closure
+ */
 struct CreateRecordContext
 {
+  /**
+   * Record data
+   */
   struct GNUNET_NAMESTORE_RecordData *rd;
+
+  /**
+   * Zone's private key
+   */
   struct GNUNET_CRYPTO_RsaPrivateKey *pkey;
+
+  /**
+   * Zone's public key
+   */
   struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pubkey;
+
+  /**
+   * Record expiration time
+   */
   struct GNUNET_TIME_Absolute expire;
+
+  /**
+   * Name for the record to create
+   */
   char *name;
+
+  /**
+   * result returned from 'handle_create_record_it'
+   * GNUNET_SYSERR: failed to create the record
+   * GNUNET_NO: we updated an existing record or identical entry existed
+   * GNUNET_YES : we created a new record
+   */
   int res;
 };
 
 
+/**
+ * A 'GNUNET_NAMESTORE_RecordIterator' for record create operations
+ * in handle_record_create
+ *
+ * @param cls a 'struct CreateRecordContext *' with information about the 
request
+ * @param pubkey zone key of the zone
+ * @param expire expiration time
+ * @param name name
+ * @param rd_count number of records
+ * @param rd array of records
+ * @param signature signature
+ */
 static void
 handle_create_record_it (void *cls,
                         const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded 
*pubkey,
@@ -1131,12 +1213,36 @@
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
-
+/**
+ * RemoveRecordContext
+ *
+ * Context for record remove operations passed from 'handle_record_remove' to
+ * 'handle_record_remove_it' as closure
+ */
 struct RemoveRecordContext
 {
+  /**
+   * Record to remove
+   */
   struct GNUNET_NAMESTORE_RecordData *rd;
+
+  /**
+   * Zone's private keys
+   */
   struct GNUNET_CRYPTO_RsaPrivateKey *pkey;
+
+  /**
+   * Name to remove
+   */
   int remove_name;
+
+  /**
+   * 0 : Success
+   * 1 : Could not find record to remove, empty result set
+   * 2 : Could not find record to remove, record did not exist in result set
+   * 3 : Could not remove records from database
+   * 4 : Could not put records into database
+   */
   uint16_t op_res;
 };
 
@@ -1203,8 +1309,8 @@
                 name, res);
     if (GNUNET_OK != res)
     {
-      /* Could put records into database */
-      rrc->op_res = 4;
+      /* Could not remove records from database */
+      rrc->op_res = 3;
       return;
     }
     rrc->op_res = 0;
@@ -1241,7 +1347,7 @@
                                   &dummy_signature);
   if (GNUNET_OK != res)
   {
-    /* Could put records into database */
+    /* Could not put records into database */
     rrc->op_res = 4;
     return;
   }
@@ -1428,13 +1534,37 @@
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
-
+/**
+ * ZoneToNameCtx
+ *
+ * Context for record remove operations passed from 'handle_zone_to_name' to
+ * 'handle_zone_to_name_it' as closure
+ */
 struct ZoneToNameCtx
 {
+  /**
+   * Namestore client
+   */
   struct GNUNET_NAMESTORE_Client *nc;
+
+  /**
+   * Request id
+   */
   uint32_t rid;
 };
 
+
+/**
+ * Zone to name iterator
+ *
+ * @param cls struct ZoneToNameCtx *
+ * @param zone_key the zone key
+ * @param expire expiration date
+ * @param name name
+ * @param rd_count number of records
+ * @param rd record data
+ * @param signature signature
+ */
 static void
 handle_zone_to_name_it (void *cls,
     const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
@@ -1584,7 +1714,10 @@
 
 
 /**
- * Copy record, data has to be free separetely
+ * Copy record, data has to be free'd separetely
+ *
+ * @param src source record
+ * @param dest destination record
  */
 static void
 copy_record (const struct GNUNET_NAMESTORE_RecordData *src, struct 
GNUNET_NAMESTORE_RecordData *dest)
@@ -1595,23 +1728,79 @@
   memcpy ((void *) dest->data, src->data, src->data_size);
 }
 
+
+/**
+ * ZoneIterationProcResult
+ *
+ * Context for record remove operations passed from
+ * 'find_next_zone_iteration_result' to 'zone_iteraterate_proc' as closure
+ */
 struct ZoneIterationProcResult
 {
+  /**
+   * The zone iteration handle
+   */
   struct GNUNET_NAMESTORE_ZoneIteration *zi;
 
+  /**
+   * Iteration result: iteration done?
+   */
   int res_iteration_finished;
+
+  /**
+   * Iteration result: number of records included
+   */
   int records_included;
+
+  /**
+   * Iteration result: is a valid signature included?
+   */
   int has_signature;
 
+  /**
+   * Name
+   */
   char *name;
+
+  /**
+   * Zone hash
+   */
   struct GNUNET_CRYPTO_ShortHashCode zone_hash;
+
+  /**
+   * Record data
+   */
   struct GNUNET_NAMESTORE_RecordData *rd;
+
+  /**
+   * Zone's public key
+   */
   struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded zone_key;
+
+  /**
+   * Signature
+   */
   struct GNUNET_CRYPTO_RsaSignature signature;
+
+  /**
+   * Expiration date
+   */
   struct GNUNET_TIME_Absolute expire;
 };
 
 
+/**
+ * Process results for zone iteration from database
+ *
+ * @param cls struct ZoneIterationProcResult *proc
+ * @param zone_key the zone key
+ * @param expire expiration time
+ * @param name name
+ * @param rd_count number of records for this name
+ * @param rd record data
+ * @param signature block signature
+ */
+
 static void
 zone_iteraterate_proc (void *cls,
                        const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded 
*zone_key,
@@ -1738,6 +1927,11 @@
 
 }
 
+
+/**
+ *  Find next zone iteration result in database
+ *  @param proc the zone iteration processing to use
+ */
 static void
 find_next_zone_iteration_result (struct ZoneIterationProcResult *proc)
 {
@@ -1758,6 +1952,10 @@
 }
 
 
+/**
+ * Send zone iteration result to client
+ * @param proc the zone iteration processing result to send
+ */
 static void
 send_zone_iteration_result (struct ZoneIterationProcResult *proc)
 {
@@ -1836,6 +2034,11 @@
   }
 }
 
+
+/**
+ * Clean up after zone iteration
+ * @param proc the zone iteration processor
+ */
 static void
 clean_up_zone_iteration_result (struct ZoneIterationProcResult *proc)
 {
@@ -2030,6 +2233,14 @@
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
+
+/**
+ * Load zone keys from directory by reading all .zkey files in this directory
+ *
+ * @param cls int * 'counter' to store the number of files found
+ * @param filename directory to scan
+ * @return GNUNET_OK to continue
+ */
 static int
 zonekey_file_it (void *cls, const char *filename)
 {
@@ -2059,7 +2270,7 @@
 
 
 /**
- * Process template requests.
+ * Process namestore requests.
  *
  * @param cls closure
  * @param server the initialized server

Modified: gnunet/src/namestore/namestore_api.c
===================================================================
--- gnunet/src/namestore/namestore_api.c        2012-06-20 15:14:44 UTC (rev 
22160)
+++ gnunet/src/namestore/namestore_api.c        2012-06-20 15:26:30 UTC (rev 
22161)
@@ -576,7 +576,7 @@
 /**
  * Handle incoming messages for record operations
  *
- * @param ze the respective zone iteration handle
+ * @param qe the respective zone iteration handle
  * @param msg the message we received
  * @param type the message type in HBO
  * @param size the message size
@@ -1159,7 +1159,7 @@
  * to validate signatures received from the network.
  *
  * @param public_key public key of the zone
- * @param expire block expiration
+ * @param freshness block expiration
  * @param name name that is being mapped (at most 255 characters long)
  * @param rd_count number of entries in 'rd' array
  * @param rd array of records with data to store
@@ -1168,7 +1168,7 @@
  */
 int
 GNUNET_NAMESTORE_verify_signature (const struct 
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *public_key,
-                                   const struct GNUNET_TIME_Absolute expire,
+                                   const struct GNUNET_TIME_Absolute freshness,
                                   const char *name,
                                   unsigned int rd_count,
                                   const struct GNUNET_NAMESTORE_RecordData *rd,