/*
This file is part of GNUnet
- Copyright (C) 2008--2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2008--2013 GNUnet e.V.
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Affero General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ 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/>.
+
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
/**
* Generic loggins shorthand
*/
-#define LOG(kind,...) \
+#define LOG(kind, ...) \
GNUNET_log_from (kind, "testbed-api-topology", __VA_ARGS__)
*/
struct OverlayLink
{
-
/**
* An operation corresponding to this link
*/
* position of peer B's handle in peers array
*/
uint32_t B;
-
};
/**
* The type of this context
*/
- enum {
-
+ enum
+ {
/**
* Type for underlay topology
*/
TOPOLOGYCONTEXT_TYPE_UNDERLAY = 0,
-
+
/**
* Type for overlay topology
*/
TOPOLOGYCONTEXT_TYPE_OVERLAY
-
} type;
- union {
-
+ union
+ {
/**
* Topology context information for overlay topology
*/
* The size of the link array
*/
unsigned int link_array_size;
-
};
* A array of names representing topologies. Should be in sync with enum
* GNUNET_TESTBED_TopologyOption
*/
-const char *topology_strings[] = {
-
- /**
- * A clique (everyone connected to everyone else). No options. If there are N
- * peers this topology results in (N * (N -1)) connections.
- */
+static const char *topology_strings[] = {
+ /**
+ * A clique (everyone connected to everyone else). No options. If there are N
+ * peers this topology results in (N * (N -1)) connections.
+ */
"CLIQUE",
- /**
- * Small-world network (2d torus plus random links). Followed
- * by the number of random links to add (unsigned int).
- */
+ /*
+ * Small-world network (2d torus plus random links). Followed
+ * by the number of random links to add (unsigned int).
+ */
"SMALL_WORLD",
- /**
- * Small-world network (ring plus random links). Followed
- * by the number of random links to add (unsigned int).
- */
+ /**
+ * Small-world network (ring plus random links). Followed
+ * by the number of random links to add (unsigned int).
+ */
"SMALL_WORLD_RING",
- /**
- * Ring topology. No options.
- */
+ /**
+ * Ring topology. No options.
+ */
"RING",
- /**
- * 2-d torus. No options.
- */
+ /**
+ * Star topology. No options.
+ */
+ "STAR",
+
+ /**
+ * 2-d torus. No options.
+ */
"2D_TORUS",
- /**
- * Random graph. Followed by the number of random links to be established
- * (unsigned int)
- */
+ /**
+ * Random graph. Followed by the number of random links to be established
+ * (unsigned int)
+ */
"RANDOM", // GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI
- /**
- * Certain percentage of peers are unable to communicate directly
- * replicating NAT conditions. Followed by the fraction of
- * NAT'ed peers (float).
- */
+ /**
+ * Certain percentage of peers are unable to communicate directly
+ * replicating NAT conditions. Followed by the fraction of
+ * NAT'ed peers (float).
+ */
"INTERNAT",
- /**
- * Scale free topology. Followed by the maximum number of links a node can
- * have (unsigned int); and the number of links a new node should have when
- * it is added to the network (unsigned int)
- */
+ /**
+ * Scale free topology. Followed by the maximum number of links a node can
+ * have (unsigned int); and the number of links a new node should have when
+ * it is added to the network (unsigned int)
+ */
"SCALE_FREE",
- /**
- * Straight line topology. No options.
- */
+ /**
+ * Straight line topology. No options.
+ */
"LINE",
- /**
- * Read a topology from a given file. Followed by the name of the file (const char *).
- */
+ /**
+ * Read a topology from a given file. Followed by the name of the file (const char *).
+ */
"FROM_FILE",
- /**
- * All peers are disconnected. No options.
- */
+ /**
+ * All peers are disconnected. No options.
+ */
"NONE",
- /**
- * End of strings
- */
+ /**
+ * End of strings
+ */
NULL
};
* operation has executed successfully.
*/
static void
-overlay_link_completed (void *cls, struct GNUNET_TESTBED_Operation *op,
+overlay_link_completed (void *cls,
+ struct GNUNET_TESTBED_Operation *op,
const char *emsg)
{
struct OverlayLink *link = cls;
if (0 != overlay->retry_cnt)
{
LOG (GNUNET_ERROR_TYPE_WARNING,
- "Error while establishing a link: %s -- Retrying\n", emsg);
+ "Error while establishing a link: %s -- Retrying\n",
+ emsg);
retry_entry = GNUNET_new (struct RetryListEntry);
retry_entry->link = link;
- GNUNET_CONTAINER_DLL_insert_tail (overlay->rl_head, overlay->rl_tail, retry_entry);
+ GNUNET_CONTAINER_DLL_insert_tail (overlay->rl_head,
+ overlay->rl_tail,
+ retry_entry);
}
}
else
{
link = retry_entry->link;
link->op =
- GNUNET_TESTBED_overlay_connect (overlay->op_cls, &overlay_link_completed,
- link, overlay->peers[link->A],
- overlay->peers[link->B]);
+ GNUNET_TESTBED_overlay_connect (overlay->op_cls,
+ &overlay_link_completed,
+ link,
+ overlay->peers[link->A],
+ overlay->peers[link->B]);
overlay->nlinks++;
- GNUNET_CONTAINER_DLL_remove (overlay->rl_head, overlay->rl_tail, retry_entry);
+ GNUNET_CONTAINER_DLL_remove (overlay->rl_head,
+ overlay->rl_tail,
+ retry_entry);
GNUNET_free (retry_entry);
}
return;
}
if (NULL != overlay->comp_cb)
{
- overlay->comp_cb (overlay->comp_cb_cls, overlay->nsuccess, overlay->nfailures);
+ overlay->comp_cb (overlay->comp_cb_cls,
+ overlay->nsuccess,
+ overlay->nfailures);
}
}
-
/**
* Function called when a overlay connect operation is ready
*
for (p = 0; p < tc->link_array_size; p++)
{
overlay->link_array[p].op =
- GNUNET_TESTBED_overlay_connect (overlay->op_cls, &overlay_link_completed,
- &overlay->link_array[p],
- overlay->peers[overlay->link_array[p].A],
- overlay->peers[overlay->link_array[p].B]);
+ GNUNET_TESTBED_overlay_connect (overlay->op_cls,
+ &overlay_link_completed,
+ &overlay->link_array[p],
+ overlay->peers[overlay->link_array[p].A],
+ overlay->peers[overlay->link_array[p].B]);
}
}
overlay = &tc->u.overlay;
while (NULL != (retry_entry = overlay->rl_head))
{
- GNUNET_CONTAINER_DLL_remove (overlay->rl_head, overlay->rl_tail, retry_entry);
+ GNUNET_CONTAINER_DLL_remove (overlay->rl_head, overlay->rl_tail,
+ retry_entry);
GNUNET_free (retry_entry);
}
if (NULL != overlay->link_array)
* @return
*/
static void
-make_link (unsigned int offset, uint32_t A, uint32_t B,
+make_link (unsigned int offset,
+ uint32_t A,
+ uint32_t B,
struct TopologyContext *tc)
{
GNUNET_assert (A != B);
{
struct TopologyContextOverlay *overlay;
struct OverlayLink *olink;
-
+
overlay = &tc->u.overlay;
GNUNET_assert (offset < tc->link_array_size);
olink = &overlay->link_array[offset];
olink->tc = tc;
}
break;
+
case TOPOLOGYCONTEXT_TYPE_UNDERLAY:
{
struct TopologyContextUnderlay *underlay;
struct UnderlayLink *ulink;
-
+
underlay = &tc->u.underlay;
GNUNET_assert (offset < tc->link_array_size);
ulink = &underlay->link_array[offset];
case TOPOLOGYCONTEXT_TYPE_OVERLAY:
{
struct TopologyContextOverlay *overlay;
-
+
overlay = &tc->u.overlay;
overlay->link_array =
- GNUNET_malloc (sizeof (struct OverlayLink) * tc->link_array_size);
+ GNUNET_new_array (tc->link_array_size,
+ struct OverlayLink);
}
break;
+
case TOPOLOGYCONTEXT_TYPE_UNDERLAY:
{
struct TopologyContextUnderlay *underlay;
-
+
underlay = &tc->u.underlay;
underlay->link_array =
- GNUNET_malloc (sizeof (struct UnderlayLink) * tc->link_array_size);
+ GNUNET_new_array (tc->link_array_size,
+ struct UnderlayLink);
}
break;
}
}
+/**
+ * Generates star topology
+ *
+ * @param tc the topology context
+ */
+static void
+gen_topo_star (struct TopologyContext *tc)
+{
+ unsigned int cnt;
+
+ tc->link_array_size = tc->num_peers - 1;
+ switch (tc->type)
+ {
+ case TOPOLOGYCONTEXT_TYPE_OVERLAY:
+ {
+ struct TopologyContextOverlay *overlay;
+
+ overlay = &tc->u.overlay;
+ overlay->link_array =
+ GNUNET_new_array (tc->link_array_size,
+ struct OverlayLink);
+ }
+ break;
+
+ case TOPOLOGYCONTEXT_TYPE_UNDERLAY:
+ {
+ struct TopologyContextUnderlay *underlay;
+
+ underlay = &tc->u.underlay;
+ underlay->link_array =
+ GNUNET_new_array (tc->link_array_size,
+ struct UnderlayLink);
+ }
+ break;
+ }
+ for (cnt = tc->link_array_size; cnt; cnt--)
+ make_link (cnt - 1,
+ 0,
+ cnt,
+ tc);
+}
+
+
/**
* Generates ring topology
*
overlay = &tc->u.overlay;
overlay->link_array =
- GNUNET_realloc (overlay->link_array, sizeof (struct OverlayLink) *
- tc->link_array_size);
+ GNUNET_realloc (overlay->link_array, sizeof(struct OverlayLink)
+ * tc->link_array_size);
}
break;
+
case TOPOLOGYCONTEXT_TYPE_UNDERLAY:
{
struct TopologyContextUnderlay *underlay;
-
+
underlay = &tc->u.underlay;
underlay->link_array =
- GNUNET_realloc (underlay->link_array, sizeof (struct UnderlayLink) *
- tc->link_array_size);
+ GNUNET_realloc (underlay->link_array, sizeof(struct UnderlayLink)
+ * tc->link_array_size);
}
break;
}
sq = floor (sq);
sq_floor = (unsigned int) sq;
_rows = (sq_floor + 1);
- _rows_len = GNUNET_malloc (sizeof (unsigned int) * _rows);
+ _rows_len = GNUNET_malloc (sizeof(unsigned int) * _rows);
for (y = 0; y < _rows - 1; y++)
_rows_len[y] = sq_floor;
_num_peers = sq_floor * sq_floor;
unsigned int offset;
tc->link_array_size =
- GNUNET_TESTBED_2dtorus_calc_links (tc->num_peers, &rows, &rows_len);
+ GNUNET_TESTBED_2dtorus_calc_links (tc->num_peers, &rows, &rows_len);
switch (tc->type)
{
case TOPOLOGYCONTEXT_TYPE_OVERLAY:
{
struct TopologyContextOverlay *overlay;
-
+
overlay = &tc->u.overlay;
overlay->link_array =
- GNUNET_malloc (sizeof (struct OverlayLink) * tc->link_array_size);
+ GNUNET_malloc (sizeof(struct OverlayLink) * tc->link_array_size);
}
break;
+
case TOPOLOGYCONTEXT_TYPE_UNDERLAY:
{
struct TopologyContextUnderlay *underlay;
underlay = &tc->u.underlay;
underlay->link_array =
- GNUNET_malloc (sizeof (struct UnderlayLink) * tc->link_array_size);
+ GNUNET_malloc (sizeof(struct UnderlayLink) * tc->link_array_size);
break;
}
}
*
* @param tc the topology context
* @param links the number of random links to establish
- * @param append GNUNET_YES to add links to existing link array; GNUNET_NO to
+ * @param append #GNUNET_YES to add links to existing link array; #GNUNET_NO to
* create a new link array
*/
static void
-gen_topo_random (struct TopologyContext *tc, unsigned int links, int append)
+gen_topo_random (struct TopologyContext *tc,
+ unsigned int links,
+ int append)
{
unsigned int cnt;
unsigned int index;
{
GNUNET_assert (NULL == overlay->link_array);
overlay->link_array =
- GNUNET_malloc (sizeof (struct OverlayLink) * tc->link_array_size);
+ GNUNET_malloc (sizeof(struct OverlayLink) * tc->link_array_size);
break;
}
- GNUNET_assert ((0 < tc->link_array_size) && (NULL != overlay->link_array));
+ GNUNET_assert ((0 < tc->link_array_size) && (NULL !=
+ overlay->link_array));
overlay->link_array =
- GNUNET_realloc (overlay->link_array,
- sizeof (struct OverlayLink) * tc->link_array_size);
+ GNUNET_realloc (overlay->link_array,
+ sizeof(struct OverlayLink) * tc->link_array_size);
break;
}
+
case TOPOLOGYCONTEXT_TYPE_UNDERLAY:
{
struct TopologyContextUnderlay *underlay;
{
GNUNET_assert (NULL == underlay->link_array);
underlay->link_array =
- GNUNET_malloc (sizeof (struct UnderlayLink) * tc->link_array_size);
+ GNUNET_malloc (sizeof(struct UnderlayLink) * tc->link_array_size);
break;
}
- GNUNET_assert ((0 < tc->link_array_size) && (NULL != underlay->link_array));
+ GNUNET_assert ((0 < tc->link_array_size) && (NULL !=
+ underlay->link_array));
underlay->link_array =
- GNUNET_realloc (underlay->link_array,
- sizeof (struct UnderlayLink) * tc->link_array_size);
+ GNUNET_realloc (underlay->link_array,
+ sizeof(struct UnderlayLink) * tc->link_array_size);
break;
}
}
do
{
A_rand =
- GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, tc->num_peers);
+ GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, tc->num_peers);
B_rand =
- GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, tc->num_peers);
+ GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, tc->num_peers);
}
while (A_rand == B_rand);
- make_link (index+cnt, A_rand, B_rand, tc);
+ make_link (index + cnt, A_rand, B_rand, tc);
}
}
* network
*/
static void
-gen_topo_scale_free (struct TopologyContext *tc, uint16_t cap, uint8_t m)
+gen_topo_scale_free (struct TopologyContext *tc,
+ uint16_t cap,
+ uint8_t m)
{
unsigned int *deg;
unsigned int *etab;
struct TopologyContextOverlay *overlay;
overlay = &tc->u.overlay;
- overlay->link_array = GNUNET_malloc_large (sizeof (struct OverlayLink) *
- tc->link_array_size);
+ overlay->link_array = GNUNET_malloc_large (sizeof(struct OverlayLink)
+ * tc->link_array_size);
}
break;
+
case TOPOLOGYCONTEXT_TYPE_UNDERLAY:
{
struct TopologyContextUnderlay *underlay;
underlay = &tc->u.underlay;
- underlay->link_array = GNUNET_malloc_large (sizeof (struct UnderlayLink) *
- tc->link_array_size);
+ underlay->link_array = GNUNET_malloc_large (sizeof(struct UnderlayLink)
+ * tc->link_array_size);
}
break;
}
- etab = GNUNET_malloc_large (sizeof (unsigned int) * 2 * tc->link_array_size);
- deg = GNUNET_malloc (sizeof (unsigned int) * tc->num_peers);
- used = GNUNET_malloc (sizeof (unsigned int) * m);
+ etab = GNUNET_malloc_large (sizeof(unsigned int) * 2 * tc->link_array_size);
+ deg = GNUNET_malloc (sizeof(unsigned int) * tc->num_peers);
+ used = GNUNET_malloc (sizeof(unsigned int) * m);
/* start by connecting peer 1 to peer 0 */
make_link (0, 0, 1, tc);
deg[0]++;
for (cnt = 0; cnt < GNUNET_MIN (peer, m); cnt++)
{
redo_threshold = 0;
- redo:
+redo:
off = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, etaboff);
random_peer = etab[off];
if (cap < deg[random_peer])
case TOPOLOGYCONTEXT_TYPE_OVERLAY:
{
struct TopologyContextOverlay *overlay;
-
+
overlay = &tc->u.overlay;
- overlay->link_array =
- GNUNET_realloc (overlay->link_array, sizeof (struct OverlayLink) * tc->link_array_size);
+ overlay->link_array =
+ GNUNET_realloc (overlay->link_array, sizeof(struct OverlayLink)
+ * tc->link_array_size);
}
break;
+
case TOPOLOGYCONTEXT_TYPE_UNDERLAY:
{
struct TopologyContextUnderlay *underlay;
underlay = &tc->u.underlay;
underlay->link_array =
- GNUNET_realloc (underlay->link_array, sizeof (struct UnderlayLink) * tc->link_array_size);
+ GNUNET_realloc (underlay->link_array, sizeof(struct UnderlayLink)
+ * tc->link_array_size);
}
break;
}
* @param filename the filename of the file containing topology data
*/
static void
-gen_topo_from_file (struct TopologyContext *tc, const char *filename)
+gen_topo_from_file (struct TopologyContext *tc,
+ const char *filename)
{
char *data;
char *end;
unsigned long int other_peer_id;
enum ParseState
{
-
/**
* We read the peer index
*/
* We read the other peer indices
*/
OTHER_PEER_INDEX,
-
} state;
int status;
status = GNUNET_SYSERR;
if (GNUNET_YES != GNUNET_DISK_file_test (filename))
{
- LOG (GNUNET_ERROR_TYPE_ERROR, _("Topology file %s not found\n"), filename);
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _ ("Topology file %s not found\n"),
+ filename);
return;
}
if (GNUNET_OK !=
GNUNET_DISK_file_size (filename, &fs, GNUNET_YES, GNUNET_YES))
{
- LOG (GNUNET_ERROR_TYPE_ERROR, _("Topology file %s has no data\n"),
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _ ("Topology file %s has no data\n"),
filename);
return;
}
data = GNUNET_malloc (fs);
if (fs != GNUNET_DISK_fn_read (filename, data, fs))
{
- LOG (GNUNET_ERROR_TYPE_ERROR, _("Topology file %s cannot be read\n"),
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _ ("Topology file %s cannot be read\n"),
filename);
goto _exit;
}
state = PEER_INDEX;
while (offset < fs)
{
- if (0 != isspace (data[offset]))
+ if (0 != isspace ((unsigned char) data[offset]))
{
offset++;
continue;
if (NULL == buf)
{
LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to read peer index from toology file: %s"), filename);
+ _ ("Failed to read peer index from toology file: %s"), filename);
goto _exit;
}
*buf = '\0';
if (0 != errno)
{
LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Value in given topology file: %s out of range\n"), filename);
+ _ ("Value in given topology file: %s out of range\n"), filename);
goto _exit;
}
if (&data[offset] == end)
{
LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to read peer index from topology file: %s"), filename);
+ _ ("Failed to read peer index from topology file: %s"), filename);
goto _exit;
}
if (tc->num_peers <= peer_id)
{
LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Topology file needs more peers than given ones\n"), filename);
+ _ ("Topology file needs more peers than given ones\n"), filename);
goto _exit;
}
state = OTHER_PEER_INDEX;
offset += ((unsigned int) (buf - &data[offset])) + 1;
break;
+
case OTHER_PEER_INDEX:
errno = 0;
other_peer_id = (unsigned int) strtoul (&data[offset], &end, 10);
if (0 != errno)
{
LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Value in given topology file: %s out of range\n"), filename);
+ _ ("Value in given topology file: %s out of range\n"), filename);
goto _exit;
}
if (&data[offset] == end)
{
LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to read peer index from topology file: %s"), filename);
+ _ ("Failed to read peer index from topology file: %s"), filename);
goto _exit;
}
if (tc->num_peers <= other_peer_id)
{
LOG (GNUNET_ERROR_TYPE_ERROR,
- _("Topology file needs more peers than given ones\n"), filename);
+ _ ("Topology file needs more peers than given ones\n"), filename);
goto _exit;
}
if (peer_id != other_peer_id)
case TOPOLOGYCONTEXT_TYPE_OVERLAY:
{
struct TopologyContextOverlay *overlay;
-
+
overlay = &tc->u.overlay;
- overlay->link_array =
- GNUNET_realloc (overlay->link_array,
- sizeof (struct OverlayLink) * tc->link_array_size);
+ overlay->link_array =
+ GNUNET_realloc (overlay->link_array,
+ sizeof(struct OverlayLink) * tc->link_array_size);
}
break;
+
case TOPOLOGYCONTEXT_TYPE_UNDERLAY:
{
struct TopologyContextUnderlay *underlay;
-
+
underlay = &tc->u.underlay;
underlay->link_array =
- GNUNET_realloc (underlay->link_array,
- sizeof (struct UnderlayLink) * tc->link_array_size);
+ GNUNET_realloc (underlay->link_array,
+ sizeof(struct UnderlayLink)
+ * tc->link_array_size);
}
break;
}
}
else
LOG (GNUNET_ERROR_TYPE_WARNING,
- _("Ignoring to connect peer %u to peer %u\n"), peer_id,
+ _ ("Ignoring to connect peer %u to peer %u\n"),
+ peer_id,
other_peer_id);
while (('\n' != data[offset]) && ('|' != data[offset]) && (offset < fs))
offset++;
- if ('\n' == data[offset])
+ if ((offset < fs) &&
+ ('\n' == data[offset]))
state = PEER_INDEX;
- else if ('|' == data[offset])
+ else if ((offset < fs) &&
+ ('|' == data[offset]))
{
state = OTHER_PEER_INDEX;
offset++;
GNUNET_free (data);
if (GNUNET_OK != status)
{
- LOG (GNUNET_ERROR_TYPE_WARNING, "Removing link data read from the file\n");
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Removing link data read from the file\n");
tc->link_array_size = 0;
switch (tc->type)
{
case TOPOLOGYCONTEXT_TYPE_OVERLAY:
{
struct TopologyContextOverlay *overlay;
-
+
overlay = &tc->u.overlay;
GNUNET_free_non_null (overlay->link_array);
overlay->link_array = NULL;
}
break;
+
case TOPOLOGYCONTEXT_TYPE_UNDERLAY:
{
struct TopologyContextUnderlay *underlay;
-
+
underlay = &tc->u.underlay;
GNUNET_free_non_null (underlay->link_array);
underlay->link_array = NULL;
unsigned int cnt;
unsigned int offset;
unsigned int neighbour;
-
+
tc->link_array_size = tc->num_peers * (tc->num_peers - 1);
switch (tc->type)
{
struct TopologyContextOverlay *overlay;
overlay = &tc->u.overlay;
- overlay->link_array = GNUNET_malloc (sizeof (struct OverlayLink) *
- tc->link_array_size);
+ overlay->link_array = GNUNET_new_array (tc->link_array_size,
+ struct OverlayLink);
}
break;
+
case TOPOLOGYCONTEXT_TYPE_UNDERLAY:
{
struct TopologyContextUnderlay *underlay;
underlay = &tc->u.underlay;
- underlay->link_array = GNUNET_malloc (sizeof (struct UnderlayLink) *
- tc->link_array_size);
+ underlay->link_array = GNUNET_new_array (tc->link_array_size,
+ struct UnderlayLink);
}
}
offset = 0;
* Configure overall network topology to have a particular shape.
*
* @param op_cls closure argument to give with the operation event
- * @param num_peers number of peers in 'peers'
- * @param peers array of 'num_peers' with the peers to configure
+ * @param num_peers number of peers in @a peers
+ * @param peers array of @a num_peers with the peers to configure
* @param topo desired underlay topology to use
* @param ap topology-specific options
* @return handle to the operation, NULL if configuring the topology
* Configure overall network topology to have a particular shape.
*
* @param op_cls closure argument to give with the operation event
- * @param num_peers number of peers in 'peers'
- * @param peers array of 'num_peers' with the peers to configure
+ * @param num_peers number of peers in @a peers
+ * @param peers array of @a num_peers with the peers to configure
* @param topo desired underlay topology to use
* @param ... topology-specific options
* @return handle to the operation, NULL if configuring the topology
*
* @param op_cls closure argument to give with the peer connect operation events
* generated through this function
- * @param num_peers number of peers in 'peers'
- * @param peers array of 'num_peers' with the peers to configure
+ * @param num_peers number of peers in @a peers
+ * @param peers array of @a num_peers with the peers to configure
* @param max_connections the maximums number of overlay connections that will
* be made to achieve the given topology
* @param comp_cb the completion callback to call when the topology generation
GNUNET_TESTBED_TopologyCompletionCallback
comp_cb,
void *comp_cb_cls,
- enum GNUNET_TESTBED_TopologyOption topo,
+ enum GNUNET_TESTBED_TopologyOption
+ topo,
va_list va)
{
struct TopologyContext *tc;
case GNUNET_TESTBED_TOPOLOGY_LINE:
gen_topo_line (tc);
break;
+
+ case GNUNET_TESTBED_TOPOLOGY_STAR:
+ gen_topo_star (tc);
+ break;
+
case GNUNET_TESTBED_TOPOLOGY_RING:
gen_topo_ring (tc);
break;
+
case GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI:
gen_topo_random (tc, va_arg (va, unsigned int), GNUNET_NO);
break;
+
case GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD_RING:
gen_topo_ring (tc);
gen_topo_random (tc, va_arg (va, unsigned int), GNUNET_YES);
break;
+
case GNUNET_TESTBED_TOPOLOGY_CLIQUE:
gen_topo_clique (tc);
break;
+
case GNUNET_TESTBED_TOPOLOGY_2D_TORUS:
gen_topo_2dtorus (tc);
break;
+
case GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD:
gen_topo_2dtorus (tc);
gen_topo_random (tc, va_arg (va, unsigned int), GNUNET_YES);
break;
+
case GNUNET_TESTBED_TOPOLOGY_SCALE_FREE:
{
uint16_t cap;
gen_topo_scale_free (tc, cap, m);
}
break;
+
case GNUNET_TESTBED_TOPOLOGY_FROM_FILE:
- {
- const char *filename;
+ {
+ const char *filename;
- filename = va_arg (va, const char *);
+ filename = va_arg (va, const char *);
- GNUNET_assert (NULL != filename);
- gen_topo_from_file (tc, filename);
- }
+ GNUNET_assert (NULL != filename);
+ gen_topo_from_file (tc, filename);
+ }
break;
+
default:
GNUNET_break (0);
GNUNET_free (tc);
}
do
{
- secondary_option = va_arg (va, enum GNUNET_TESTBED_TopologyOption);
+ secondary_option = GNUNET_VA_ARG_ENUM (va, GNUNET_TESTBED_TopologyOption);
switch (secondary_option)
{
case GNUNET_TESTBED_TOPOLOGY_RETRY_CNT:
- overlay->retry_cnt = va_arg (va, unsigned int);
+ overlay->retry_cnt = va_arg (va, unsigned int);
break;
+
case GNUNET_TESTBED_TOPOLOGY_OPTION_END:
break;
+
default:
GNUNET_break (0); /* Should not use any other option apart from
* the ones handled here */
&opstart_overlay_configure_topology,
&oprelease_overlay_configure_topology);
GNUNET_TESTBED_operation_queue_insert_
- (c->opq_parallel_topology_config_operations, op);
+ (c->opq_parallel_topology_config_operations, op);
GNUNET_TESTBED_operation_begin_wait_ (op);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Generated %u connections\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Generated %u connections\n",
tc->link_array_size);
if (NULL != max_connections)
*max_connections = tc->link_array_size;
GNUNET_TESTBED_TopologyCompletionCallback
comp_cb,
void *comp_cb_cls,
- enum GNUNET_TESTBED_TopologyOption topo,
+ enum GNUNET_TESTBED_TopologyOption
+ topo,
...)
{
struct GNUNET_TESTBED_Operation *op;
* @param topology where to write the retrieved topology
* @param topology_string The string to attempt to
* get a configuration value from
- * @return GNUNET_YES if topology string matched a
- * known topology, GNUNET_NO if not
+ * @return #GNUNET_YES if topology string matched a
+ * known topology, #GNUNET_NO if not
*/
int
GNUNET_TESTBED_topology_get_ (enum GNUNET_TESTBED_TopologyOption *topology,
{
if (NULL != topology)
*topology = (enum GNUNET_TESTBED_TopologyOption) cnt;
+ GNUNET_assert (GNUNET_TESTBED_TOPOLOGY_OPTION_END !=
+ (enum GNUNET_TESTBED_TopologyOption) cnt);
return GNUNET_YES;
}
}
* generated
* @param proc the underlay link processor callback. Will be called for each
* underlay link generated unless a previous call to this callback
- * returned GNUNET_SYSERR. Cannot be NULL.
- * @param cls closure for proc
+ * returned #GNUNET_SYSERR. Cannot be NULL.
+ * @param cls closure for @a proc
* @param ... variable arguments denoting the topology and its parameters. They
* should start with the type of topology to generate followed by their
* options.
- * @return GNUNET_OK if underlay link generation is successful; GNUNET_SYSERR
+ * @return #GNUNET_OK if underlay link generation is successful; #GNUNET_SYSERR
* upon error in generating the underlay or if any calls to the
- * underlay link processor returned GNUNET_SYSERR
+ * underlay link processor returned #GNUNET_SYSERR
*/
int
GNUNET_TESTBED_underlay_construct_ (int num_peers,
enum GNUNET_TESTBED_TopologyOption topology;
unsigned int cnt;
int ret;
-
+
GNUNET_assert (NULL != proc);
ret = GNUNET_OK;
- memset (&tc, 0, sizeof (tc));
+ memset (&tc, 0, sizeof(tc));
tc.num_peers = num_peers;
tc.type = TOPOLOGYCONTEXT_TYPE_UNDERLAY;
underlay = &tc.u.underlay;
va_start (vargs, cls);
- topology = va_arg (vargs, enum GNUNET_TESTBED_TopologyOption);
+ topology = GNUNET_VA_ARG_ENUM (vargs, GNUNET_TESTBED_TopologyOption);
switch (topology)
{
case GNUNET_TESTBED_TOPOLOGY_LINE:
gen_topo_line (&tc);
break;
+
+ case GNUNET_TESTBED_TOPOLOGY_STAR:
+ gen_topo_star (&tc);
+ break;
+
case GNUNET_TESTBED_TOPOLOGY_RING:
gen_topo_ring (&tc);
break;
+
case GNUNET_TESTBED_TOPOLOGY_CLIQUE:
gen_topo_clique (&tc);
break;
+
case GNUNET_TESTBED_TOPOLOGY_2D_TORUS:
gen_topo_2dtorus (&tc);
break;
+
case GNUNET_TESTBED_TOPOLOGY_ERDOS_RENYI:
gen_topo_random (&tc, va_arg (vargs, unsigned int), GNUNET_NO);
break;
+
case GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD_RING:
gen_topo_ring (&tc);
gen_topo_random (&tc, va_arg (vargs, unsigned int), GNUNET_YES);
break;
+
case GNUNET_TESTBED_TOPOLOGY_SMALL_WORLD:
gen_topo_2dtorus (&tc);
gen_topo_random (&tc, va_arg (vargs, unsigned int), GNUNET_YES);
break;
+
case GNUNET_TESTBED_TOPOLOGY_FROM_FILE:
{
const char *filename;
gen_topo_from_file (&tc, filename);
}
break;
+
case GNUNET_TESTBED_TOPOLOGY_SCALE_FREE:
{
uint16_t cap;
gen_topo_scale_free (&tc, cap, m);
}
break;
+
default:
GNUNET_assert (0);
}
return ret;
}
+
/* end of testbed_api_topology.c */
projects / oweals / gnunet.git / blobdiff