diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2013-04-05 14:43:13 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-04-05 14:43:13 +0000 |
commit | daaddaf0ccad48256ee4e9f4ded6b01b40bc84aa (patch) | |
tree | fe55651384cd73686e6bd00b39f9ec4bcafd8380 /src/peerinfo/gnunet-service-peerinfo.c | |
parent | fd0d9980897919b32209d1524ebdc497174a3043 (diff) | |
download | gnunet-daaddaf0ccad48256ee4e9f4ded6b01b40bc84aa.tar.gz gnunet-daaddaf0ccad48256ee4e9f4ded6b01b40bc84aa.zip |
doxygen
Diffstat (limited to 'src/peerinfo/gnunet-service-peerinfo.c')
-rw-r--r-- | src/peerinfo/gnunet-service-peerinfo.c | 6 |
1 files changed, 6 insertions, 0 deletions
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 | } |