[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26301 - gnunet/src/testbed
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r26301 - gnunet/src/testbed |
|
Date: |
Mon, 4 Mar 2013 15:24:49 +0100 |
Author: harsha
Date: 2013-03-04 15:24:49 +0100 (Mon, 04 Mar 2013)
New Revision: 26301
Modified:
gnunet/src/testbed/gnunet-service-testbed_cache.c
gnunet/src/testbed/test_testbed_api.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
Log:
- fix
Modified: gnunet/src/testbed/gnunet-service-testbed_cache.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed_cache.c 2013-03-04 14:24:02 UTC
(rev 26300)
+++ gnunet/src/testbed/gnunet-service-testbed_cache.c 2013-03-04 14:24:49 UTC
(rev 26301)
@@ -169,12 +169,12 @@
/**
* The transport handle to the peer corresponding to this entry; can be NULL
*/
- struct GNUNET_TRANSPORT_Handle *transport_handle_;
+ struct GNUNET_TRANSPORT_Handle *transport_handle;
/**
* The operation handle for transport handle
*/
- struct GNUNET_TESTBED_Operation *transport_op_;
+ struct GNUNET_TESTBED_Operation *transport_op;
/**
* The core handle to the peer corresponding to this entry; can be NULL
@@ -346,11 +346,12 @@
GNUNET_free (ctxt);
}
LOG_DEBUG ("Cleaning up handles from an entry in cache\n");
- if (NULL != entry->transport_handle_)
+ if (NULL != entry->transport_handle)
+ GNUNET_assert (NULL != entry->transport_op);
+ if (NULL != entry->transport_op)
{
- GNUNET_assert (NULL != entry->transport_op_);
- GNUNET_TESTBED_operation_done (entry->transport_op_);
- entry->transport_op_ = NULL;
+ GNUNET_TESTBED_operation_done (entry->transport_op);
+ entry->transport_op = NULL;
}
if (NULL != entry->core_op)
{
@@ -431,7 +432,7 @@
switch (cgh->type)
{
case CGT_TRANSPORT_HANDLE:
- if (NULL == entry->transport_handle_)
+ if (NULL == entry->transport_handle)
continue;
break;
case CGT_CORE_HANDLE:
@@ -477,7 +478,7 @@
cgh->nctxt);
}
LOG_DEBUG ("Calling notify for handle type %u\n", cgh->type);
- cgh->cb (cgh->cb_cls, entry->core_handle, entry->transport_handle_,
+ cgh->cb (cgh->cb_cls, entry->core_handle, entry->transport_handle,
entry->peer_identity);
}
@@ -562,10 +563,10 @@
GNUNET_assert (NULL != entry);
LOG_DEBUG ("Opening a transport connection to peer %u\n", entry->peer_id);
- entry->transport_handle_ =
+ entry->transport_handle =
GNUNET_TRANSPORT_connect (entry->cfg, NULL, entry, NULL,
&transport_peer_connect_notify_cb, NULL);
- if (NULL == entry->transport_handle_)
+ if (NULL == entry->transport_handle)
{
GNUNET_break (0);
return;
@@ -590,10 +591,10 @@
{
struct CacheEntry *entry = cls;
- if (NULL == entry->transport_handle_)
+ if (NULL == entry->transport_handle)
return;
- GNUNET_TRANSPORT_disconnect (entry->transport_handle_);
- entry->transport_handle_ = NULL;
+ GNUNET_TRANSPORT_disconnect (entry->transport_handle);
+ entry->transport_handle = NULL;
}
@@ -746,7 +747,7 @@
switch (cgh->type)
{
case CGT_TRANSPORT_HANDLE:
- handle = entry->transport_handle_;
+ handle = entry->transport_handle;
if (NULL != handle)
LOG_DEBUG ("Found TRANSPORT handle in cache for peer %u\n",
entry->peer_id);
@@ -784,11 +785,11 @@
switch (cgh->type)
{
case CGT_TRANSPORT_HANDLE:
- if (NULL != entry->transport_op_)
+ if (NULL != entry->transport_op)
return cgh;
op = GNUNET_TESTBED_operation_create_ (entry,
&opstart_get_handle_transport,
&oprelease_get_handle_transport);
- entry->transport_op_ = op;
+ entry->transport_op = op;
break;
case CGT_CORE_HANDLE:
if (NULL != entry->core_op)
@@ -827,11 +828,11 @@
close_handles (entry);
GNUNET_free_non_null (entry->hello);
GNUNET_break (GNUNET_SCHEDULER_NO_TASK == entry->expire_task);
- GNUNET_break (NULL == entry->transport_handle_);
- GNUNET_break (NULL == entry->transport_op_);
- GNUNET_break (NULL == entry->core_handle);
- GNUNET_break (NULL == entry->core_op);
- GNUNET_break (NULL == entry->cfg);
+ GNUNET_assert (NULL == entry->transport_handle);
+ GNUNET_assert (NULL == entry->transport_op);
+ GNUNET_assert (NULL == entry->core_handle);
+ GNUNET_assert (NULL == entry->core_op);
+ GNUNET_assert (NULL == entry->cfg);
GNUNET_assert (NULL == entry->cgh_qhead);
GNUNET_assert (NULL == entry->cgh_qtail);
GNUNET_assert (NULL == entry->nctxt_qhead);
Modified: gnunet/src/testbed/test_testbed_api.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api.conf 2013-03-04 14:24:02 UTC (rev
26300)
+++ gnunet/src/testbed/test_testbed_api.conf 2013-03-04 14:24:49 UTC (rev
26301)
@@ -40,6 +40,7 @@
[core]
PORT = 12092
AUTOSTART = YES
+USE_EPHEMERAL_KEYS = NO
[arm]
DEFAULTSERVICES = core transport
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
2013-03-04 14:24:02 UTC (rev 26300)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
2013-03-04 14:24:49 UTC (rev 26301)
@@ -40,6 +40,7 @@
[core]
PORT = 12092
AUTOSTART = YES
+USE_EPHEMERAL_KEYS = NO
[arm]
DEFAULTSERVICES = core transport
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
2013-03-04 14:24:02 UTC (rev 26300)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
2013-03-04 14:24:49 UTC (rev 26301)
@@ -40,6 +40,7 @@
[core]
PORT = 12092
AUTOSTART = YES
+USE_EPHEMERAL_KEYS = NO
[arm]
DEFAULTSERVICES = core transport
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
2013-03-04 14:24:02 UTC (rev 26300)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
2013-03-04 14:24:49 UTC (rev 26301)
@@ -41,6 +41,7 @@
[core]
PORT = 12092
AUTOSTART = YES
+USE_EPHEMERAL_KEYS = NO
[arm]
DEFAULTSERVICES = core transport
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf
2013-03-04 14:24:02 UTC (rev 26300)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf
2013-03-04 14:24:49 UTC (rev 26301)
@@ -40,6 +40,7 @@
[core]
PORT = 12092
AUTOSTART = YES
+USE_EPHEMERAL_KEYS = NO
[arm]
DEFAULTSERVICES = core transport
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
2013-03-04 14:24:02 UTC (rev 26300)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
2013-03-04 14:24:49 UTC (rev 26301)
@@ -40,6 +40,7 @@
[core]
PORT = 12092
AUTOSTART = YES
+USE_EPHEMERAL_KEYS = NO
[arm]
DEFAULTSERVICES = core transport
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf
2013-03-04 14:24:02 UTC (rev 26300)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf
2013-03-04 14:24:49 UTC (rev 26301)
@@ -40,6 +40,7 @@
[core]
PORT = 12092
AUTOSTART = YES
+USE_EPHEMERAL_KEYS = NO
[arm]
DEFAULTSERVICES = core transport
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
2013-03-04 14:24:02 UTC (rev 26300)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
2013-03-04 14:24:49 UTC (rev 26301)
@@ -40,6 +40,7 @@
[core]
PORT = 12092
AUTOSTART = YES
+USE_EPHEMERAL_KEYS = NO
[arm]
DEFAULTSERVICES = core transport
Modified:
gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
2013-03-04 14:24:02 UTC (rev 26300)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
2013-03-04 14:24:49 UTC (rev 26301)
@@ -40,6 +40,7 @@
[core]
PORT = 12092
AUTOSTART = YES
+USE_EPHEMERAL_KEYS = NO
[arm]
DEFAULTSERVICES = core transport
Modified:
gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
2013-03-04 14:24:02 UTC (rev 26300)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
2013-03-04 14:24:49 UTC (rev 26301)
@@ -40,6 +40,7 @@
[core]
PORT = 12092
AUTOSTART = YES
+USE_EPHEMERAL_KEYS = NO
[arm]
DEFAULTSERVICES = core transport
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26301 - gnunet/src/testbed,
gnunet <=