diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/ats/gnunet-service-ats_addresses.c | 8 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_addresses_mlp.c | 1 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_addresses_simplistic.c | 4 | ||||
-rw-r--r-- | src/ats/gnunet-service-ats_addresses_simplistic.h | 4 | ||||
-rw-r--r-- | src/peerinfo/gnunet-service-peerinfo.c | 6 |
5 files changed, 15 insertions, 8 deletions
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index 8eb86ac11..4663c4c7b 100644 --- a/src/ats/gnunet-service-ats_addresses.c +++ b/src/ats/gnunet-service-ats_addresses.c | |||
@@ -374,12 +374,12 @@ struct GAS_Addresses_Handle | |||
374 | * | 374 | * |
375 | * Updates existing information and adds new information | 375 | * Updates existing information and adds new information |
376 | * | 376 | * |
377 | * @param src source ATS information | 377 | * @param dest destination address |
378 | * @param ats_count number of ATS information | 378 | * @param update source ATS information |
379 | * @param delta ats performance information which were updated | 379 | * @param update_count number of ATS information |
380 | * @param delta_dest ats performance information which were updated | ||
380 | * including previous value | 381 | * including previous value |
381 | * @param delta_count number of ATS information in the delta | 382 | * @param delta_count number of ATS information in the delta |
382 | * @param dest destination address | ||
383 | * @return GNUNET_YES if address was address updated, GNUNET_NO otherwise | 383 | * @return GNUNET_YES if address was address updated, GNUNET_NO otherwise |
384 | */ | 384 | */ |
385 | static unsigned int | 385 | static unsigned int |
diff --git a/src/ats/gnunet-service-ats_addresses_mlp.c b/src/ats/gnunet-service-ats_addresses_mlp.c index dfede6c9b..b14a7af95 100644 --- a/src/ats/gnunet-service-ats_addresses_mlp.c +++ b/src/ats/gnunet-service-ats_addresses_mlp.c | |||
@@ -1040,6 +1040,7 @@ GAS_mlp_solve_problem (void *solver, struct GNUNET_CONTAINER_MultiHashMap * addr | |||
1040 | * | 1040 | * |
1041 | * @param solver the solver Handle | 1041 | * @param solver the solver Handle |
1042 | * @param addresses the address hashmap containing all addresses | 1042 | * @param addresses the address hashmap containing all addresses |
1043 | * @param address the address to add | ||
1043 | * @param network network type of this address | 1044 | * @param network network type of this address |
1044 | */ | 1045 | */ |
1045 | void | 1046 | void |
diff --git a/src/ats/gnunet-service-ats_addresses_simplistic.c b/src/ats/gnunet-service-ats_addresses_simplistic.c index 598c8ee20..de5bcfd0a 100644 --- a/src/ats/gnunet-service-ats_addresses_simplistic.c +++ b/src/ats/gnunet-service-ats_addresses_simplistic.c | |||
@@ -928,8 +928,8 @@ find_network (struct GAS_SIMPLISTIC_Handle *s, uint32_t type) | |||
928 | * @param address the update address | 928 | * @param address the update address |
929 | * @param session the new session (if changed otherwise current) | 929 | * @param session the new session (if changed otherwise current) |
930 | * @param in_use the new address in use state (if changed otherwise current) | 930 | * @param in_use the new address in use state (if changed otherwise current) |
931 | * @param atsi the latest ATS information | 931 | * @param prev_ats the latest ATS information |
932 | * @param atsi_count the atsi count | 932 | * @param prev_atsi_count the atsi count |
933 | */ | 933 | */ |
934 | void | 934 | void |
935 | GAS_simplistic_address_update (void *solver, | 935 | GAS_simplistic_address_update (void *solver, |
diff --git a/src/ats/gnunet-service-ats_addresses_simplistic.h b/src/ats/gnunet-service-ats_addresses_simplistic.h index a97351efa..98d28999f 100644 --- a/src/ats/gnunet-service-ats_addresses_simplistic.h +++ b/src/ats/gnunet-service-ats_addresses_simplistic.h | |||
@@ -102,8 +102,8 @@ GAS_simplistic_address_add (void *solver, | |||
102 | * @param address the update address | 102 | * @param address the update address |
103 | * @param session the new session (if changed otherwise current) | 103 | * @param session the new session (if changed otherwise current) |
104 | * @param in_use the new address in use state (if changed otherwise current) | 104 | * @param in_use the new address in use state (if changed otherwise current) |
105 | * @param atsi the latest ATS information | 105 | * @param prev_ats the latest ATS information |
106 | * @param atsi_count the atsi count | 106 | * @param prev_atsi_count the atsi count |
107 | */ | 107 | */ |
108 | void | 108 | void |
109 | GAS_simplistic_address_update (void *solver, | 109 | GAS_simplistic_address_update (void *solver, |
diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c index 90246827f..8b113f9ce 100644 --- a/src/peerinfo/gnunet-service-peerinfo.c +++ b/src/peerinfo/gnunet-service-peerinfo.c | |||
@@ -510,16 +510,22 @@ bind_address (const struct GNUNET_PeerIdentity *peer, | |||
510 | GNUNET_assert (NULL != host); | 510 | GNUNET_assert (NULL != host); |
511 | if (NULL == host->hello) | 511 | if (NULL == host->hello) |
512 | { | 512 | { |
513 | GNUNET_break (0); | ||
513 | host->hello = GNUNET_malloc (GNUNET_HELLO_size (hello)); | 514 | host->hello = GNUNET_malloc (GNUNET_HELLO_size (hello)); |
514 | memcpy (host->hello, hello, GNUNET_HELLO_size (hello)); | 515 | memcpy (host->hello, hello, GNUNET_HELLO_size (hello)); |
515 | } | 516 | } |
516 | else | 517 | else |
517 | { | 518 | { |
519 | |||
520 | if (GNUNET_HELLO_is_friend_only (host->hello) != GNUNET_HELLO_is_friend_only (hello)) | ||
521 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
522 | "Merging public with friend only HELLO, result will be friend-only!\n"); | ||
518 | mrg = GNUNET_HELLO_merge (host->hello, hello); | 523 | mrg = GNUNET_HELLO_merge (host->hello, hello); |
519 | delta = GNUNET_HELLO_equals (mrg, host->hello, GNUNET_TIME_absolute_get ()); | 524 | delta = GNUNET_HELLO_equals (mrg, host->hello, GNUNET_TIME_absolute_get ()); |
520 | if (delta.abs_value == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value) | 525 | if (delta.abs_value == GNUNET_TIME_UNIT_FOREVER_ABS.abs_value) |
521 | { | 526 | { |
522 | /* no differences, just ignore the update */ | 527 | /* no differences, just ignore the update */ |
528 | GNUNET_break (0); | ||
523 | GNUNET_free (mrg); | 529 | GNUNET_free (mrg); |
524 | return; | 530 | return; |
525 | } | 531 | } |