aboutsummaryrefslogtreecommitdiff
path: root/src/cadet
diff options
context:
space:
mode:
Diffstat (limited to 'src/cadet')
-rw-r--r--src/cadet/gnunet-service-cadet_tunnels.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c
index 5c52eb616..ef6f97622 100644
--- a/src/cadet/gnunet-service-cadet_tunnels.c
+++ b/src/cadet/gnunet-service-cadet_tunnels.c
@@ -459,13 +459,13 @@ struct CadetTunnel
459 459
460 460
461/** 461/**
462 * Am I Alice or Bob, or talking to myself? 462 * Am I Alice or Betty (some call her Bob), or talking to myself?
463 * 463 *
464 * @param other the other peer 464 * @param other the other peer
465 * @return #GNUNET_YES for Alice, #GNUNET_NO for Bob, #GNUNET_SYSERR if talking to myself 465 * @return #GNUNET_YES for Alice, #GNUNET_NO for Betty, #GNUNET_SYSERR if talking to myself
466 */ 466 */
467static int 467static int
468alice_or_bob (const struct GNUNET_PeerIdentity *other) 468alice_or_betty (const struct GNUNET_PeerIdentity *other)
469{ 469{
470 if (0 > GNUNET_CRYPTO_cmp_peer_identity (&my_full_id, 470 if (0 > GNUNET_CRYPTO_cmp_peer_identity (&my_full_id,
471 other)) 471 other))
@@ -1347,7 +1347,7 @@ send_kx (struct CadetTunnel *t,
1347 struct GNUNET_CADET_TunnelKeyExchangeMessage *msg; 1347 struct GNUNET_CADET_TunnelKeyExchangeMessage *msg;
1348 enum GNUNET_CADET_KX_Flags flags; 1348 enum GNUNET_CADET_KX_Flags flags;
1349 1349
1350 if (GNUNET_YES != alice_or_bob (GCP_get_id (t->destination))) 1350 if (GNUNET_YES != alice_or_betty (GCP_get_id (t->destination)))
1351 return; /* only Alice may send KX */ 1351 return; /* only Alice may send KX */
1352 if ( (NULL == ct) || 1352 if ( (NULL == ct) ||
1353 (GNUNET_NO == ct->is_ready) ) 1353 (GNUNET_NO == ct->is_ready) )
@@ -1523,7 +1523,7 @@ update_ax_by_kx (struct CadetTunnelAxolotl *ax,
1523 const char salt[] = "CADET Axolotl salt"; 1523 const char salt[] = "CADET Axolotl salt";
1524 int am_I_alice; 1524 int am_I_alice;
1525 1525
1526 if (GNUNET_SYSERR == (am_I_alice = alice_or_bob (pid))) 1526 if (GNUNET_SYSERR == (am_I_alice = alice_or_betty (pid)))
1527 { 1527 {
1528 GNUNET_break_op (0); 1528 GNUNET_break_op (0);
1529 return GNUNET_SYSERR; 1529 return GNUNET_SYSERR;
@@ -1726,7 +1726,7 @@ GCT_handle_kx (struct CadetTConnection *ct,
1726 1, 1726 1,
1727 GNUNET_NO); 1727 GNUNET_NO);
1728 if (GNUNET_YES == 1728 if (GNUNET_YES ==
1729 alice_or_bob (GCP_get_id (t->destination))) 1729 alice_or_betty (GCP_get_id (t->destination)))
1730 { 1730 {
1731 /* Bob is not allowed to send KX! */ 1731 /* Bob is not allowed to send KX! */
1732 GNUNET_break_op (0); 1732 GNUNET_break_op (0);