From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 1 Mar 2012 09:11:58 +0000 (+0000)
Subject: -fixing sparc fun
X-Git-Tag: initial-import-from-subversion-38251~14532
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ca95b135b939f6585a0093cc5b7329fa4303ecce;p=oweals%2Fgnunet.git

-fixing sparc fun
---

diff --git a/src/namestore/namestore.h b/src/namestore/namestore.h
index 760d491e2..fa31c7234 100644
--- a/src/namestore/namestore.h
+++ b/src/namestore/namestore.h
@@ -54,6 +54,8 @@ GNUNET_NAMESTORE_records_deserialize ( struct GNUNET_NAMESTORE_RecordData **dest
 void
 GNUNET_NAMESTORE_records_free (unsigned int rd_count, struct GNUNET_NAMESTORE_RecordData *rd);
 
+
+GNUNET_NETWORK_STRUCT_BEGIN
 /**
  * A GNS record serialized for network transmission.
  * layout is [struct GNUNET_NAMESTORE_NetworkRecord][char[data_size] data]
@@ -83,9 +85,8 @@ struct GNUNET_NAMESTORE_NetworkRecord
 
 
 
-GNUNET_NETWORK_STRUCT_BEGIN
 /**
- * Connect to namestore service
+ * Connect to namestore service.  FIXME: UNNECESSARY.
  */
 struct StartMessage
 {
@@ -96,10 +97,7 @@ struct StartMessage
   struct GNUNET_MessageHeader header;
 
 };
-GNUNET_NETWORK_STRUCT_END
-
 
-GNUNET_NETWORK_STRUCT_BEGIN
 /**
  * Generic namestore message with op id
  */
@@ -111,17 +109,15 @@ struct GenericMessage
   struct GNUNET_MessageHeader header;
 
   /**
-   * Operation ID in NBO
+   * Operation ID in NBO // BETTER: request ID
    */
   uint32_t op_id;
 };
-GNUNET_NETWORK_STRUCT_END
 
 
 /**
  * Connect to namestore service
  */
-GNUNET_NETWORK_STRUCT_BEGIN
 struct LookupNameMessage
 {
   /**
@@ -129,6 +125,7 @@ struct LookupNameMessage
    */
   struct GNUNET_MessageHeader header;
 
+  // FIXME: use 'struct GenericMessage'
   /**
    * Operation ID in NBO
    */
@@ -143,7 +140,6 @@ struct LookupNameMessage
   /* Requested record type */
   uint32_t name_len;
 };
-GNUNET_NETWORK_STRUCT_END
 
 
 /**
@@ -151,7 +147,6 @@ GNUNET_NETWORK_STRUCT_END
  * Memory layout:
  * [struct LookupNameResponseMessage][struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded][char *name][rc_count * struct GNUNET_NAMESTORE_RecordData][struct GNUNET_CRYPTO_RsaSignature]
  */
-GNUNET_NETWORK_STRUCT_BEGIN
 struct LookupNameResponseMessage
 {
   /**
@@ -168,12 +163,12 @@ struct LookupNameResponseMessage
 
   uint16_t name_len;
 
-  uint16_t contains_sig;
+  uint16_t rd_len;
+
+  int32_t contains_sig;
 
   /* Requested record type */
-  uint16_t rd_len;
 };
-GNUNET_NETWORK_STRUCT_END
 
 
 /**
@@ -181,7 +176,6 @@ GNUNET_NETWORK_STRUCT_END
  * Memory layout:
  * [struct RecordPutMessage][struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded][char *name][rc_count * struct GNUNET_NAMESTORE_RecordData]
  */
-GNUNET_NETWORK_STRUCT_BEGIN
 struct RecordPutMessage
 {
   /**
@@ -209,12 +203,11 @@ struct RecordPutMessage
 
   struct GNUNET_CRYPTO_RsaSignature signature;
 };
-GNUNET_NETWORK_STRUCT_END
+
 
 /**
  * Put a record to the namestore response
  */
-GNUNET_NETWORK_STRUCT_BEGIN
 struct RecordPutResponseMessage
 {
   /**
@@ -234,7 +227,6 @@ struct RecordPutResponseMessage
    */
   uint16_t op_result;
 };
-GNUNET_NETWORK_STRUCT_END
 
 
 /**
@@ -242,7 +234,6 @@ GNUNET_NETWORK_STRUCT_END
  * Memory layout:
  * [struct RecordCreateMessage][char *name][rc_count * struct GNUNET_NAMESTORE_RecordData]
  */
-GNUNET_NETWORK_STRUCT_BEGIN
 struct RecordCreateMessage
 {
   /**
@@ -266,14 +257,12 @@ struct RecordCreateMessage
   /* private key length */
   uint16_t pkey_len;
 };
-GNUNET_NETWORK_STRUCT_END
 
 
 /**
  * Create a record to the namestore response
  * Memory layout:
  */
-GNUNET_NETWORK_STRUCT_BEGIN
 struct RecordCreateResponseMessage
 {
   /**
@@ -295,14 +284,12 @@ struct RecordCreateResponseMessage
 
 
 };
-GNUNET_NETWORK_STRUCT_END
 
 /**
  * Remove a record from the namestore
  * Memory layout:
  * [struct RecordRemoveMessage][char *name][struct GNUNET_NAMESTORE_RecordData]
  */
-GNUNET_NETWORK_STRUCT_BEGIN
 struct RecordRemoveMessage
 {
   /**
diff --git a/src/namestore/namestore_common.c b/src/namestore/namestore_common.c
index 44c8110bb..22a4e7736 100644
--- a/src/namestore/namestore_common.c
+++ b/src/namestore/namestore_common.c
@@ -50,7 +50,7 @@ GNUNET_NAMESTORE_records_serialize (char ** dest,
                              const struct GNUNET_NAMESTORE_RecordData *rd)
 {
   //size_t len = 0;
-  struct GNUNET_NAMESTORE_NetworkRecord * nr;
+  struct GNUNET_NAMESTORE_NetworkRecord nr;
   char * d = (*dest);
   int c = 0;
   int offset;
@@ -79,14 +79,15 @@ GNUNET_NAMESTORE_records_serialize (char ** dest,
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Serialized record [%i]: data_size %i\n", c,rd[c].data_size);
 
-    nr = (struct GNUNET_NAMESTORE_NetworkRecord *) &d[offset];
-    nr->data_size = htonl (rd[c].data_size);
-    nr->flags = htonl (rd[c].flags);
-    nr->record_type = htonl (rd[c].record_type);
-    nr->expiration = GNUNET_TIME_absolute_hton(rd[c].expiration);
+    // nr = (struct GNUNET_NAMESTORE_NetworkRecord *) &d[offset];
+    nr.data_size = htonl (rd[c].data_size);
+    nr.flags = htonl (rd[c].flags);
+    nr.record_type = htonl (rd[c].record_type);
+    nr.expiration = GNUNET_TIME_absolute_hton(rd[c].expiration);
+    memcpy (&d[offset], &nr, sizeof (nr));
+    offset += sizeof (struct GNUNET_NAMESTORE_NetworkRecord);
 
     /*put data here */
-    offset += sizeof (struct GNUNET_NAMESTORE_NetworkRecord);
     memcpy (&d[offset], rd[c].data, rd[c].data_size);
     offset += rd[c].data_size;
   }