aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorlurchi <lurchi@strangeplace.net>2017-12-30 20:46:59 +0100
committerlurchi <lurchi@strangeplace.net>2017-12-30 20:46:59 +0100
commit5c8feda7faa01365a1fb6983595ceb65dfe4fb11 (patch)
tree3521d1131a2f3d063455a58c86c42af3c7551077 /src/core
parentd01f1bd83384cbdb74fa963526d31270bf58c805 (diff)
parent8412625bb5191040389610364167c768bb55efb4 (diff)
downloadgnunet-5c8feda7faa01365a1fb6983595ceb65dfe4fb11.tar.gz
gnunet-5c8feda7faa01365a1fb6983595ceb65dfe4fb11.zip
Merge branch 'fix_social'
Diffstat (limited to 'src/core')
-rw-r--r--src/core/gnunet-service-core.c3
-rw-r--r--src/core/gnunet-service-core_kx.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 625bf9655..214f72904 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -426,6 +426,9 @@ struct TokenizerContext
426 * 426 *
427 * @param cls reservation request (`struct TokenizerContext`) 427 * @param cls reservation request (`struct TokenizerContext`)
428 * @param message the actual message 428 * @param message the actual message
429 * @return #GNUNET_OK on success,
430 * #GNUNET_NO to stop further processing (no error)
431 * #GNUNET_SYSERR to stop further processing with error
429 */ 432 */
430static int 433static int
431tokenized_cb (void *cls, 434tokenized_cb (void *cls,
diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c
index c80fbb322..944d1e692 100644
--- a/src/core/gnunet-service-core_kx.c
+++ b/src/core/gnunet-service-core_kx.c
@@ -708,6 +708,9 @@ setup_fresh_ping (struct GSC_KeyExchangeInfo *kx)
708 * 708 *
709 * @param cls the `struct GSC_KeyExchangeInfo` 709 * @param cls the `struct GSC_KeyExchangeInfo`
710 * @param m the message 710 * @param m the message
711 * @return #GNUNET_OK on success,
712 * #GNUNET_NO to stop further processing (no error)
713 * #GNUNET_SYSERR to stop further processing with error
711 */ 714 */
712static int 715static int
713deliver_message (void *cls, 716deliver_message (void *cls,