diff options
Diffstat (limited to 'src/ats/gnunet-service-ats-solver_ril.c')
-rwxr-xr-x | src/ats/gnunet-service-ats-solver_ril.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/ats/gnunet-service-ats-solver_ril.c b/src/ats/gnunet-service-ats-solver_ril.c index 8cc91bdf3..512184627 100755 --- a/src/ats/gnunet-service-ats-solver_ril.c +++ b/src/ats/gnunet-service-ats-solver_ril.c | |||
@@ -290,7 +290,7 @@ struct GAS_RIL_Handle | |||
290 | /** | 290 | /** |
291 | * Hashmap containing all valid addresses | 291 | * Hashmap containing all valid addresses |
292 | */ | 292 | */ |
293 | const struct GNUNET_CONTAINER_MultiHashMap *addresses; | 293 | const struct GNUNET_CONTAINER_MultiPeerMap *addresses; |
294 | 294 | ||
295 | /** | 295 | /** |
296 | * Callbacks for the solver | 296 | * Callbacks for the solver |
@@ -976,7 +976,9 @@ ril_get_agent (struct GAS_RIL_Handle *solver, const struct GNUNET_PeerIdentity * | |||
976 | 976 | ||
977 | for (cur = solver->agents_head; NULL != cur; cur = cur->next) | 977 | for (cur = solver->agents_head; NULL != cur; cur = cur->next) |
978 | { | 978 | { |
979 | if (0 == GNUNET_CRYPTO_hash_cmp (&peer->hashPubKey, &cur->peer.hashPubKey)) | 979 | if (0 == memcmp (peer, |
980 | &cur->peer, | ||
981 | sizeof (struct GNUNET_PeerIdentity))) | ||
980 | { | 982 | { |
981 | return cur; | 983 | return cur; |
982 | } | 984 | } |
@@ -1129,7 +1131,7 @@ GAS_ril_address_change_preference (void *s, | |||
1129 | void * | 1131 | void * |
1130 | GAS_ril_init (const struct GNUNET_CONFIGURATION_Handle *cfg, | 1132 | GAS_ril_init (const struct GNUNET_CONFIGURATION_Handle *cfg, |
1131 | const struct GNUNET_STATISTICS_Handle *stats, | 1133 | const struct GNUNET_STATISTICS_Handle *stats, |
1132 | const struct GNUNET_CONTAINER_MultiHashMap *addresses, | 1134 | const struct GNUNET_CONTAINER_MultiPeerMap *addresses, |
1133 | int *network, | 1135 | int *network, |
1134 | unsigned long long *out_quota, | 1136 | unsigned long long *out_quota, |
1135 | unsigned long long *in_quota, | 1137 | unsigned long long *in_quota, |
@@ -1145,7 +1147,7 @@ GAS_ril_init (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
1145 | unsigned long long tmp; | 1147 | unsigned long long tmp; |
1146 | char *string; | 1148 | char *string; |
1147 | struct RIL_Network * cur; | 1149 | struct RIL_Network * cur; |
1148 | struct GAS_RIL_Handle *solver = GNUNET_malloc (sizeof (struct GAS_RIL_Handle)); | 1150 | struct GAS_RIL_Handle *solver = GNUNET_new (struct GAS_RIL_Handle); |
1149 | 1151 | ||
1150 | LOG(GNUNET_ERROR_TYPE_DEBUG, "API_init() Initializing RIL solver\n"); | 1152 | LOG(GNUNET_ERROR_TYPE_DEBUG, "API_init() Initializing RIL solver\n"); |
1151 | 1153 | ||