diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-05-24 09:35:37 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-05-24 09:35:37 +0000 |
commit | 101f5787ac60dafa175950fb714c6d4cc4906478 (patch) | |
tree | 711c8042c8b22856b0946d0c819a3520498ac274 /src/core | |
parent | 6743123dcc6b37dabf2759f384a7f6ad08a08bec (diff) | |
download | gnunet-101f5787ac60dafa175950fb714c6d4cc4906478.tar.gz gnunet-101f5787ac60dafa175950fb714c6d4cc4906478.zip |
- adding return value to mst callback
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/gnunet-service-core_clients.c | 3 | ||||
-rw-r--r-- | src/core/gnunet-service-core_kx.c | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/core/gnunet-service-core_clients.c b/src/core/gnunet-service-core_clients.c index 2c603d217..1076f343f 100644 --- a/src/core/gnunet-service-core_clients.c +++ b/src/core/gnunet-service-core_clients.c | |||
@@ -506,7 +506,7 @@ handle_client_send (void *cls, struct GNUNET_SERVER_Client *client, | |||
506 | * @param client reservation request ('struct GSC_ClientActiveRequest') | 506 | * @param client reservation request ('struct GSC_ClientActiveRequest') |
507 | * @param message the actual message | 507 | * @param message the actual message |
508 | */ | 508 | */ |
509 | static void | 509 | static int |
510 | client_tokenizer_callback (void *cls, void *client, | 510 | client_tokenizer_callback (void *cls, void *client, |
511 | const struct GNUNET_MessageHeader *message) | 511 | const struct GNUNET_MessageHeader *message) |
512 | { | 512 | { |
@@ -546,6 +546,7 @@ client_tokenizer_callback (void *cls, void *client, | |||
546 | GNUNET_CORE_OPTION_SEND_HDR_OUTBOUND); | 546 | GNUNET_CORE_OPTION_SEND_HDR_OUTBOUND); |
547 | GSC_SESSIONS_transmit (car, message, tc->cork); | 547 | GSC_SESSIONS_transmit (car, message, tc->cork); |
548 | } | 548 | } |
549 | return GNUNET_OK; | ||
549 | } | 550 | } |
550 | 551 | ||
551 | 552 | ||
diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index 81c3382af..1fce2e528 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c | |||
@@ -1658,7 +1658,7 @@ GSC_KX_handle_encrypted_message (struct GSC_KeyExchangeInfo *kx, | |||
1658 | * @param client who sent us the message (struct GSC_KeyExchangeInfo) | 1658 | * @param client who sent us the message (struct GSC_KeyExchangeInfo) |
1659 | * @param m the message | 1659 | * @param m the message |
1660 | */ | 1660 | */ |
1661 | static void | 1661 | static int |
1662 | deliver_message (void *cls, void *client, const struct GNUNET_MessageHeader *m) | 1662 | deliver_message (void *cls, void *client, const struct GNUNET_MessageHeader *m) |
1663 | { | 1663 | { |
1664 | struct DeliverMessageContext *dmc = client; | 1664 | struct DeliverMessageContext *dmc = client; |
@@ -1668,7 +1668,7 @@ deliver_message (void *cls, void *client, const struct GNUNET_MessageHeader *m) | |||
1668 | case GNUNET_MESSAGE_TYPE_CORE_BINARY_TYPE_MAP: | 1668 | case GNUNET_MESSAGE_TYPE_CORE_BINARY_TYPE_MAP: |
1669 | case GNUNET_MESSAGE_TYPE_CORE_COMPRESSED_TYPE_MAP: | 1669 | case GNUNET_MESSAGE_TYPE_CORE_COMPRESSED_TYPE_MAP: |
1670 | GSC_SESSIONS_set_typemap (dmc->peer, m); | 1670 | GSC_SESSIONS_set_typemap (dmc->peer, m); |
1671 | return; | 1671 | return GNUNET_OK; |
1672 | default: | 1672 | default: |
1673 | GSC_CLIENTS_deliver_message (dmc->peer, dmc->atsi, dmc->atsi_count, m, | 1673 | GSC_CLIENTS_deliver_message (dmc->peer, dmc->atsi, dmc->atsi_count, m, |
1674 | ntohs (m->size), | 1674 | ntohs (m->size), |
@@ -1677,6 +1677,7 @@ deliver_message (void *cls, void *client, const struct GNUNET_MessageHeader *m) | |||
1677 | sizeof (struct GNUNET_MessageHeader), | 1677 | sizeof (struct GNUNET_MessageHeader), |
1678 | GNUNET_CORE_OPTION_SEND_HDR_INBOUND); | 1678 | GNUNET_CORE_OPTION_SEND_HDR_INBOUND); |
1679 | } | 1679 | } |
1680 | return GNUNET_OK; | ||
1680 | } | 1681 | } |
1681 | 1682 | ||
1682 | 1683 | ||