projects
/
oweals
/
gnunet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
6aa06d6
)
- cancel any rekey tasks when calling it directly
author
Bart Polot
<bart@net.in.tum.de>
Mon, 21 Jul 2014 00:15:09 +0000
(
00:15
+0000)
committer
Bart Polot
<bart@net.in.tum.de>
Mon, 21 Jul 2014 00:15:09 +0000
(
00:15
+0000)
src/cadet/gnunet-service-cadet_tunnel.c
patch
|
blob
|
history
diff --git
a/src/cadet/gnunet-service-cadet_tunnel.c
b/src/cadet/gnunet-service-cadet_tunnel.c
index c0713cb203e5bd188e150d7def3a404448c5f4b8..1fb5e539c2ef635f021314b7b7078c221c2f0aa0 100644
(file)
--- a/
src/cadet/gnunet-service-cadet_tunnel.c
+++ b/
src/cadet/gnunet-service-cadet_tunnel.c
@@
-2197,6
+2197,8
@@
GCT_change_cstate (struct CadetTunnel* t, enum CadetTunnelCState cstate)
else if (CADET_TUNNEL_KEY_UNINITIALIZED == t->estate)
{
LOG (GNUNET_ERROR_TYPE_DEBUG, " cstate triggered rekey\n");
+ if (GNUNET_SCHEDULER_NO_TASK != t->rekey_task)
+ GNUNET_SCHEDULER_cancel (t->rekey_task);
rekey_tunnel (t, NULL);
}
}