[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36077 - gnunet/src/cadet
From: |
gnunet |
Subject: |
[GNUnet-SVN] r36077 - gnunet/src/cadet |
Date: |
Wed, 15 Jul 2015 13:45:13 +0200 |
Author: bartpolot
Date: 2015-07-15 13:45:13 +0200 (Wed, 15 Jul 2015)
New Revision: 36077
Modified:
gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
- send payload on AX key receive
Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c 2015-07-15 11:45:12 UTC
(rev 36076)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c 2015-07-15 11:45:13 UTC
(rev 36077)
@@ -624,10 +624,15 @@
is_ready (struct CadetTunnel *t)
{
int ready;
+ int conn_ok;
+ int enc_ok;
- ready = CADET_TUNNEL_READY == t->cstate
- && (CADET_TUNNEL_KEY_OK == t->estate
- || CADET_TUNNEL_KEY_REKEY == t->estate);
+ conn_ok = CADET_TUNNEL_READY == t->cstate;
+ enc_ok = CADET_TUNNEL_KEY_OK == t->estate
+ || CADET_TUNNEL_KEY_REKEY == t->estate
+ || (CADET_TUNNEL_KEY_PING == t->estate
+ && CADET_Axolotl == t->enc_type);
+ ready = conn_ok && enc_ok;
ready = ready || GCT_is_loopback (t);
return ready;
}
@@ -2977,6 +2982,8 @@
ax->ratchet_expiration =
GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get(), ratchet_time);
}
+ GCT_change_estate (t, CADET_TUNNEL_KEY_PING);
+ send_queued_data (t);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36077 - gnunet/src/cadet,
gnunet <=