[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22392 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r22392 - gnunet/src/testbed |
Date: |
Fri, 29 Jun 2012 17:26:52 +0200 |
Author: harsha
Date: 2012-06-29 17:26:52 +0200 (Fri, 29 Jun 2012)
New Revision: 22392
Modified:
gnunet/src/testbed/testbed_api.c
gnunet/src/testbed/testbed_api_hosts.c
gnunet/src/testbed/testbed_api_hosts.h
Log:
-host registration with controller
Modified: gnunet/src/testbed/testbed_api.c
===================================================================
--- gnunet/src/testbed/testbed_api.c 2012-06-29 15:16:37 UTC (rev 22391)
+++ gnunet/src/testbed/testbed_api.c 2012-06-29 15:26:52 UTC (rev 22392)
@@ -255,7 +255,7 @@
if (sizeof (struct GNUNET_TESTBED_HostConfirmedMessage) == msg_size)
{
LOG_DEBUG ("Host %u successfully registered\n", ntohl (msg->host_id));
- GNUNET_TESTBED_mark_host_as_registered_ (rh->host);
+ GNUNET_TESTBED_mark_host_as_registered_ (rh->host, c);
rh->cc (rh->cc_cls, NULL);
GNUNET_free (rh);
return GNUNET_OK;
@@ -541,7 +541,7 @@
if (NULL != controller->rh)
return NULL;
hostname = GNUNET_TESTBED_host_get_hostname_ (host);
- if (GNUNET_YES == GNUNET_TESTBED_is_host_registered_ (host))
+ if (GNUNET_YES == GNUNET_TESTBED_is_host_registered_ (host, controller))
{
LOG (GNUNET_ERROR_TYPE_WARNING,
"Host hostname: %s already registered\n",
@@ -638,9 +638,9 @@
uint16_t msg_size;
GNUNET_assert (GNUNET_YES ==
- GNUNET_TESTBED_is_host_registered_ (delegated_host));
+ GNUNET_TESTBED_is_host_registered_ (delegated_host, master));
GNUNET_assert (GNUNET_YES ==
- GNUNET_TESTBED_is_host_registered_ (slave_host));
+ GNUNET_TESTBED_is_host_registered_ (slave_host, master));
config = GNUNET_CONFIGURATION_serialize (slave_cfg, &config_size);
cc_size = compressBound ((uLong) config_size);
cconfig = GNUNET_malloc (cc_size);
Modified: gnunet/src/testbed/testbed_api_hosts.c
===================================================================
--- gnunet/src/testbed/testbed_api_hosts.c 2012-06-29 15:16:37 UTC (rev
22391)
+++ gnunet/src/testbed/testbed_api_hosts.c 2012-06-29 15:26:52 UTC (rev
22392)
@@ -64,6 +64,11 @@
const char *username;
/**
+ * The controller at which this host is registered
+ */
+ const struct GNUNET_TESTBED_Controller *controller;
+
+ /**
* Global ID we use to refer to a host on the network
*/
uint32_t unique_id;
@@ -73,10 +78,6 @@
*/
uint16_t port;
- /**
- * Set this flag to 1 if host is registered with a controller; 0 if not
- */
- uint8_t is_registered;
};
@@ -385,11 +386,14 @@
* Marks a host as registered with a controller
*
* @param host the host to mark
+ * @param controller the controller at which this host is registered
*/
void
-GNUNET_TESTBED_mark_host_as_registered_ (struct GNUNET_TESTBED_Host *host)
+GNUNET_TESTBED_mark_host_as_registered_ (struct GNUNET_TESTBED_Host *host,
+ const struct GNUNET_TESTBED_Controller
+ *controller)
{
- host->is_registered = 1;
+ host->controller = controller;
}
@@ -397,12 +401,15 @@
* Checks whether a host has been registered
*
* @param host the host to check
+ * @param controller the controller at which host's registration is checked
* @return GNUNET_YES if registered; GNUNET_NO if not
*/
int
-GNUNET_TESTBED_is_host_registered_ (const struct GNUNET_TESTBED_Host *host)
+GNUNET_TESTBED_is_host_registered_ (const struct GNUNET_TESTBED_Host *host,
+ const struct GNUNET_TESTBED_Controller
+ *controller)
{
- return (1 == host->is_registered) ? GNUNET_YES : GNUNET_NO;
+ return (controller == host->controller) ? GNUNET_YES : GNUNET_NO;
}
Modified: gnunet/src/testbed/testbed_api_hosts.h
===================================================================
--- gnunet/src/testbed/testbed_api_hosts.h 2012-06-29 15:16:37 UTC (rev
22391)
+++ gnunet/src/testbed/testbed_api_hosts.h 2012-06-29 15:26:52 UTC (rev
22392)
@@ -129,19 +129,25 @@
* Marks a host as registered with a controller
*
* @param host the host to mark
+ * @param controller the controller at which this host is registered
*/
void
-GNUNET_TESTBED_mark_host_as_registered_ (struct GNUNET_TESTBED_Host *host);
+GNUNET_TESTBED_mark_host_as_registered_ (struct GNUNET_TESTBED_Host *host,
+ const struct GNUNET_TESTBED_Controller
+ *controller);
/**
- * Checks whether a host has been registered
+ * Checks whether a host has been registered with the given controller
*
* @param host the host to check
+ * @param controller the controller at which host's registration is checked
* @return GNUNET_YES if registered; GNUNET_NO if not
*/
int
-GNUNET_TESTBED_is_host_registered_ (const struct GNUNET_TESTBED_Host *host);
+GNUNET_TESTBED_is_host_registered_ (const struct GNUNET_TESTBED_Host *host,
+ const struct GNUNET_TESTBED_Controller
+ *controller);
#endif
/* end of testbed_api_hosts.h */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22392 - gnunet/src/testbed,
gnunet <=