diff options
Diffstat (limited to 'src/cadet/gnunet-service-cadet_peer.c')
-rw-r--r-- | src/cadet/gnunet-service-cadet_peer.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c index f9117953d..64d9168fd 100644 --- a/src/cadet/gnunet-service-cadet_peer.c +++ b/src/cadet/gnunet-service-cadet_peer.c | |||
@@ -538,7 +538,6 @@ static struct GNUNET_CORE_MessageHandler core_handlers[] = { | |||
538 | {&GCC_handle_poll, GNUNET_MESSAGE_TYPE_CADET_POLL, | 538 | {&GCC_handle_poll, GNUNET_MESSAGE_TYPE_CADET_POLL, |
539 | sizeof (struct GNUNET_CADET_Poll)}, | 539 | sizeof (struct GNUNET_CADET_Poll)}, |
540 | {&GCC_handle_kx, GNUNET_MESSAGE_TYPE_CADET_KX, 0}, | 540 | {&GCC_handle_kx, GNUNET_MESSAGE_TYPE_CADET_KX, 0}, |
541 | {&GCC_handle_encrypted, GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED, 0}, | ||
542 | {&GCC_handle_encrypted, GNUNET_MESSAGE_TYPE_CADET_AX, 0}, | 541 | {&GCC_handle_encrypted, GNUNET_MESSAGE_TYPE_CADET_AX, 0}, |
543 | {NULL, 0, 0} | 542 | {NULL, 0, 0} |
544 | }; | 543 | }; |
@@ -724,11 +723,9 @@ get_priority (struct CadetPeerQueue *q) | |||
724 | } | 723 | } |
725 | 724 | ||
726 | /* Bulky payload has lower priority, control traffic has higher. */ | 725 | /* Bulky payload has lower priority, control traffic has higher. */ |
727 | if (GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED == q->type | 726 | if (GNUNET_MESSAGE_TYPE_CADET_AX == q->type) |
728 | || GNUNET_MESSAGE_TYPE_CADET_AX == q->type) | ||
729 | return low; | 727 | return low; |
730 | else | 728 | return high; |
731 | return high; | ||
732 | } | 729 | } |
733 | 730 | ||
734 | 731 | ||
@@ -1022,7 +1019,6 @@ queue_is_sendable (struct CadetPeerQueue *q) | |||
1022 | case GNUNET_MESSAGE_TYPE_CADET_CONNECTION_BROKEN: | 1019 | case GNUNET_MESSAGE_TYPE_CADET_CONNECTION_BROKEN: |
1023 | return GNUNET_YES; | 1020 | return GNUNET_YES; |
1024 | 1021 | ||
1025 | case GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED: | ||
1026 | case GNUNET_MESSAGE_TYPE_CADET_AX: | 1022 | case GNUNET_MESSAGE_TYPE_CADET_AX: |
1027 | break; | 1023 | break; |
1028 | 1024 | ||
@@ -1140,12 +1136,6 @@ fill_buf (struct CadetPeerQueue *queue, void *buf, size_t size, uint32_t *pid) | |||
1140 | 1136 | ||
1141 | switch (queue->type) | 1137 | switch (queue->type) |
1142 | { | 1138 | { |
1143 | case GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED: | ||
1144 | *pid = GCC_get_pid (queue->c, queue->fwd); | ||
1145 | LOG (GNUNET_ERROR_TYPE_DEBUG, " otr payload ID %u\n", *pid); | ||
1146 | msg_size = send_core_data_raw (queue->cls, size, buf); | ||
1147 | ((struct GNUNET_CADET_Encrypted *) buf)->pid = htonl (*pid); | ||
1148 | break; | ||
1149 | case GNUNET_MESSAGE_TYPE_CADET_AX: | 1139 | case GNUNET_MESSAGE_TYPE_CADET_AX: |
1150 | *pid = GCC_get_pid (queue->c, queue->fwd); | 1140 | *pid = GCC_get_pid (queue->c, queue->fwd); |
1151 | LOG (GNUNET_ERROR_TYPE_DEBUG, " ax payload ID %u\n", *pid); | 1141 | LOG (GNUNET_ERROR_TYPE_DEBUG, " ax payload ID %u\n", *pid); |
@@ -1425,7 +1415,6 @@ GCP_queue_destroy (struct CadetPeerQueue *queue, | |||
1425 | case GNUNET_MESSAGE_TYPE_CADET_CONNECTION_CREATE: | 1415 | case GNUNET_MESSAGE_TYPE_CADET_CONNECTION_CREATE: |
1426 | case GNUNET_MESSAGE_TYPE_CADET_CONNECTION_BROKEN: | 1416 | case GNUNET_MESSAGE_TYPE_CADET_CONNECTION_BROKEN: |
1427 | case GNUNET_MESSAGE_TYPE_CADET_KX: | 1417 | case GNUNET_MESSAGE_TYPE_CADET_KX: |
1428 | case GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED: | ||
1429 | case GNUNET_MESSAGE_TYPE_CADET_AX: | 1418 | case GNUNET_MESSAGE_TYPE_CADET_AX: |
1430 | case GNUNET_MESSAGE_TYPE_CADET_ACK: | 1419 | case GNUNET_MESSAGE_TYPE_CADET_ACK: |
1431 | case GNUNET_MESSAGE_TYPE_CADET_POLL: | 1420 | case GNUNET_MESSAGE_TYPE_CADET_POLL: |
@@ -1733,7 +1722,6 @@ GCP_connection_pop (struct CadetPeer *peer, | |||
1733 | continue; | 1722 | continue; |
1734 | 1723 | ||
1735 | case GNUNET_MESSAGE_TYPE_CADET_KX: | 1724 | case GNUNET_MESSAGE_TYPE_CADET_KX: |
1736 | case GNUNET_MESSAGE_TYPE_CADET_ENCRYPTED: | ||
1737 | case GNUNET_MESSAGE_TYPE_CADET_AX: | 1725 | case GNUNET_MESSAGE_TYPE_CADET_AX: |
1738 | case GNUNET_MESSAGE_TYPE_CADET_AX_KX: | 1726 | case GNUNET_MESSAGE_TYPE_CADET_AX_KX: |
1739 | msg = (struct GNUNET_MessageHeader *) q->cls; | 1727 | msg = (struct GNUNET_MessageHeader *) q->cls; |