[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37658 - gnunet/src/social
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37658 - gnunet/src/social |
Date: |
Thu, 4 Aug 2016 01:20:39 +0200 |
Author: tg
Date: 2016-08-04 01:20:39 +0200 (Thu, 04 Aug 2016)
New Revision: 37658
Modified:
gnunet/src/social/social_api.c
gnunet/src/social/test_social.c
Log:
social fixes
Modified: gnunet/src/social/social_api.c
===================================================================
--- gnunet/src/social/social_api.c 2016-08-03 23:20:37 UTC (rev 37657)
+++ gnunet/src/social/social_api.c 2016-08-03 23:20:39 UTC (rev 37658)
@@ -972,7 +972,7 @@
hconn->app = app;
hconn->plc_msg = *pmsg;
app->host_cb (app->cb_cls, hconn, ego, &pmsg->place_pub_key,
pmsg->place_state);
- // FIXME: should this have a GNUNET_free (hconn) here?
+ GNUNET_free (hconn);
}
}
else if (NULL != app->guest_cb)
@@ -981,7 +981,7 @@
gconn->app = app;
gconn->plc_msg = *pmsg;
app->guest_cb (app->cb_cls, gconn, ego, &pmsg->place_pub_key,
pmsg->place_state);
- // GNUNET_free (gconn); // FIXME: is this correct here? apparently not!
+ GNUNET_free (gconn);
}
}
@@ -1284,7 +1284,6 @@
plc->connect_msg = &hreq->header;
place_send_connect_msg (plc);
- GNUNET_free (hconn);
return hst;
}
@@ -1849,7 +1848,6 @@
plc->connect_msg = &greq->header;
place_send_connect_msg (plc);
- GNUNET_free (gconn);
return gst;
}
Modified: gnunet/src/social/test_social.c
===================================================================
--- gnunet/src/social/test_social.c 2016-08-03 23:20:37 UTC (rev 37657)
+++ gnunet/src/social/test_social.c 2016-08-03 23:20:39 UTC (rev 37658)
@@ -404,6 +404,11 @@
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"App connected: %p\n", cls);
+ if (NULL != core)
+ {
+ GNUNET_CORE_disconnect (core);
+ core = NULL;
+ }
}
@@ -1269,12 +1274,6 @@
static void
id_host_created (void *cls, const char *emsg)
{
- if (NULL != core)
- {
- GNUNET_CORE_disconnect (core);
- core = NULL;
- }
-
if (NULL != emsg)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37658 - gnunet/src/social,
gnunet <=