[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37664 - gnunet/src/core
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37664 - gnunet/src/core |
Date: |
Thu, 4 Aug 2016 16:46:43 +0200 |
Author: grothoff
Date: 2016-08-04 16:46:43 +0200 (Thu, 04 Aug 2016)
New Revision: 37664
Modified:
gnunet/src/core/core_api_2.c
Log:
-fix core mq cancel operation, need to use discard, not send_cancel as env was
never send
Modified: gnunet/src/core/core_api_2.c
===================================================================
--- gnunet/src/core/core_api_2.c 2016-08-04 14:46:16 UTC (rev 37663)
+++ gnunet/src/core/core_api_2.c 2016-08-04 14:46:43 UTC (rev 37664)
@@ -53,13 +53,13 @@
* for this peer (from @e mq).
*/
struct GNUNET_MQ_Envelope *env;
-
+
/**
* Value the client returned when we connected, used
* as the closure in various places.
*/
void *client_cls;
-
+
/**
* Peer the record is about.
*/
@@ -261,7 +261,7 @@
* so that it is transmitted with the given @a priority and
* the given @a cork value.
*
- * @param cork desired corking
+ * @param cork desired corking
* @param priority desired message priority
* @param[out] flags set to `flags` value for #GNUNET_MQ_set_options()
* @return `extra` argument to give to #GNUNET_MQ_set_options()
@@ -381,7 +381,7 @@
struct PeerRecord *pr = impl_state;
GNUNET_assert (NULL != pr->env);
- GNUNET_MQ_send_cancel (pr->env);
+ GNUNET_MQ_discard (pr->env);
pr->env = NULL;
}
@@ -419,7 +419,7 @@
struct PeerRecord *pr;
uint64_t flags;
const void *extra;
-
+
pr = GNUNET_new (struct PeerRecord);
pr->peer = *peer;
pr->h = h;
@@ -595,7 +595,7 @@
{
uint16_t msize;
const struct GNUNET_MessageHeader *em;
-
+
msize = ntohs (ntm->header.size) - sizeof (struct NotifyTrafficMessage);
if (msize < sizeof (struct GNUNET_MessageHeader))
{
@@ -682,7 +682,7 @@
* ignore! (we should have already sent another request) */
return;
}
-
+
/* ok, all good, send message out! */
GNUNET_MQ_send (h->mq,
pr->env);
@@ -812,7 +812,7 @@
/**
- * Disconnect from the core service.
+ * Disconnect from the core service.
*
* @param handle connection to core to disconnect
*/
@@ -853,7 +853,7 @@
const struct GNUNET_PeerIdentity *pid)
{
struct PeerRecord *pr;
-
+
pr = GNUNET_CONTAINER_multipeermap_get (h->peers,
pid);
if (NULL == pr)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37664 - gnunet/src/core,
gnunet <=