diff options
author | Julius Bünger <buenger@mytum.de> | 2014-12-26 00:02:05 +0000 |
---|---|---|
committer | Julius Bünger <buenger@mytum.de> | 2014-12-26 00:02:05 +0000 |
commit | 4a531f431f0d404dcfd32993f4c498d3303e3d94 (patch) | |
tree | c5fdc767d081c0cc770996b860eca062e4ba5b6e /src/rps | |
parent | ba83afb38f3c6bce7a1196410f885142a03d05f8 (diff) | |
download | gnunet-4a531f431f0d404dcfd32993f4c498d3303e3d94.tar.gz gnunet-4a531f431f0d404dcfd32993f4c498d3303e3d94.zip |
fixed usage of get_rand_peer()
Diffstat (limited to 'src/rps')
-rw-r--r-- | src/rps/gnunet-service-rps.c | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c index 3e699e606..7101b3b0d 100644 --- a/src/rps/gnunet-service-rps.c +++ b/src/rps/gnunet-service-rps.c | |||
@@ -1109,18 +1109,20 @@ do_round(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1109 | for ( i = 0 ; i < alpha * gossip_list_size ; i++ ) | 1109 | for ( i = 0 ; i < alpha * gossip_list_size ; i++ ) |
1110 | { // TODO compute length | 1110 | { // TODO compute length |
1111 | peer = get_rand_peer(gossip_list, gossip_list_size); | 1111 | peer = get_rand_peer(gossip_list, gossip_list_size); |
1112 | // TODO check NULL == peer | 1112 | if (own_identity != peer) |
1113 | LOG(GNUNET_ERROR_TYPE_DEBUG, "Sending PUSH to peer %s of gossiped list.\n", GNUNET_i2s(peer)); | 1113 | { // FIXME if this fails schedule/loop this for later |
1114 | 1114 | LOG(GNUNET_ERROR_TYPE_DEBUG, "Sending PUSH to peer %s of gossiped list.\n", GNUNET_i2s(peer)); | |
1115 | ev = GNUNET_MQ_msg (push_msg, GNUNET_MESSAGE_TYPE_RPS_PP_PUSH); | 1115 | |
1116 | //ev = GNUNET_MQ_msg_extra(); | 1116 | ev = GNUNET_MQ_msg (push_msg, GNUNET_MESSAGE_TYPE_RPS_PP_PUSH); |
1117 | /* TODO Compute proof of work here | 1117 | //ev = GNUNET_MQ_msg_extra(); |
1118 | push_msg; */ | 1118 | /* TODO Compute proof of work here |
1119 | push_msg->placeholder = 0; | 1119 | push_msg; */ |
1120 | // FIXME sometimes it returns a pointer to a freed mq | 1120 | push_msg->placeholder = 0; |
1121 | GNUNET_MQ_send (get_mq (peer_map, peer), ev); | 1121 | // FIXME sometimes it returns a pointer to a freed mq |
1122 | 1122 | GNUNET_MQ_send (get_mq (peer_map, peer), ev); | |
1123 | // modify in_flags of respective peer? | 1123 | |
1124 | // modify in_flags of respective peer? | ||
1125 | } | ||
1124 | } | 1126 | } |
1125 | 1127 | ||
1126 | 1128 | ||
@@ -1131,14 +1133,16 @@ do_round(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1131 | for ( i = 0 ; i < beta * gossip_list_size ; i++ ) | 1133 | for ( i = 0 ; i < beta * gossip_list_size ; i++ ) |
1132 | { // TODO compute length | 1134 | { // TODO compute length |
1133 | peer = get_rand_peer(gossip_list, gossip_list_size); | 1135 | peer = get_rand_peer(gossip_list, gossip_list_size); |
1134 | // TODO check empty_peer != peer | 1136 | if (own_identity != peer) |
1135 | LOG(GNUNET_ERROR_TYPE_DEBUG, "Sending PULL request to peer %s of gossiped list.\n", GNUNET_i2s(peer)); | 1137 | { // FIXME if this fails schedule/loop this for later |
1136 | 1138 | LOG(GNUNET_ERROR_TYPE_DEBUG, "Sending PULL request to peer %s of gossiped list.\n", GNUNET_i2s(peer)); | |
1137 | ev = GNUNET_MQ_msg(pull_msg, GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REQUEST); | 1139 | |
1138 | //ev = GNUNET_MQ_msg_extra(); | 1140 | ev = GNUNET_MQ_msg(pull_msg, GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REQUEST); |
1139 | pull_msg->placeholder = 0; | 1141 | //ev = GNUNET_MQ_msg_extra(); |
1140 | GNUNET_MQ_send( get_mq(peer_map, peer), ev ); | 1142 | pull_msg->placeholder = 0; |
1141 | // modify in_flags of respective peer? | 1143 | GNUNET_MQ_send( get_mq(peer_map, peer), ev ); |
1144 | // modify in_flags of respective peer? | ||
1145 | } | ||
1142 | } | 1146 | } |
1143 | 1147 | ||
1144 | 1148 | ||