diff options
author | Gabor X Toth <*@tg-x.net> | 2016-05-12 00:21:25 +0000 |
---|---|---|
committer | Gabor X Toth <*@tg-x.net> | 2016-05-12 00:21:25 +0000 |
commit | 9ced7c72a9acfe9c99b4d2f07bb81e11a1a23707 (patch) | |
tree | 39049d5e856ce39a71fa93d0bf68b009d5658095 /src/social | |
parent | d22568f1f9147e3d8ea96f2c4592985702b2eab9 (diff) | |
download | gnunet-9ced7c72a9acfe9c99b4d2f07bb81e11a1a23707.tar.gz gnunet-9ced7c72a9acfe9c99b4d2f07bb81e11a1a23707.zip |
psyc/social: transmit fix
Diffstat (limited to 'src/social')
-rw-r--r-- | src/social/gnunet-service-social.c | 26 | ||||
-rw-r--r-- | src/social/gnunet-social.c | 4 |
2 files changed, 18 insertions, 12 deletions
diff --git a/src/social/gnunet-service-social.c b/src/social/gnunet-service-social.c index 8dd51e610..c379ff76b 100644 --- a/src/social/gnunet-service-social.c +++ b/src/social/gnunet-service-social.c | |||
@@ -2666,11 +2666,14 @@ psyc_master_transmit_message (struct Host *hst) | |||
2666 | if (NULL == pmeth) | 2666 | if (NULL == pmeth) |
2667 | return GNUNET_SYSERR; | 2667 | return GNUNET_SYSERR; |
2668 | 2668 | ||
2669 | hst->tmit_handle | 2669 | hst->tmit_handle = (void *) &hst->tmit_handle; |
2670 | = GNUNET_PSYC_master_transmit (hst->master, (const char *) &pmeth[1], | 2670 | struct GNUNET_PSYC_MasterTransmitHandle * |
2671 | &host_transmit_notify_mod, | 2671 | tmit_handle = GNUNET_PSYC_master_transmit (hst->master, (const char *) &pmeth[1], |
2672 | &host_transmit_notify_data, hst, | 2672 | &host_transmit_notify_mod, |
2673 | pmeth->flags); | 2673 | &host_transmit_notify_data, hst, |
2674 | pmeth->flags); | ||
2675 | if (NULL != hst->tmit_handle) | ||
2676 | hst->tmit_handle = tmit_handle; | ||
2674 | GNUNET_free (pmeth); | 2677 | GNUNET_free (pmeth); |
2675 | } | 2678 | } |
2676 | else | 2679 | else |
@@ -2696,11 +2699,14 @@ psyc_slave_transmit_message (struct Guest *gst) | |||
2696 | if (NULL == pmeth) | 2699 | if (NULL == pmeth) |
2697 | return GNUNET_SYSERR; | 2700 | return GNUNET_SYSERR; |
2698 | 2701 | ||
2699 | gst->tmit_handle | 2702 | gst->tmit_handle = (void *) &gst->tmit_handle; |
2700 | = GNUNET_PSYC_slave_transmit (gst->slave, (const char *) &pmeth[1], | 2703 | struct GNUNET_PSYC_SlaveTransmitHandle * |
2701 | &guest_transmit_notify_mod, | 2704 | tmit_handle = GNUNET_PSYC_slave_transmit (gst->slave, (const char *) &pmeth[1], |
2702 | &guest_transmit_notify_data, gst, | 2705 | &guest_transmit_notify_mod, |
2703 | pmeth->flags); | 2706 | &guest_transmit_notify_data, gst, |
2707 | pmeth->flags); | ||
2708 | if (NULL != gst->tmit_handle) | ||
2709 | gst->tmit_handle = tmit_handle; | ||
2704 | GNUNET_free (pmeth); | 2710 | GNUNET_free (pmeth); |
2705 | } | 2711 | } |
2706 | else | 2712 | else |
diff --git a/src/social/gnunet-social.c b/src/social/gnunet-social.c index fcf75d595..9e69208b5 100644 --- a/src/social/gnunet-social.c +++ b/src/social/gnunet-social.c | |||
@@ -227,7 +227,7 @@ exit_success () | |||
227 | GNUNET_SCHEDULER_cancel (timeout_task); | 227 | GNUNET_SCHEDULER_cancel (timeout_task); |
228 | timeout_task = NULL; | 228 | timeout_task = NULL; |
229 | } | 229 | } |
230 | GNUNET_SCHEDULER_add_now (schedule_success, NULL); | 230 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, schedule_success, NULL); |
231 | } | 231 | } |
232 | 232 | ||
233 | 233 | ||
@@ -239,7 +239,7 @@ exit_fail () | |||
239 | GNUNET_SCHEDULER_cancel (timeout_task); | 239 | GNUNET_SCHEDULER_cancel (timeout_task); |
240 | timeout_task = NULL; | 240 | timeout_task = NULL; |
241 | } | 241 | } |
242 | GNUNET_SCHEDULER_add_now (schedule_fail, NULL); | 242 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, schedule_fail, NULL); |
243 | } | 243 | } |
244 | 244 | ||
245 | 245 | ||