[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37667 - gnunet/src/multicast
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37667 - gnunet/src/multicast |
Date: |
Thu, 4 Aug 2016 22:10:23 +0200 |
Author: tg
Date: 2016-08-04 22:10:22 +0200 (Thu, 04 Aug 2016)
New Revision: 37667
Modified:
gnunet/src/multicast/multicast_api.c
Log:
multicast: switch to MQ
Modified: gnunet/src/multicast/multicast_api.c
===================================================================
--- gnunet/src/multicast/multicast_api.c 2016-08-04 20:10:17 UTC (rev
37666)
+++ gnunet/src/multicast/multicast_api.c 2016-08-04 20:10:22 UTC (rev
37667)
@@ -27,7 +27,6 @@
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_mq_lib.h"
#include "gnunet_multicast_service.h"
#include "multicast.h"
@@ -79,7 +78,7 @@
/**
* Time to wait until we try to reconnect on failure.
*/
- struct GNUNET_TIME_Relative reconnect_backoff;
+ struct GNUNET_TIME_Relative reconnect_delay;
/**
* Task for reconnecting when the listener fails.
@@ -255,7 +254,7 @@
jh->peer = jreq->peer;
grp->join_req_cb (grp->cb_cls, &jreq->member_pub_key, jmsg, jh);
- grp->reconnect_backoff = GNUNET_TIME_UNIT_MILLISECONDS;
+ grp->reconnect_delay = GNUNET_TIME_UNIT_MILLISECONDS;
}
@@ -289,7 +288,7 @@
if (NULL != grp->message_cb)
grp->message_cb (grp->cb_cls, mmsg);
- grp->reconnect_backoff = GNUNET_TIME_UNIT_MILLISECONDS;
+ grp->reconnect_delay = GNUNET_TIME_UNIT_MILLISECONDS;
}
@@ -322,7 +321,7 @@
else
member_to_origin ((struct GNUNET_MULTICAST_Member *) grp);
- grp->reconnect_backoff = GNUNET_TIME_UNIT_MILLISECONDS;
+ grp->reconnect_delay = GNUNET_TIME_UNIT_MILLISECONDS;
}
@@ -355,7 +354,7 @@
if (NULL != orig->request_cb)
orig->request_cb (grp->cb_cls, req);
- grp->reconnect_backoff = GNUNET_TIME_UNIT_MILLISECONDS;
+ grp->reconnect_delay = GNUNET_TIME_UNIT_MILLISECONDS;
}
@@ -400,7 +399,7 @@
}
}
- grp->reconnect_backoff = GNUNET_TIME_UNIT_MILLISECONDS;
+ grp->reconnect_delay = GNUNET_TIME_UNIT_MILLISECONDS;
}
@@ -516,7 +515,7 @@
//if (GNUNET_YES != is_admitted)
// GNUNET_MULTICAST_member_part (mem);
- grp->reconnect_backoff = GNUNET_TIME_UNIT_MILLISECONDS;
+ grp->reconnect_delay = GNUNET_TIME_UNIT_MILLISECONDS;
}
@@ -693,7 +692,7 @@
}
-void
+static void
origin_connect (struct GNUNET_MULTICAST_Origin *orig);
@@ -707,9 +706,9 @@
/**
* Origin client disconnected from service.
*
- * Reconnect after backoff period.=
+ * Reconnect after backoff period.
*/
-void
+static void
origin_disconnected (void *cls, enum GNUNET_MQ_Error error)
{
struct GNUNET_MULTICAST_Origin *orig = cls;
@@ -724,10 +723,10 @@
grp->mq = NULL;
}
- grp->reconnect_task = GNUNET_SCHEDULER_add_delayed (grp->reconnect_backoff,
+ grp->reconnect_task = GNUNET_SCHEDULER_add_delayed (grp->reconnect_delay,
&origin_reconnect,
orig);
- grp->reconnect_backoff = GNUNET_TIME_STD_BACKOFF (grp->reconnect_backoff);
+ grp->reconnect_delay = GNUNET_TIME_STD_BACKOFF (grp->reconnect_delay);
}
@@ -734,7 +733,7 @@
/**
* Connect to service as origin.
*/
-void
+static void
origin_connect (struct GNUNET_MULTICAST_Origin *orig)
{
struct GNUNET_MULTICAST_Group *grp = &orig->grp;
@@ -770,11 +769,7 @@
grp->mq = GNUNET_CLIENT_connecT (grp->cfg, "multicast",
handlers, origin_disconnected, orig);
- if (NULL == grp->mq)
- {
- GNUNET_break (0);
- return;
- }
+ GNUNET_assert (NULL != grp->mq);
GNUNET_MQ_send_copy (grp->mq, grp->connect_env);
}
@@ -902,7 +897,7 @@
"%p OriginTransmitNotify() returned error or invalid message size.\n",
orig);
/* FIXME: handle error */
- GNUNET_free (env);
+ GNUNET_MQ_discard (env);
return;
}
@@ -910,7 +905,7 @@
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"%p OriginTransmitNotify() - transmission paused.\n", orig);
- GNUNET_free (env);
+ GNUNET_MQ_discard (env);
return; /* Transmission paused. */
}
@@ -1000,7 +995,7 @@
}
- void
+static void
member_connect (struct GNUNET_MULTICAST_Member *mem);
@@ -1016,7 +1011,7 @@
*
* Reconnect after backoff period.
*/
-void
+static void
member_disconnected (void *cls, enum GNUNET_MQ_Error error)
{
struct GNUNET_MULTICAST_Member *mem = cls;
@@ -1028,10 +1023,10 @@
GNUNET_MQ_destroy (grp->mq);
grp->mq = NULL;
- grp->reconnect_task = GNUNET_SCHEDULER_add_delayed (grp->reconnect_backoff,
+ grp->reconnect_task = GNUNET_SCHEDULER_add_delayed (grp->reconnect_delay,
&member_reconnect,
mem);
- grp->reconnect_backoff = GNUNET_TIME_STD_BACKOFF (grp->reconnect_backoff);
+ grp->reconnect_delay = GNUNET_TIME_STD_BACKOFF (grp->reconnect_delay);
}
@@ -1038,7 +1033,7 @@
/**
* Connect to service as member.
*/
-void
+static void
member_connect (struct GNUNET_MULTICAST_Member *mem)
{
struct GNUNET_MULTICAST_Group *grp = &mem->grp;
@@ -1079,11 +1074,7 @@
grp->mq = GNUNET_CLIENT_connecT (grp->cfg, "multicast",
handlers, member_disconnected, mem);
- if (NULL == grp->mq)
- {
- GNUNET_break (0);
- return;
- }
+ GNUNET_assert (NULL != grp->mq);
GNUNET_MQ_send_copy (grp->mq, grp->connect_env);
}
@@ -1171,7 +1162,7 @@
if (0 < join_msg_size)
GNUNET_memcpy (((char *) &join[1]) + relay_size, join_msg, join_msg_size);
- grp->reconnect_backoff = GNUNET_TIME_UNIT_MILLISECONDS;
+ grp->reconnect_delay = GNUNET_TIME_UNIT_MILLISECONDS;
grp->is_origin = GNUNET_NO;
grp->cfg = cfg;
@@ -1326,7 +1317,7 @@
"MemberTransmitNotify() returned error or invalid message size. "
"ret=%d, buf_size=%u\n", ret, buf_size);
/* FIXME: handle error */
- GNUNET_free (req);
+ GNUNET_MQ_discard (env);
return;
}
@@ -1333,7 +1324,7 @@
if (GNUNET_NO == ret && 0 == buf_size)
{
/* Transmission paused. */
- GNUNET_free (req);
+ GNUNET_MQ_discard (env);
return;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37667 - gnunet/src/multicast,
gnunet <=