[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37297 - in gnunet/src: ats consensus peerstore rps secrets
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r37297 - in gnunet/src: ats consensus peerstore rps secretsharing set util |
|
Date: |
Mon, 20 Jun 2016 00:53:13 +0200 |
Author: grothoff
Date: 2016-06-20 00:53:13 +0200 (Mon, 20 Jun 2016)
New Revision: 37297
Modified:
gnunet/src/ats/ats_api_connectivity.c
gnunet/src/ats/ats_api_scheduling.c
gnunet/src/consensus/consensus_api.c
gnunet/src/peerstore/peerstore_api.c
gnunet/src/rps/rps_api.c
gnunet/src/secretsharing/secretsharing_api.c
gnunet/src/set/set_api.c
gnunet/src/util/test_mq_client.c
Log:
avoid deprecated API, use new connecT API
Modified: gnunet/src/ats/ats_api_connectivity.c
===================================================================
--- gnunet/src/ats/ats_api_connectivity.c 2016-06-19 22:45:09 UTC (rev
37296)
+++ gnunet/src/ats/ats_api_connectivity.c 2016-06-19 22:53:13 UTC (rev
37297)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2010-2015 GNUnet e.V.
+ Copyright (C) 2010-2016 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -193,19 +193,18 @@
{ { NULL, 0, 0 } };
struct GNUNET_MQ_Envelope *ev;
struct ClientStartMessage *init;
- struct GNUNET_CLIENT_Connection *client;
GNUNET_assert (NULL == ch->mq);
- client = GNUNET_CLIENT_connect ("ats", ch->cfg);
- if (NULL == client)
+ ch->mq = GNUNET_CLIENT_connecT (ch->cfg,
+ "ats",
+ handlers,
+ &error_handler,
+ ch);
+ if (NULL == ch->mq)
{
force_reconnect (ch);
return;
}
- ch->mq = GNUNET_MQ_queue_for_connection_client (client,
- handlers,
- &error_handler,
- ch);
ev = GNUNET_MQ_msg (init,
GNUNET_MESSAGE_TYPE_ATS_START);
init->start_flag = htonl (START_FLAG_CONNECTION_SUGGESTION);
Modified: gnunet/src/ats/ats_api_scheduling.c
===================================================================
--- gnunet/src/ats/ats_api_scheduling.c 2016-06-19 22:45:09 UTC (rev 37296)
+++ gnunet/src/ats/ats_api_scheduling.c 2016-06-19 22:53:13 UTC (rev 37297)
@@ -529,21 +529,19 @@
struct ClientStartMessage *init;
unsigned int i;
struct GNUNET_ATS_AddressRecord *ar;
- struct GNUNET_CLIENT_Connection *client;
GNUNET_assert (NULL == sh->mq);
- client = GNUNET_CLIENT_connect ("ats",
- sh->cfg);
- if (NULL == client)
+ sh->mq = GNUNET_CLIENT_connecT (sh->cfg,
+ "ats",
+ handlers,
+ &error_handler,
+ sh);
+ if (NULL == sh->mq)
{
GNUNET_break (0);
force_reconnect (sh);
return;
}
- sh->mq = GNUNET_MQ_queue_for_connection_client (client,
- handlers,
- &error_handler,
- sh);
ev = GNUNET_MQ_msg (init,
GNUNET_MESSAGE_TYPE_ATS_START);
init->start_flag = htonl (START_FLAG_SCHEDULING);
Modified: gnunet/src/consensus/consensus_api.c
===================================================================
--- gnunet/src/consensus/consensus_api.c 2016-06-19 22:45:09 UTC (rev
37296)
+++ gnunet/src/consensus/consensus_api.c 2016-06-19 22:53:13 UTC (rev
37297)
@@ -217,22 +217,21 @@
};
struct GNUNET_CONSENSUS_JoinMessage *join_msg;
struct GNUNET_MQ_Envelope *ev;
- struct GNUNET_CLIENT_Connection *client;
consensus->cfg = cfg;
consensus->new_element_cb = new_element_cb;
consensus->new_element_cls = new_element_cls;
consensus->session_id = *session_id;
- client = GNUNET_CLIENT_connect ("consensus", cfg);
- if (NULL == client)
+ consensus->mq = GNUNET_CLIENT_connecT (cfg,
+ "consensus",
+ mq_handlers,
+ &mq_error_handler,
+ consensus);
+ if (NULL == consensus->mq)
{
GNUNET_free (consensus);
return NULL;
}
- consensus->mq = GNUNET_MQ_queue_for_connection_client (client,
- mq_handlers,
- &mq_error_handler,
- consensus);
ev = GNUNET_MQ_msg_extra (join_msg,
(num_peers * sizeof (struct GNUNET_PeerIdentity)),
GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_JOIN);
Modified: gnunet/src/peerstore/peerstore_api.c
===================================================================
--- gnunet/src/peerstore/peerstore_api.c 2016-06-19 22:45:09 UTC (rev
37296)
+++ gnunet/src/peerstore/peerstore_api.c 2016-06-19 22:53:13 UTC (rev
37297)
@@ -807,7 +807,6 @@
void *icb_cls;
struct GNUNET_PEERSTORE_StoreContext *sc;
struct GNUNET_MQ_Envelope *ev;
- struct GNUNET_CLIENT_Connection *client;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Reconnecting...\n");
@@ -830,13 +829,13 @@
GNUNET_MQ_destroy (h->mq);
h->mq = NULL;
}
- client = GNUNET_CLIENT_connect ("peerstore",
- h->cfg);
- if (NULL == client)
+ h->mq = GNUNET_CLIENT_connecT (h->cfg,
+ "peerstore",
+ mq_handlers,
+ &handle_client_error,
+ h);
+ if (NULL == h->mq)
return;
- h->mq = GNUNET_MQ_queue_for_connection_client (client,
- mq_handlers,
- &handle_client_error, h);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Resending pending requests after reconnect.\n");
if (NULL != h->watches)
Modified: gnunet/src/rps/rps_api.c
===================================================================
--- gnunet/src/rps/rps_api.c 2016-06-19 22:45:09 UTC (rev 37296)
+++ gnunet/src/rps/rps_api.c 2016-06-19 22:53:13 UTC (rev 37297)
@@ -221,13 +221,11 @@
if (NULL != h->mq)
GNUNET_MQ_destroy (h->mq);
- conn = GNUNET_CLIENT_connect ("rps", h->cfg);
- if (NULL == conn)
- return;
- h->mq = GNUNET_MQ_queue_for_connection_client (conn,
- mq_handlers,
- &mq_error_handler,
- h);
+ h->mq = GNUNET_CLIENT_connecT (h->cfg,
+ "rps",
+ mq_handlers,
+ &mq_error_handler,
+ h);
}
Modified: gnunet/src/secretsharing/secretsharing_api.c
===================================================================
--- gnunet/src/secretsharing/secretsharing_api.c 2016-06-19 22:45:09 UTC
(rev 37296)
+++ gnunet/src/secretsharing/secretsharing_api.c 2016-06-19 22:53:13 UTC
(rev 37297)
@@ -260,10 +260,14 @@
};
struct GNUNET_MQ_Envelope *ev;
struct GNUNET_SECRETSHARING_CreateMessage *msg;
- struct GNUNET_CLIENT_Connection *client;
- client = GNUNET_CLIENT_connect ("secretsharing", cfg);
- if (NULL == client)
+ s->mq = GNUNET_CLIENT_connecT (cfg,
+ "secretsharing",
+ client,
+ mq_handlers,
+ &handle_session_client_error,
+ s);
+ if (NULL == s->mq)
{
/* secretsharing not configured correctly */
GNUNET_break (0);
@@ -272,12 +276,6 @@
}
s->secret_ready_cb = cb;
s->secret_ready_cls = cls;
- s->mq = GNUNET_MQ_queue_for_connection_client (client,
- mq_handlers,
- &handle_session_client_error,
- s);
- GNUNET_assert (NULL != s->mq);
-
ev = GNUNET_MQ_msg_extra (msg,
num_peers * sizeof (struct GNUNET_PeerIdentity),
GNUNET_MESSAGE_TYPE_SECRETSHARING_CLIENT_GENERATE);
@@ -348,20 +346,19 @@
struct GNUNET_MQ_Envelope *ev;
struct GNUNET_SECRETSHARING_DecryptRequestMessage *msg;
size_t share_size;
- struct GNUNET_CLIENT_Connection *client;
- client = GNUNET_CLIENT_connect ("secretsharing", cfg);
- if (NULL == client)
- return NULL;
s->decrypt_cb = decrypt_cb;
s->decrypt_cls = decrypt_cb_cls;
-
- s->mq = GNUNET_MQ_queue_for_connection_client (client,
- mq_handlers,
- &handle_decrypt_client_error,
- s);
- GNUNET_assert (NULL != s->mq);
-
+ s->mq = GNUNET_CLIENT_connecT (cfg,
+ "secretsharing",
+ mq_handlers,
+ &handle_decrypt_client_error,
+ s);
+ if (NULL == s->mq)
+ {
+ GNUNET_free (s);
+ return NULL;
+ }
GNUNET_assert (GNUNET_OK ==
GNUNET_SECRETSHARING_share_write (share, NULL, 0,
&share_size));
Modified: gnunet/src/set/set_api.c
===================================================================
--- gnunet/src/set/set_api.c 2016-06-19 22:45:09 UTC (rev 37296)
+++ gnunet/src/set/set_api.c 2016-06-19 22:53:13 UTC (rev 37297)
@@ -903,21 +903,21 @@
};
struct GNUNET_MQ_Envelope *mqm;
struct GNUNET_SET_ListenMessage *msg;
- struct GNUNET_CLIENT_Connection *client;
lh->reconnect_task = NULL;
GNUNET_assert (NULL == lh->mq);
- client = GNUNET_CLIENT_connect ("set", lh->cfg);
- if (NULL == client)
+ lh->mq = GNUNET_CLIENT_connecT (lh->cfg,
+ "set",
+ mq_handlers,
+ &handle_client_listener_error,
+ lh);
+ if (NULL == lh->mq)
return;
- lh->mq = GNUNET_MQ_queue_for_connection_client (client,
- mq_handlers,
-
&handle_client_listener_error,
- lh);
mqm = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_SET_LISTEN);
msg->operation = htonl (lh->operation);
msg->app_id = lh->app_id;
- GNUNET_MQ_send (lh->mq, mqm);
+ GNUNET_MQ_send (lh->mq,
+ mqm);
}
Modified: gnunet/src/util/test_mq_client.c
===================================================================
--- gnunet/src/util/test_mq_client.c 2016-06-19 22:45:09 UTC (rev 37296)
+++ gnunet/src/util/test_mq_client.c 2016-06-19 22:53:13 UTC (rev 37297)
@@ -113,15 +113,13 @@
static void
test_mq ()
{
- struct GNUNET_CLIENT_Connection *client;
struct GNUNET_MQ_Handle *mq;
struct GNUNET_MQ_Envelope *mqm;
- client = GNUNET_CLIENT_connect ("test", cfg);
- GNUNET_assert (client != NULL);
-
/* FIXME: test handling responses */
- mq = GNUNET_MQ_queue_for_connection_client (client, NULL, NULL, NULL);
+ mq = GNUNET_CLIENT_connecT (cfg,
+ "test",
+ NULL, NULL, NULL);
mqm = GNUNET_MQ_msg_header (MY_TYPE);
GNUNET_MQ_send (mq, mqm);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37297 - in gnunet/src: ats consensus peerstore rps secretsharing set util,
gnunet <=