[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26469 - gnunet/src/dv
From: |
gnunet |
Subject: |
[GNUnet-SVN] r26469 - gnunet/src/dv |
Date: |
Mon, 18 Mar 2013 11:56:52 +0100 |
Author: grothoff
Date: 2013-03-18 11:56:52 +0100 (Mon, 18 Mar 2013)
New Revision: 26469
Modified:
gnunet/src/dv/gnunet-service-dv.c
gnunet/src/dv/test_transport_api_dv.c
Log:
-fix
Modified: gnunet/src/dv/gnunet-service-dv.c
===================================================================
--- gnunet/src/dv/gnunet-service-dv.c 2013-03-18 10:44:15 UTC (rev 26468)
+++ gnunet/src/dv/gnunet-service-dv.c 2013-03-18 10:56:52 UTC (rev 26469)
@@ -740,7 +740,7 @@
return; /* is a DV-neighbor */
GNUNET_STATISTICS_update (stats,
"# peers connected (1-hop)",
- -1 1, GNUNET_NO);
+ 1, GNUNET_NO);
neighbor = GNUNET_malloc (sizeof (struct DirectNeighbor));
neighbor->peer = *peer;
GNUNET_assert (GNUNET_YES ==
@@ -1386,7 +1386,7 @@
}
GNUNET_STATISTICS_update (stats,
"# peers connected (1-hop)",
- -1 1, GNUNET_NO);
+ -1, GNUNET_NO);
cleanup_neighbor (neighbor);
GNUNET_CONTAINER_multihashmap_iterate (direct_neighbors,
&refresh_routes,
Modified: gnunet/src/dv/test_transport_api_dv.c
===================================================================
--- gnunet/src/dv/test_transport_api_dv.c 2013-03-18 10:44:15 UTC (rev
26468)
+++ gnunet/src/dv/test_transport_api_dv.c 2013-03-18 10:56:52 UTC (rev
26469)
@@ -484,6 +484,7 @@
{NULL, 0, 0}
};
+
/**
* Notify of all peer1's peers, once peer 2 is found, schedule connect
* to peer two for message send.
@@ -525,6 +526,7 @@
}
}
+
static void
init_notify_peer2 (void *cls, struct GNUNET_CORE_Handle *server,
const struct GNUNET_PeerIdentity *my_identity)
@@ -535,6 +537,7 @@
total_server_connections++;
}
+
/**
* Notify of all peer1's peers, once peer 2 is found, schedule connect
* to peer two for message send.
@@ -566,6 +569,7 @@
}
}
+
static void
init_notify_peer1 (void *cls, struct GNUNET_CORE_Handle *server,
const struct GNUNET_PeerIdentity *my_identity)
@@ -624,6 +628,7 @@
}
}
+
static void
send_other_messages (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
@@ -706,6 +711,7 @@
"from send_other_messages");
}
+
static void
topology_callback (void *cls, const struct GNUNET_PeerIdentity *first,
const struct GNUNET_PeerIdentity *second, uint32_t distance,
@@ -860,6 +866,7 @@
}
}
+
static void
peers_started_callback (void *cls, const struct GNUNET_PeerIdentity *id,
const struct GNUNET_CONFIGURATION_Handle *cfg,
@@ -926,6 +933,7 @@
}
}
+
/**
* Callback indicating that the hostkey was created for a peer.
*
@@ -981,6 +989,7 @@
}
}
+
static void
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
@@ -1116,8 +1125,9 @@
}
-static int
-check ()
+
+int
+main (int argc, char *argv[])
{
int ret;
@@ -1129,6 +1139,9 @@
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
+ GNUNET_log_setup ("test-transport-dv",
+ "WARNING",
+ NULL);
ret =
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
"test-transport-dv", "nohelp", options, &run, &ok);
@@ -1137,18 +1150,6 @@
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"`test-transport-dv': Failed with error code %d\n", ret);
}
- return ok;
-}
-
-int
-main (int argc, char *argv[])
-{
- int ret;
-
- GNUNET_log_setup ("test-transport-dv",
- "WARNING",
- NULL);
- ret = check ();
/**
* Need to remove base directory, subdirectories taken care
* of by the testing framework.
@@ -1158,7 +1159,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Failed to remove testing directory %s\n", test_directory);
}
- return ret;
+ return (GNUNET_OK == ret) ? 0 : 1;
}
/* end of test_transport_api_dv.c */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26469 - gnunet/src/dv,
gnunet <=