[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24956 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r24956 - gnunet/src/testbed |
Date: |
Wed, 14 Nov 2012 15:14:44 +0100 |
Author: harsha
Date: 2012-11-14 15:14:44 +0100 (Wed, 14 Nov 2012)
New Revision: 24956
Modified:
gnunet/src/testbed/gnunet-service-testbed.c
Log:
- remove redundant transport handles
Modified: gnunet/src/testbed/gnunet-service-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed.c 2012-11-14 14:09:43 UTC (rev
24955)
+++ gnunet/src/testbed/gnunet-service-testbed.c 2012-11-14 14:14:44 UTC (rev
24956)
@@ -558,11 +558,6 @@
struct GNUNET_TRANSPORT_Handle *p1th;
/**
- * Transport handle of other peer to offer first peer's HELLO
- */
- struct GNUNET_TRANSPORT_Handle *p2th;
-
- /**
* Core handles of the first peer; used to notify when second peer connects
to it
*/
struct GNUNET_CORE_Handle *ch;
@@ -2547,7 +2542,7 @@
if (0 == peer->reference_cnt)
destroy_peer (peer);
else
- LOG (GNUNET_ERROR_TYPE_WARNING,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Delaying peer destroy as peer is currently in use\n");
send_operation_success_msg (client, GNUNET_ntohll (msg->operation_id));
GNUNET_SERVER_receive_done (client, GNUNET_OK);
@@ -2799,9 +2794,9 @@
GNUNET_TRANSPORT_disconnect (occ->p1th);
occ->peer->reference_cnt--;
}
- if (NULL != occ->p2th)
+ if (NULL != occ->tcc.th)
{
- GNUNET_TRANSPORT_disconnect (occ->p2th);
+ GNUNET_TRANSPORT_disconnect (occ->tcc.th);
peer_list[occ->other_peer_id]->reference_cnt--;
}
if ((GNUNET_YES == occ->peer->destroy_flag)
@@ -2904,10 +2899,10 @@
occ->timeout_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_free_non_null (occ->emsg);
occ->emsg = NULL;
- if (NULL != occ->p2th)
+ if (NULL != occ->tcc.th)
{
- GNUNET_TRANSPORT_disconnect (occ->p2th);
- occ->p2th = NULL;
+ GNUNET_TRANSPORT_disconnect (occ->tcc.th);
+ occ->tcc.th = NULL;
peer_list[occ->other_peer_id]->reference_cnt--;
}
LOG_DEBUG ("Peers connected - Sending overlay connect success\n");
@@ -3015,7 +3010,6 @@
GNUNET_free_non_null (occ->emsg);
occ->emsg = GNUNET_strdup ("Timeout while try connect\n");
occ->tcc.pid = &occ->peer_identity;
- occ->tcc.th = occ->p2th;
occ->tcc.task = GNUNET_SCHEDULER_add_now (&try_connect_task, &occ->tcc);
}
@@ -3062,7 +3056,7 @@
{
LOG_DEBUG ("Offering HELLO of %s to %s\n",
GNUNET_i2s (&occ->peer_identity), other_peer_str);
- occ->ohh = GNUNET_TRANSPORT_offer_hello (occ->p2th,
+ occ->ohh = GNUNET_TRANSPORT_offer_hello (occ->tcc.th,
occ->hello,
occ_hello_sent_cb,
occ);
@@ -3136,11 +3130,11 @@
if (NULL == occ->peer2_controller)
{
peer_list[occ->other_peer_id]->reference_cnt++;
- occ->p2th =
+ occ->tcc.th =
GNUNET_TRANSPORT_connect
(peer_list[occ->other_peer_id]->details.local.cfg,
&occ->other_peer_identity, NULL, NULL, NULL,
NULL);
- if (NULL == occ->p2th)
+ if (NULL == occ->tcc.th)
{
GNUNET_asprintf (&occ->emsg, "Cannot connect to TRANSPORT of %s\n",
GNUNET_i2s (&occ->other_peer_identity));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24956 - gnunet/src/testbed,
gnunet <=