aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-07-08 17:55:07 +0000
committerChristian Grothoff <christian@grothoff.org>2016-07-08 17:55:07 +0000
commit942f4f6720719bc8862f5c4248af7cf158f377ab (patch)
tree9efb2f66ab3a58544d14f22263fb555302fe0c9c /src
parent36cb528db98a3ce8ff5927fa73cd0e722dfa515d (diff)
downloadgnunet-942f4f6720719bc8862f5c4248af7cf158f377ab.tar.gz
gnunet-942f4f6720719bc8862f5c4248af7cf158f377ab.zip
-ignore meaningless timeout status
Diffstat (limited to 'src')
-rw-r--r--src/testbed/gnunet-service-testbed_oc.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c
index 184da8055..cf74ea04e 100644
--- a/src/testbed/gnunet-service-testbed_oc.c
+++ b/src/testbed/gnunet-service-testbed_oc.c
@@ -796,27 +796,13 @@ occ_hello_sent_cb (void *cls)
796 struct OverlayConnectContext *occ = cls; 796 struct OverlayConnectContext *occ = cls;
797 struct LocalPeer2Context *lp2c; 797 struct LocalPeer2Context *lp2c;
798 struct Peer *peer2; 798 struct Peer *peer2;
799 const struct GNUNET_SCHEDULER_TaskContext *tc;
800 799
801 tc = GNUNET_SCHEDULER_get_task_context ();
802 GNUNET_assert (OCC_TYPE_LOCAL == occ->type); 800 GNUNET_assert (OCC_TYPE_LOCAL == occ->type);
803 GNUNET_assert (NULL != occ->timeout_task); 801 GNUNET_assert (NULL != occ->timeout_task);
804 lp2c = &occ->p2ctx.local; 802 lp2c = &occ->p2ctx.local;
805 lp2c->ohh = NULL; 803 lp2c->ohh = NULL;
806 804
807 GNUNET_assert (NULL == occ->send_hello_task); 805 GNUNET_assert (NULL == occ->send_hello_task);
808 if (GNUNET_SCHEDULER_REASON_TIMEOUT == tc->reason)
809 {
810 GNUNET_free_non_null (occ->emsg);
811 GNUNET_asprintf (&occ->emsg,
812 "0x%llx: Timeout while offering HELLO to other peer",
813 occ->op_id);
814 occ->send_hello_task = GNUNET_SCHEDULER_add_now (&send_hello,
815 occ);
816 return;
817 }
818 if (GNUNET_SCHEDULER_REASON_READ_READY != tc->reason)
819 return;
820 GNUNET_free_non_null (occ->emsg); 806 GNUNET_free_non_null (occ->emsg);
821 807
822 GNUNET_asprintf (&occ->emsg, 808 GNUNET_asprintf (&occ->emsg,
@@ -906,7 +892,7 @@ send_hello (void *cls)
906 lp2c->ohh = 892 lp2c->ohh =
907 GNUNET_TRANSPORT_offer_hello (lp2c->tcc.cfg, 893 GNUNET_TRANSPORT_offer_hello (lp2c->tcc.cfg,
908 occ->hello, 894 occ->hello,
909 occ_hello_sent_cb, 895 &occ_hello_sent_cb,
910 occ); 896 occ);
911 if (NULL == lp2c->ohh) 897 if (NULL == lp2c->ohh)
912 { 898 {