diff options
Diffstat (limited to 'src/transport/gnunet-service-transport_clients.c')
-rw-r--r-- | src/transport/gnunet-service-transport_clients.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/transport/gnunet-service-transport_clients.c b/src/transport/gnunet-service-transport_clients.c index 8679f40b4..7c4a9d712 100644 --- a/src/transport/gnunet-service-transport_clients.c +++ b/src/transport/gnunet-service-transport_clients.c | |||
@@ -851,11 +851,11 @@ clients_handle_address_to_string (void *cls, | |||
851 | * @param address the address, NULL on disconnect | 851 | * @param address the address, NULL on disconnect |
852 | * @return composed message | 852 | * @return composed message |
853 | */ | 853 | */ |
854 | static struct AddressIterateResponseMessage * | 854 | static struct PeerIterateResponseMessage * |
855 | compose_address_iterate_response_message (const struct GNUNET_PeerIdentity *peer, | 855 | compose_address_iterate_response_message (const struct GNUNET_PeerIdentity *peer, |
856 | const struct GNUNET_HELLO_Address *address) | 856 | const struct GNUNET_HELLO_Address *address) |
857 | { | 857 | { |
858 | struct AddressIterateResponseMessage *msg; | 858 | struct PeerIterateResponseMessage *msg; |
859 | size_t size; | 859 | size_t size; |
860 | size_t tlen; | 860 | size_t tlen; |
861 | size_t alen; | 861 | size_t alen; |
@@ -869,7 +869,7 @@ compose_address_iterate_response_message (const struct GNUNET_PeerIdentity *peer | |||
869 | } | 869 | } |
870 | else | 870 | else |
871 | tlen = alen = 0; | 871 | tlen = alen = 0; |
872 | size = (sizeof (struct AddressIterateResponseMessage) + alen + tlen); | 872 | size = (sizeof (struct PeerIterateResponseMessage) + alen + tlen); |
873 | msg = GNUNET_malloc (size); | 873 | msg = GNUNET_malloc (size); |
874 | msg->header.size = htons (size); | 874 | msg->header.size = htons (size); |
875 | msg->header.type = | 875 | msg->header.type = |
@@ -904,7 +904,7 @@ output_address (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
904 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out) | 904 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out) |
905 | { | 905 | { |
906 | struct GNUNET_SERVER_TransmitContext *tc = cls; | 906 | struct GNUNET_SERVER_TransmitContext *tc = cls; |
907 | struct AddressIterateResponseMessage *msg; | 907 | struct PeerIterateResponseMessage *msg; |
908 | 908 | ||
909 | msg = compose_address_iterate_response_message (peer, address); | 909 | msg = compose_address_iterate_response_message (peer, address); |
910 | GNUNET_SERVER_transmit_context_append_message (tc, &msg->header); | 910 | GNUNET_SERVER_transmit_context_append_message (tc, &msg->header); |
@@ -927,7 +927,7 @@ clients_handle_address_iterate (void *cls, struct GNUNET_SERVER_Client *client, | |||
927 | { | 927 | { |
928 | static struct GNUNET_PeerIdentity all_zeros; | 928 | static struct GNUNET_PeerIdentity all_zeros; |
929 | struct GNUNET_SERVER_TransmitContext *tc; | 929 | struct GNUNET_SERVER_TransmitContext *tc; |
930 | struct AddressIterateMessage *msg; | 930 | struct PeerIterateMessage *msg; |
931 | struct GNUNET_HELLO_Address *address; | 931 | struct GNUNET_HELLO_Address *address; |
932 | 932 | ||
933 | if (ntohs (message->type) != GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_ITERATE) | 933 | if (ntohs (message->type) != GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_ITERATE) |
@@ -936,13 +936,13 @@ clients_handle_address_iterate (void *cls, struct GNUNET_SERVER_Client *client, | |||
936 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); | 936 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); |
937 | return; | 937 | return; |
938 | } | 938 | } |
939 | if (ntohs (message->size) != sizeof (struct AddressIterateMessage)) | 939 | if (ntohs (message->size) != sizeof (struct PeerIterateMessage)) |
940 | { | 940 | { |
941 | GNUNET_break (0); | 941 | GNUNET_break (0); |
942 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); | 942 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); |
943 | return; | 943 | return; |
944 | } | 944 | } |
945 | msg = (struct AddressIterateMessage *) message; | 945 | msg = (struct PeerIterateMessage *) message; |
946 | if ( (GNUNET_YES != ntohl (msg->one_shot)) && | 946 | if ( (GNUNET_YES != ntohl (msg->one_shot)) && |
947 | (NULL != lookup_monitoring_client (client)) ) | 947 | (NULL != lookup_monitoring_client (client)) ) |
948 | { | 948 | { |
@@ -1000,7 +1000,7 @@ GST_clients_start (struct GNUNET_SERVER_Handle *server) | |||
1000 | GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_TO_STRING, 0}, | 1000 | GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_TO_STRING, 0}, |
1001 | {&clients_handle_address_iterate, NULL, | 1001 | {&clients_handle_address_iterate, NULL, |
1002 | GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_ITERATE, | 1002 | GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_ITERATE, |
1003 | sizeof (struct AddressIterateMessage)}, | 1003 | sizeof (struct PeerIterateMessage)}, |
1004 | {&GST_blacklist_handle_init, NULL, | 1004 | {&GST_blacklist_handle_init, NULL, |
1005 | GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_INIT, | 1005 | GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_INIT, |
1006 | sizeof (struct GNUNET_MessageHeader)}, | 1006 | sizeof (struct GNUNET_MessageHeader)}, |
@@ -1090,7 +1090,7 @@ void | |||
1090 | GST_clients_broadcast_address_notification (const struct GNUNET_PeerIdentity *peer, | 1090 | GST_clients_broadcast_address_notification (const struct GNUNET_PeerIdentity *peer, |
1091 | const struct GNUNET_HELLO_Address *address) | 1091 | const struct GNUNET_HELLO_Address *address) |
1092 | { | 1092 | { |
1093 | struct AddressIterateResponseMessage *msg; | 1093 | struct PeerIterateResponseMessage *msg; |
1094 | struct MonitoringClient *mc; | 1094 | struct MonitoringClient *mc; |
1095 | static struct GNUNET_PeerIdentity all_zeros; | 1095 | static struct GNUNET_PeerIdentity all_zeros; |
1096 | msg = compose_address_iterate_response_message (peer, address); | 1096 | msg = compose_address_iterate_response_message (peer, address); |