psyc/social: local join flag; social service: leave place, save _file

[oweals/gnunet.git] / src / pt / test_gns_vpn.c

diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c
index e030842b5c765ed44b8d8459066d4faaada03a9d..f1ddcddc23afb620beab12f88e805b4fda8c2cc3 100644 (file)
--- a/src/pt/test_gns_vpn.c
+++ b/src/pt/test_gns_vpn.c
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -24,7 +24,11 @@
  * @author Martin Schanzenbach
  */
 #include "platform.h"
+#if HAVE_CURL_CURL_H
 #include <curl/curl.h>
+#elif HAVE_GNURL_CURL_H
+#include <gnurl/curl.h>
+#endif
 #include <microhttpd.h>
 #include "gnunet_identity_service.h"
 #include "gnunet_namestore_service.h"
@@ -322,7 +326,7 @@ commence_testing (void *cls,
   }
   /* wait a little bit before downloading, as we just created the record */
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                (GNUNET_TIME_UNIT_SECONDS, 5),
+                                (GNUNET_TIME_UNIT_SECONDS, 1),
                                 &start_curl,
                                 NULL);
 }
@@ -676,6 +680,7 @@ run (void *cls,
     GNUNET_free (bin);
     return;
   }
+  GNUNET_free (bin_gns);
   GNUNET_free (config);
   GNUNET_free (bin);