[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37156 - in gnunet/src: psyc social
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37156 - in gnunet/src: psyc social |
Date: |
Thu, 12 May 2016 02:21:25 +0200 |
Author: tg
Date: 2016-05-12 02:21:25 +0200 (Thu, 12 May 2016)
New Revision: 37156
Modified:
gnunet/src/psyc/gnunet-service-psyc.c
gnunet/src/social/gnunet-service-social.c
gnunet/src/social/gnunet-social.c
Log:
psyc/social: transmit fix
Modified: gnunet/src/psyc/gnunet-service-psyc.c
===================================================================
--- gnunet/src/psyc/gnunet-service-psyc.c 2016-05-11 22:11:06 UTC (rev
37155)
+++ gnunet/src/psyc/gnunet-service-psyc.c 2016-05-12 00:21:25 UTC (rev
37156)
@@ -2068,10 +2068,13 @@
return;
if (NULL == mst->tmit_handle)
{
- mst->tmit_handle
- = GNUNET_MULTICAST_origin_to_all (mst->origin, tmit_msg->id,
- mst->max_group_generation,
- master_transmit_notify, mst);
+ mst->tmit_handle = (void *) &mst->tmit_handle;
+ struct GNUNET_MULTICAST_OriginTransmitHandle *
+ tmit_handle = GNUNET_MULTICAST_origin_to_all (mst->origin, tmit_msg->id,
+ mst->max_group_generation,
+ master_transmit_notify,
mst);
+ if (NULL != mst->tmit_handle)
+ mst->tmit_handle = tmit_handle;
}
else
{
@@ -2090,9 +2093,12 @@
return;
if (NULL == slv->tmit_handle)
{
- slv->tmit_handle
- = GNUNET_MULTICAST_member_to_origin (slv->member, slv->chn.tmit_head->id,
- slave_transmit_notify, slv);
+ slv->tmit_handle = (void *) &slv->tmit_handle;
+ struct GNUNET_MULTICAST_MemberTransmitHandle *
+ tmit_handle = GNUNET_MULTICAST_member_to_origin (slv->member,
slv->chn.tmit_head->id,
+ slave_transmit_notify,
slv);
+ if (NULL != slv->tmit_handle)
+ slv->tmit_handle = tmit_handle;
}
else
{
Modified: gnunet/src/social/gnunet-service-social.c
===================================================================
--- gnunet/src/social/gnunet-service-social.c 2016-05-11 22:11:06 UTC (rev
37155)
+++ gnunet/src/social/gnunet-service-social.c 2016-05-12 00:21:25 UTC (rev
37156)
@@ -2666,11 +2666,14 @@
if (NULL == pmeth)
return GNUNET_SYSERR;
- hst->tmit_handle
- = GNUNET_PSYC_master_transmit (hst->master, (const char *) &pmeth[1],
- &host_transmit_notify_mod,
- &host_transmit_notify_data, hst,
- pmeth->flags);
+ hst->tmit_handle = (void *) &hst->tmit_handle;
+ struct GNUNET_PSYC_MasterTransmitHandle *
+ tmit_handle = GNUNET_PSYC_master_transmit (hst->master, (const char *)
&pmeth[1],
+ &host_transmit_notify_mod,
+ &host_transmit_notify_data,
hst,
+ pmeth->flags);
+ if (NULL != hst->tmit_handle)
+ hst->tmit_handle = tmit_handle;
GNUNET_free (pmeth);
}
else
@@ -2696,11 +2699,14 @@
if (NULL == pmeth)
return GNUNET_SYSERR;
- gst->tmit_handle
- = GNUNET_PSYC_slave_transmit (gst->slave, (const char *) &pmeth[1],
- &guest_transmit_notify_mod,
- &guest_transmit_notify_data, gst,
- pmeth->flags);
+ gst->tmit_handle = (void *) &gst->tmit_handle;
+ struct GNUNET_PSYC_SlaveTransmitHandle *
+ tmit_handle = GNUNET_PSYC_slave_transmit (gst->slave, (const char *)
&pmeth[1],
+ &guest_transmit_notify_mod,
+ &guest_transmit_notify_data,
gst,
+ pmeth->flags);
+ if (NULL != gst->tmit_handle)
+ gst->tmit_handle = tmit_handle;
GNUNET_free (pmeth);
}
else
Modified: gnunet/src/social/gnunet-social.c
===================================================================
--- gnunet/src/social/gnunet-social.c 2016-05-11 22:11:06 UTC (rev 37155)
+++ gnunet/src/social/gnunet-social.c 2016-05-12 00:21:25 UTC (rev 37156)
@@ -227,7 +227,7 @@
GNUNET_SCHEDULER_cancel (timeout_task);
timeout_task = NULL;
}
- GNUNET_SCHEDULER_add_now (schedule_success, NULL);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, schedule_success,
NULL);
}
@@ -239,7 +239,7 @@
GNUNET_SCHEDULER_cancel (timeout_task);
timeout_task = NULL;
}
- GNUNET_SCHEDULER_add_now (schedule_fail, NULL);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, schedule_fail, NULL);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37156 - in gnunet/src: psyc social,
gnunet <=