diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-03-30 16:18:31 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-03-30 16:18:31 +0000 |
commit | 56eca932962f58a49e727a61f05af118c56db36a (patch) | |
tree | 96e72fc95b1cbe8cacfe60a53d4aa4863f21cb27 /src/dv | |
parent | f1f6d1f9256e2847fc222d0e2c764b073e2bccbd (diff) | |
download | gnunet-56eca932962f58a49e727a61f05af118c56db36a.tar.gz gnunet-56eca932962f58a49e727a61f05af118c56db36a.zip |
small changes
Diffstat (limited to 'src/dv')
-rw-r--r-- | src/dv/gnunet-service-dv.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index 9425f56e8..0a63276f1 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c | |||
@@ -51,12 +51,12 @@ static struct GNUNET_CORE_Handle *coreAPI; | |||
51 | /** | 51 | /** |
52 | * The identity of our peer. | 52 | * The identity of our peer. |
53 | */ | 53 | */ |
54 | struct GNUNET_PeerIdentity my_identity; | 54 | static struct GNUNET_PeerIdentity my_identity; |
55 | 55 | ||
56 | /** | 56 | /** |
57 | * The configuration for this service. | 57 | * The configuration for this service. |
58 | */ | 58 | */ |
59 | const struct GNUNET_CONFIGURATION_Handle *cfg; | 59 | static const struct GNUNET_CONFIGURATION_Handle *cfg; |
60 | 60 | ||
61 | /** | 61 | /** |
62 | * The scheduler for this service. | 62 | * The scheduler for this service. |
@@ -444,18 +444,19 @@ size_t core_transmit_notify (void *cls, | |||
444 | size_t size, void *buf) | 444 | size_t size, void *buf) |
445 | { | 445 | { |
446 | struct PendingMessage *pending_message = cls; | 446 | struct PendingMessage *pending_message = cls; |
447 | char *send_buf = buf; | 447 | size_t ssize; |
448 | if ((buf == NULL) || (size < pending_message->msg_size)) | 448 | |
449 | if (buf == NULL) | ||
449 | { | 450 | { |
451 | /* FIXME: error handling: try again? free pending_message? */ | ||
450 | return 0; | 452 | return 0; |
451 | } | 453 | } |
452 | 454 | ssize = pending_message->msg_size; | |
453 | memcpy(send_buf, pending_message->msg, pending_message->msg_size); | 455 | GNUNET_assert(size >= ssize); |
454 | 456 | memcpy(buf, pending_message->msg, ssize); | |
455 | GNUNET_free(pending_message->msg); | 457 | GNUNET_free(pending_message->msg); |
456 | GNUNET_free(pending_message); | 458 | GNUNET_free(pending_message); |
457 | 459 | return ssize; | |
458 | return size; | ||
459 | } | 460 | } |
460 | 461 | ||
461 | /** | 462 | /** |
@@ -841,7 +842,6 @@ static void | |||
841 | shutdown_task (void *cls, | 842 | shutdown_task (void *cls, |
842 | const struct GNUNET_SCHEDULER_TaskContext *tc) | 843 | const struct GNUNET_SCHEDULER_TaskContext *tc) |
843 | { | 844 | { |
844 | |||
845 | GNUNET_CORE_disconnect (coreAPI); | 845 | GNUNET_CORE_disconnect (coreAPI); |
846 | } | 846 | } |
847 | 847 | ||