From: t3sserakt Date: Fri, 3 Jan 2020 19:28:26 +0000 (+0100) Subject: make it compile X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a5dc7fb31cdd79c4af55ed96910849cb08ff89bb;p=oweals%2Fgnunet.git make it compile --- diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c index 3eb5eb8f8..4b78b1812 100644 --- a/src/cadet/gnunet-service-cadet_connection.c +++ b/src/cadet/gnunet-service-cadet_connection.c @@ -608,7 +608,8 @@ send_create (void *cls) struct GNUNET_CADET_ConnectionCreateMessage *create_msg; struct GNUNET_PeerIdentity *pids; struct GNUNET_MQ_Envelope *env; - + struct CadetTunnel *t; + cc->task = NULL; GNUNET_assert (GNUNET_YES == cc->mqm_ready); env = @@ -621,7 +622,7 @@ send_create (void *cls) // check for tunnel state and define tunnel_up (xrs,t3ss) t = GCP_get_tunnel (cc->destination, GNUNET_YES); - create_msg->tunnel_up = (t->estate == CADET_TUNNEL_KEY_UNINITIALIZED)? GNUNET_NO : GNUNET_YES; + create_msg->tunnel_up = GCT_get_estate(t) == CADET_TUNNEL_KEY_UNINITIALIZED ? GNUNET_NO : GNUNET_YES; pids = (struct GNUNET_PeerIdentity *) &create_msg[1]; pids[0] = my_full_id; diff --git a/src/cadet/gnunet-service-cadet_core.c b/src/cadet/gnunet-service-cadet_core.c index 5359370e6..595392875 100644 --- a/src/cadet/gnunet-service-cadet_core.c +++ b/src/cadet/gnunet-service-cadet_core.c @@ -823,13 +823,13 @@ handle_connection_create ( GCP_2s (origin), GNUNET_sh2s (&msg->cid.connection_of_tunnel)); path = GCPP_get_path_from_route (path_length - 1, pids); - t = GCP_get_tunnel (orgin, GNUNET_YES); + t = GCP_get_tunnel (sender, GNUNET_YES); // Check for CADET state in case the other side has lost the tunnel (xrs,t3ss) if ((GNUNET_NO == msg->tunnel_up) && - (CADET_TUNNEL_KEY_OK == t->estate)) + (CADET_TUNNEL_KEY_OK == GCT_get_estate(t))) { - t->estate = CADET_TUNNEL_KEY_UNINITIALIZED; + GCT_change_estate (t, CADET_TUNNEL_KEY_UNINITIALIZED); } if (GNUNET_OK !=