|
@@ -11,7 +11,7 @@
|
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
Affero General Public License for more details.
|
|
|
-
|
|
|
+
|
|
|
You should have received a copy of the GNU Affero General Public License
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
@@ -38,15 +38,15 @@ static struct GNUNET_PeerIdentity pidArr[NUMBER_OF_PEERS];
|
|
|
static void
|
|
|
generatePeerIdList ()
|
|
|
{
|
|
|
- int i;
|
|
|
-
|
|
|
- for (i = 0; i < NUMBER_OF_PEERS; i++)
|
|
|
+ for (unsigned int i = 0; i < NUMBER_OF_PEERS; i++)
|
|
|
{
|
|
|
gcry_randomize (&pidArr[i],
|
|
|
sizeof (struct GNUNET_PeerIdentity),
|
|
|
GCRY_STRONG_RANDOM);
|
|
|
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
|
|
|
- "Peer %d: %s\n", i, GNUNET_i2s (&pidArr[i]));
|
|
|
+ "Peer %u: %s\n",
|
|
|
+ i,
|
|
|
+ GNUNET_i2s (&pidArr[i]));
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -54,15 +54,13 @@ generatePeerIdList ()
|
|
|
static int
|
|
|
check ()
|
|
|
{
|
|
|
- int i;
|
|
|
GNUNET_PEER_Id pid;
|
|
|
struct GNUNET_PeerIdentity res;
|
|
|
- struct GNUNET_PeerIdentity zero;
|
|
|
GNUNET_PEER_Id ids[] = { 1, 2, 3 };
|
|
|
|
|
|
GNUNET_assert (0 == GNUNET_PEER_intern (NULL));
|
|
|
/* Insert Peers into PeerEntry table and hashmap */
|
|
|
- for (i = 0; i < NUMBER_OF_PEERS; i++)
|
|
|
+ for (unsigned int i = 0; i < NUMBER_OF_PEERS; i++)
|
|
|
{
|
|
|
pid = GNUNET_PEER_intern (&pidArr[i]);
|
|
|
if (pid != (i + 1))
|
|
@@ -73,7 +71,7 @@ check ()
|
|
|
}
|
|
|
|
|
|
/* Referencing the first 3 peers once again */
|
|
|
- for (i = 0; i < 3; i++)
|
|
|
+ for (unsigned int i = 0; i < 3; i++)
|
|
|
{
|
|
|
pid = GNUNET_PEER_intern (&pidArr[i]);
|
|
|
if (pid != (i + 1))
|
|
@@ -87,25 +85,28 @@ check ()
|
|
|
GNUNET_PEER_decrement_rcs (ids, 3);
|
|
|
|
|
|
/* re-referencing the first 3 peers using the change_rc function */
|
|
|
- for (i = 1; i <= 3; i++)
|
|
|
+ for (unsigned int i = 1; i <= 3; i++)
|
|
|
GNUNET_PEER_change_rc (i, 1);
|
|
|
|
|
|
/* Removing the second Peer from the PeerEntry hash map */
|
|
|
GNUNET_PEER_change_rc (2, -2);
|
|
|
|
|
|
/* convert the pid of the first PeerEntry into that of the third */
|
|
|
- GNUNET_PEER_resolve (1, &res);
|
|
|
- GNUNET_assert (0 == memcmp (&res, &pidArr[0], sizeof (res)));
|
|
|
+ GNUNET_PEER_resolve (1,
|
|
|
+ &res);
|
|
|
+ GNUNET_assert (0 ==
|
|
|
+ GNUNET_memcmp (&res,
|
|
|
+ &pidArr[0]));
|
|
|
|
|
|
/*
|
|
|
* Attempt to convert pid = 0 (which is reserved)
|
|
|
* into a peer identity object, the peer identity memory
|
|
|
* is expected to be set to zero
|
|
|
*/
|
|
|
- memset (&zero, 0, sizeof (struct GNUNET_PeerIdentity));
|
|
|
GNUNET_log_skip (1, GNUNET_YES);
|
|
|
GNUNET_PEER_resolve (0, &res);
|
|
|
- GNUNET_assert (0 == memcmp (&res, &zero, sizeof (res)));
|
|
|
+ GNUNET_assert (0 ==
|
|
|
+ GNUNET_is_zero (&res));
|
|
|
|
|
|
/* Removing peer entries 1 and 3 from table using the list decrement function */
|
|
|
/* If count = 0, nothing should be done whatsoever */
|
|
@@ -122,10 +123,10 @@ check ()
|
|
|
int
|
|
|
main ()
|
|
|
{
|
|
|
- unsigned int i;
|
|
|
-
|
|
|
- GNUNET_log_setup ("test-peer", "ERROR", NULL);
|
|
|
- for (i = 0; i < 1; i++)
|
|
|
+ GNUNET_log_setup ("test-peer",
|
|
|
+ "ERROR",
|
|
|
+ NULL);
|
|
|
+ for (unsigned int i = 0; i < 1; i++)
|
|
|
{
|
|
|
generatePeerIdList ();
|
|
|
if (0 != check ())
|