[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7084 - in GNUnet/src: applications/fs/collection util/pseu
From: |
gnunet |
Subject: |
[GNUnet-SVN] r7084 - in GNUnet/src: applications/fs/collection util/pseudonym |
Date: |
Sat, 7 Jun 2008 20:24:35 -0600 (MDT) |
Author: grothoff
Date: 2008-06-07 20:24:35 -0600 (Sat, 07 Jun 2008)
New Revision: 7084
Modified:
GNUnet/src/applications/fs/collection/collection.c
GNUnet/src/util/pseudonym/info_test.c
Log:
fixes
Modified: GNUnet/src/applications/fs/collection/collection.c
===================================================================
--- GNUnet/src/applications/fs/collection/collection.c 2008-06-07 23:56:13 UTC
(rev 7083)
+++ GNUnet/src/applications/fs/collection/collection.c 2008-06-08 02:24:35 UTC
(rev 7084)
@@ -171,7 +171,7 @@
return;
}
if ((size > 0x7FFFFFFF) ||
- (size < sizeof (CollectionData) + 3 * sizeof (int)))
+ (size < sizeof (CollectionData) + 2 * sizeof (int)))
{
GNUNET_GE_BREAK (ectx, 0);
UNLINK (fn);
@@ -203,8 +203,6 @@
memcpy (&collectionData->data, buf, sizeof (CollectionData));
pos = &buf[sizeof (CollectionData)];
rsize -= sizeof (CollectionData);
- if (rsize < 2 * sizeof (int))
- goto ERR;
len = ntohl (*(int *) pos);
if (len > 1024 * 1024 * 4)
goto ERR;
Modified: GNUnet/src/util/pseudonym/info_test.c
===================================================================
--- GNUnet/src/util/pseudonym/info_test.c 2008-06-07 23:56:13 UTC (rev
7083)
+++ GNUnet/src/util/pseudonym/info_test.c 2008-06-08 02:24:35 UTC (rev
7084)
@@ -61,7 +61,6 @@
int old;
int newVal;
struct GNUNET_GC_Configuration *cfg;
- struct GNUNET_GE_Context *ectx;
char *name1;
char *name2;
@@ -75,32 +74,31 @@
return -1;
}
/* ACTUAL TEST CODE */
- old = GNUNET_pseudonym_list_all (ectx, cfg, NULL, NULL);
+ old = GNUNET_pseudonym_list_all (NULL, cfg, NULL, NULL);
meta = GNUNET_meta_data_create ();
GNUNET_meta_data_insert (meta, EXTRACTOR_TITLE, "test");
GNUNET_create_random_hash (&id1);
- GNUNET_pseudonym_add (ectx, cfg, &id1, meta);
- newVal = GNUNET_pseudonym_list_all (ectx, cfg, &iter, &ok);
+ GNUNET_pseudonym_add (NULL, cfg, &id1, meta);
+ newVal = GNUNET_pseudonym_list_all (NULL, cfg, &iter, &ok);
CHECK (old < newVal);
old = newVal;
- name1 = GNUNET_pseudonym_id_to_name (ectx, cfg, &id1);
GNUNET_create_random_hash (&id2);
- GNUNET_pseudonym_add (ectx, cfg, &id2, meta);
- newVal = GNUNET_pseudonym_list_all (ectx, cfg, &iter, &ok);
+ GNUNET_pseudonym_add (NULL, cfg, &id2, meta);
+ newVal = GNUNET_pseudonym_list_all (NULL, cfg, &iter, &ok);
CHECK (old < newVal);
- name2 = GNUNET_pseudonym_id_to_name (ectx, cfg, &id2);
+ name2 = GNUNET_pseudonym_id_to_name (NULL, cfg, &id2);
CHECK (name2 != NULL);
- name1 = GNUNET_pseudonym_id_to_name (ectx, cfg, &id1);
+ name1 = GNUNET_pseudonym_id_to_name (NULL, cfg, &id1);
CHECK (name1 != NULL);
CHECK (0 != strcmp (name1, name2));
- CHECK (GNUNET_OK == GNUNET_pseudonym_name_to_id (ectx, cfg, name2, &rid2));
- CHECK (GNUNET_OK == GNUNET_pseudonym_name_to_id (ectx, cfg, name1, &rid1));
+ CHECK (GNUNET_OK == GNUNET_pseudonym_name_to_id (NULL, cfg, name2, &rid2));
+ CHECK (GNUNET_OK == GNUNET_pseudonym_name_to_id (NULL, cfg, name1, &rid1));
CHECK (0 == memcmp (&id1, &rid1, sizeof (GNUNET_HashCode)));
CHECK (0 == memcmp (&id2, &rid2, sizeof (GNUNET_HashCode)));
- CHECK (0 == GNUNET_pseudonym_rank (ectx, cfg, &id1, 0));
- CHECK (5 == GNUNET_pseudonym_rank (ectx, cfg, &id1, 5));
- CHECK (-5 == GNUNET_pseudonym_rank (ectx, cfg, &id1, -10));
- CHECK (0 == GNUNET_pseudonym_rank (ectx, cfg, &id1, 5));
+ CHECK (0 == GNUNET_pseudonym_rank (NULL, cfg, &id1, 0));
+ CHECK (5 == GNUNET_pseudonym_rank (NULL, cfg, &id1, 5));
+ CHECK (-5 == GNUNET_pseudonym_rank (NULL, cfg, &id1, -10));
+ CHECK (0 == GNUNET_pseudonym_rank (NULL, cfg, &id1, 5));
GNUNET_free (name1);
GNUNET_free (name2);
/* END OF TEST CODE */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7084 - in GNUnet/src: applications/fs/collection util/pseudonym,
gnunet <=