[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37293 - gnunet/src/conversation
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37293 - gnunet/src/conversation |
Date: |
Mon, 20 Jun 2016 00:39:22 +0200 |
Author: grothoff
Date: 2016-06-20 00:39:22 +0200 (Mon, 20 Jun 2016)
New Revision: 37293
Modified:
gnunet/src/conversation/conversation_api.c
gnunet/src/conversation/conversation_api_call.c
Log:
-use new connecT API
Modified: gnunet/src/conversation/conversation_api.c
===================================================================
--- gnunet/src/conversation/conversation_api.c 2016-06-19 22:39:09 UTC (rev
37292)
+++ gnunet/src/conversation/conversation_api.c 2016-06-19 22:39:22 UTC (rev
37293)
@@ -557,7 +557,6 @@
};
struct GNUNET_MQ_Envelope *e;
struct ClientPhoneRegisterMessage *reg;
- struct GNUNET_CLIENT_Connection *client;
clean_up_callers (phone);
if (NULL != phone->mq)
@@ -566,14 +565,13 @@
phone->mq = NULL;
}
phone->state = PS_REGISTER;
- client = GNUNET_CLIENT_connect ("conversation",
- phone->cfg);
- if (NULL == client)
+ phone->mq = GNUNET_CLIENT_connecT (phone->cfg,
+ "conversation",
+ handlers,
+ &phone_error_handler,
+ phone);
+ if (NULL == phone->mq)
return;
- phone->mq = GNUNET_MQ_queue_for_connection_client (client,
- handlers,
- &phone_error_handler,
- phone);
e = GNUNET_MQ_msg (reg, GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_REGISTER);
reg->line = phone->my_record.line;
GNUNET_MQ_send (phone->mq, e);
Modified: gnunet/src/conversation/conversation_api_call.c
===================================================================
--- gnunet/src/conversation/conversation_api_call.c 2016-06-19 22:39:09 UTC
(rev 37292)
+++ gnunet/src/conversation/conversation_api_call.c 2016-06-19 22:39:22 UTC
(rev 37293)
@@ -86,11 +86,6 @@
const struct GNUNET_CONFIGURATION_Handle *cfg;
/**
- * Handle to talk with CONVERSATION service.
- */
- struct GNUNET_CLIENT_Connection *client;
-
- /**
* Our caller identity.
*/
struct GNUNET_IDENTITY_Ego *caller_id;
@@ -509,11 +504,6 @@
GNUNET_MQ_destroy (call->mq);
call->mq = NULL;
}
- if (NULL != call->client)
- {
- GNUNET_CLIENT_disconnect (call->client);
- call->client = NULL;
- }
call->state = CS_SHUTDOWN;
call->event_handler (call->event_handler_cls,
GNUNET_CONVERSATION_EC_CALL_ERROR);
@@ -574,8 +564,12 @@
};
struct GNUNET_CRYPTO_EcdsaPublicKey my_zone;
- call->client = GNUNET_CLIENT_connect ("conversation", cfg);
- if (NULL == call->client)
+ call->mq = GNUNET_CLIENT_connecT (cfg,
+ "conversation",
+ handlers,
+ &call_error_handler,
+ call);
+ if (NULL == call->mq)
{
GNUNET_break (0);
GNUNET_free (call);
@@ -595,10 +589,6 @@
GNUNET_CONVERSATION_call_stop (call);
return NULL;
}
- call->mq = GNUNET_MQ_queue_for_connection_client (call->client,
- handlers,
- &call_error_handler,
- call);
call->state = CS_LOOKUP;
GNUNET_IDENTITY_ego_get_public_key (call->zone_id,
&my_zone);
@@ -637,11 +627,6 @@
GNUNET_MQ_destroy (call->mq);
call->mq = NULL;
}
- if (NULL != call->client)
- {
- GNUNET_CLIENT_disconnect (call->client);
- call->client = NULL;
- }
if (NULL != call->gns_lookup)
{
GNUNET_GNS_lookup_cancel (call->gns_lookup);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37293 - gnunet/src/conversation,
gnunet <=