diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-01-18 14:49:17 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-01-18 14:49:17 +0100 |
commit | e02d76e46cd00724d32f81375e8981524ee6f3e2 (patch) | |
tree | 91a6aea89bfda7865f04244e2fb2a6ebb019bc3a /src/cadet/gnunet-service-cadet_connection.c | |
parent | 9f1d39a86ddb227f91ad75f740d59adeb9b6ee31 (diff) | |
download | gnunet-e02d76e46cd00724d32f81375e8981524ee6f3e2.tar.gz gnunet-e02d76e46cd00724d32f81375e8981524ee6f3e2.zip |
more rename festivities
Diffstat (limited to 'src/cadet/gnunet-service-cadet_connection.c')
-rw-r--r-- | src/cadet/gnunet-service-cadet_connection.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c index 4eed0ec1c..931b32b95 100644 --- a/src/cadet/gnunet-service-cadet_connection.c +++ b/src/cadet/gnunet-service-cadet_connection.c | |||
@@ -616,7 +616,7 @@ send_ack (struct CadetConnection *c, | |||
616 | 616 | ||
617 | /* Build ACK message and send on conn */ | 617 | /* Build ACK message and send on conn */ |
618 | msg.header.size = htons (sizeof (msg)); | 618 | msg.header.size = htons (sizeof (msg)); |
619 | msg.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED_HOP_BY_HOP_ACK); | 619 | msg.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_CONNECTION_HOP_BY_HOP_ENCRYPTED_ACK); |
620 | msg.cemi = ack_cemi; | 620 | msg.cemi = ack_cemi; |
621 | msg.cid = c->id; | 621 | msg.cid = c->id; |
622 | 622 | ||
@@ -747,7 +747,7 @@ conn_message_sent (void *cls, | |||
747 | } | 747 | } |
748 | else /* CONN_CREATE or CONN_ACK */ | 748 | else /* CONN_CREATE or CONN_ACK */ |
749 | { | 749 | { |
750 | GNUNET_assert (GNUNET_MESSAGE_TYPE_CONNECTION_ENCRYPTED != type); | 750 | GNUNET_assert (GNUNET_MESSAGE_TYPE_CADET_TUNNEL_ENCRYPTED != type); |
751 | forced = GNUNET_YES; | 751 | forced = GNUNET_YES; |
752 | } | 752 | } |
753 | 753 | ||
@@ -774,7 +774,7 @@ conn_message_sent (void *cls, | |||
774 | schedule_next_keepalive (c, fwd); | 774 | schedule_next_keepalive (c, fwd); |
775 | break; | 775 | break; |
776 | 776 | ||
777 | case GNUNET_MESSAGE_TYPE_CONNECTION_ENCRYPTED: | 777 | case GNUNET_MESSAGE_TYPE_CADET_TUNNEL_ENCRYPTED: |
778 | if (GNUNET_YES == sent) | 778 | if (GNUNET_YES == sent) |
779 | { | 779 | { |
780 | fc->last_pid_sent = pid; | 780 | fc->last_pid_sent = pid; |
@@ -806,7 +806,7 @@ conn_message_sent (void *cls, | |||
806 | connection_reset_timeout (c, fwd); | 806 | connection_reset_timeout (c, fwd); |
807 | break; | 807 | break; |
808 | 808 | ||
809 | case GNUNET_MESSAGE_TYPE_CADET_CONNECTION_HOP_BY_HOP_POLL: | 809 | case GNUNET_MESSAGE_TYPE_CADET_TUNNEL_ENCRYPTED_POLL: |
810 | fc->poll_msg = NULL; | 810 | fc->poll_msg = NULL; |
811 | if (2 == c->destroy) | 811 | if (2 == c->destroy) |
812 | { | 812 | { |
@@ -827,7 +827,7 @@ conn_message_sent (void *cls, | |||
827 | LOG (GNUNET_ERROR_TYPE_DEBUG, " task %u\n", fc->poll_task); | 827 | LOG (GNUNET_ERROR_TYPE_DEBUG, " task %u\n", fc->poll_task); |
828 | break; | 828 | break; |
829 | 829 | ||
830 | case GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED_HOP_BY_HOP_ACK: | 830 | case GNUNET_MESSAGE_TYPE_CADET_CONNECTION_HOP_BY_HOP_ENCRYPTED_ACK: |
831 | fc->ack_msg = NULL; | 831 | fc->ack_msg = NULL; |
832 | break; | 832 | break; |
833 | 833 | ||
@@ -1469,7 +1469,7 @@ send_poll (void *cls) | |||
1469 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Polling connection %s %s\n", | 1469 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Polling connection %s %s\n", |
1470 | GCC_2s (c), GC_f2s (fwd)); | 1470 | GCC_2s (c), GC_f2s (fwd)); |
1471 | 1471 | ||
1472 | msg.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_CONNECTION_HOP_BY_HOP_POLL); | 1472 | msg.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_TUNNEL_ENCRYPTED_POLL); |
1473 | msg.header.size = htons (sizeof (msg)); | 1473 | msg.header.size = htons (sizeof (msg)); |
1474 | msg.cid = c->id; | 1474 | msg.cid = c->id; |
1475 | msg.cemi = fc->last_pid_sent; | 1475 | msg.cemi = fc->last_pid_sent; |
@@ -2531,7 +2531,7 @@ check_message (const struct GNUNET_MessageHeader *message, | |||
2531 | 2531 | ||
2532 | /* Check PID for payload messages */ | 2532 | /* Check PID for payload messages */ |
2533 | type = ntohs (message->type); | 2533 | type = ntohs (message->type); |
2534 | if (GNUNET_MESSAGE_TYPE_CONNECTION_ENCRYPTED == type) | 2534 | if (GNUNET_MESSAGE_TYPE_CADET_TUNNEL_ENCRYPTED == type) |
2535 | { | 2535 | { |
2536 | fc = fwd ? &c->bck_fc : &c->fwd_fc; | 2536 | fc = fwd ? &c->bck_fc : &c->fwd_fc; |
2537 | LOG (GNUNET_ERROR_TYPE_DEBUG, " PID %u (expected in interval [%u,%u])\n", | 2537 | LOG (GNUNET_ERROR_TYPE_DEBUG, " PID %u (expected in interval [%u,%u])\n", |
@@ -2665,7 +2665,7 @@ GCC_handle_kx (struct CadetPeer *peer, | |||
2665 | */ | 2665 | */ |
2666 | void | 2666 | void |
2667 | GCC_handle_encrypted (struct CadetPeer *peer, | 2667 | GCC_handle_encrypted (struct CadetPeer *peer, |
2668 | const struct GNUNET_CADET_ConnectionEncryptedMessage *msg) | 2668 | const struct GNUNET_CADET_TunnelEncryptedMessage *msg) |
2669 | { | 2669 | { |
2670 | static struct CadetEncryptedMessageIdentifier zero; | 2670 | static struct CadetEncryptedMessageIdentifier zero; |
2671 | const struct GNUNET_CADET_ConnectionTunnelIdentifier* cid; | 2671 | const struct GNUNET_CADET_ConnectionTunnelIdentifier* cid; |
@@ -3302,7 +3302,7 @@ GCC_send_prebuilt_message (const struct GNUNET_MessageHeader *message, | |||
3302 | GC_f2s(fwd), size); | 3302 | GC_f2s(fwd), size); |
3303 | switch (type) | 3303 | switch (type) |
3304 | { | 3304 | { |
3305 | case GNUNET_MESSAGE_TYPE_CONNECTION_ENCRYPTED: | 3305 | case GNUNET_MESSAGE_TYPE_CADET_TUNNEL_ENCRYPTED: |
3306 | LOG (GNUNET_ERROR_TYPE_DEBUG, " Q_N+ %p %u, PIDsnt: %u, ACKrcv: %u\n", | 3306 | LOG (GNUNET_ERROR_TYPE_DEBUG, " Q_N+ %p %u, PIDsnt: %u, ACKrcv: %u\n", |
3307 | fc, | 3307 | fc, |
3308 | fc->queue_n, | 3308 | fc->queue_n, |
@@ -3324,8 +3324,8 @@ GCC_send_prebuilt_message (const struct GNUNET_MessageHeader *message, | |||
3324 | GNUNET_break (0 == payload_type); | 3324 | GNUNET_break (0 == payload_type); |
3325 | break; | 3325 | break; |
3326 | 3326 | ||
3327 | case GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED_HOP_BY_HOP_ACK: | 3327 | case GNUNET_MESSAGE_TYPE_CADET_CONNECTION_HOP_BY_HOP_ENCRYPTED_ACK: |
3328 | case GNUNET_MESSAGE_TYPE_CADET_CONNECTION_HOP_BY_HOP_POLL: | 3328 | case GNUNET_MESSAGE_TYPE_CADET_TUNNEL_ENCRYPTED_POLL: |
3329 | case GNUNET_MESSAGE_TYPE_CADET_CONNECTION_DESTROY: | 3329 | case GNUNET_MESSAGE_TYPE_CADET_CONNECTION_DESTROY: |
3330 | case GNUNET_MESSAGE_TYPE_CADET_CONNECTION_BROKEN: | 3330 | case GNUNET_MESSAGE_TYPE_CADET_CONNECTION_BROKEN: |
3331 | GNUNET_assert (GNUNET_YES == force); | 3331 | GNUNET_assert (GNUNET_YES == force); |
@@ -3343,7 +3343,7 @@ GCC_send_prebuilt_message (const struct GNUNET_MessageHeader *message, | |||
3343 | GNUNET_break (0); | 3343 | GNUNET_break (0); |
3344 | LOG (GNUNET_ERROR_TYPE_DEBUG, "queue full: %u/%u\n", | 3344 | LOG (GNUNET_ERROR_TYPE_DEBUG, "queue full: %u/%u\n", |
3345 | fc->queue_n, fc->queue_max); | 3345 | fc->queue_n, fc->queue_max); |
3346 | if (GNUNET_MESSAGE_TYPE_CONNECTION_ENCRYPTED == type) | 3346 | if (GNUNET_MESSAGE_TYPE_CADET_TUNNEL_ENCRYPTED == type) |
3347 | { | 3347 | { |
3348 | fc->queue_n--; | 3348 | fc->queue_n--; |
3349 | } | 3349 | } |