[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37003 - in gnunet-mqtt: m4 src/mqtt
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r37003 - in gnunet-mqtt: m4 src/mqtt |
|
Date: |
Sun, 10 Apr 2016 00:41:29 +0200 |
Author: grothoff
Date: 2016-04-10 00:41:29 +0200 (Sun, 10 Apr 2016)
New Revision: 37003
Modified:
gnunet-mqtt/m4/ltoptions.m4
gnunet-mqtt/m4/ltsugar.m4
gnunet-mqtt/m4/ltversion.m4
gnunet-mqtt/m4/lt~obsolete.m4
gnunet-mqtt/src/mqtt/Makefile.am
gnunet-mqtt/src/mqtt/gnunet-mqtt-publish.c
gnunet-mqtt/src/mqtt/gnunet-mqtt-subscribe.c
gnunet-mqtt/src/mqtt/gnunet-service-mqtt.c
gnunet-mqtt/src/mqtt/mqtt_api.c
gnunet-mqtt/src/mqtt/test_mqtt_multiple_peers.c
gnunet-mqtt/src/mqtt/test_mqtt_regex_hash.c
gnunet-mqtt/src/mqtt/test_mqtt_regex_plus.c
gnunet-mqtt/src/mqtt/test_mqtt_single_peer.c
gnunet-mqtt/src/mqtt/test_mqtt_unsubscribe.c
Log:
-fixing build issues, tests still crash
Modified: gnunet-mqtt/m4/ltoptions.m4
===================================================================
--- gnunet-mqtt/m4/ltoptions.m4 2016-04-09 21:24:50 UTC (rev 37002)
+++ gnunet-mqtt/m4/ltoptions.m4 2016-04-09 22:41:29 UTC (rev 37003)
@@ -1,7 +1,7 @@
# Helper functions for option handling. -*- Autoconf -*-
#
-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
@@ -8,7 +8,7 @@
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# serial 7 ltoptions.m4
+# serial 8 ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -29,7 +29,7 @@
[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
_LT_MANGLE_DEFUN([$1], [$2]),
- [m4_warning([Unknown $1 option `$2'])])[]dnl
+ [m4_warning([Unknown $1 option '$2'])])[]dnl
])
@@ -75,13 +75,15 @@
dnl
dnl If no reference was made to various pairs of opposing options, then
dnl we run the default mode handler for the pair. For example, if neither
- dnl `shared' nor `disable-shared' was passed, we enable building of shared
+ dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
dnl archives by default:
_LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
_LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
_LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
_LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
- [_LT_ENABLE_FAST_INSTALL])
+ [_LT_ENABLE_FAST_INSTALL])
+ _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both
aix-soname=svr4],
+ [_LT_WITH_AIX_SONAME([aix])])
])
])# _LT_SET_OPTIONS
@@ -112,7 +114,7 @@
[_LT_SET_OPTION([LT_INIT], [dlopen])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
+put the 'dlopen' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -148,7 +150,7 @@
_LT_SET_OPTION([LT_INIT], [win32-dll])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
+put the 'win32-dll' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -157,9 +159,9 @@
# _LT_ENABLE_SHARED([DEFAULT])
# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_SHARED],
[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([shared],
@@ -172,14 +174,14 @@
*)
enable_shared=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_shared=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
@@ -211,9 +213,9 @@
# _LT_ENABLE_STATIC([DEFAULT])
# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_STATIC],
[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([static],
@@ -226,14 +228,14 @@
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_static=]_LT_ENABLE_STATIC_DEFAULT)
@@ -265,9 +267,9 @@
# _LT_ENABLE_FAST_INSTALL([DEFAULT])
# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_FAST_INSTALL],
[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([fast-install],
@@ -280,14 +282,14 @@
*)
enable_fast_install=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_fast_install=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
@@ -304,7 +306,7 @@
[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
+the 'fast-install' option into LT_INIT's first parameter.])
])
AU_DEFUN([AC_DISABLE_FAST_INSTALL],
@@ -311,7 +313,7 @@
[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
+the 'disable-fast-install' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -319,11 +321,64 @@
dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1,
both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+ AC_MSG_CHECKING([which variant of shared library versioning to provide])
+ AC_ARG_WITH([aix-soname],
+ [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+ [shared library versioning (aka "SONAME") variant to provide on AIX,
@<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+ [case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname],
+ [AC_CACHE_VAL([lt_cv_with_aix_soname],
+ [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+ with_aix_soname=$lt_cv_with_aix_soname])
+ AC_MSG_RESULT([$with_aix_soname])
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+ [Shared archive member basename, for filename based shared library
versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
# _LT_WITH_PIC([MODE])
# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
# LT_INIT options.
-# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
+# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'.
m4_define([_LT_WITH_PIC],
[AC_ARG_WITH([pic],
[AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
@@ -334,20 +389,18 @@
*)
pic_mode=default
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for lt_pkg in $withval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$lt_pkg" = "X$lt_p"; then
pic_mode=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
- [pic_mode=default])
+ [pic_mode=m4_default([$1], [default])])
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-
_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
])# _LT_WITH_PIC
@@ -359,7 +412,7 @@
[_LT_SET_OPTION([LT_INIT], [pic-only])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
+put the 'pic-only' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
Modified: gnunet-mqtt/m4/ltsugar.m4
===================================================================
--- gnunet-mqtt/m4/ltsugar.m4 2016-04-09 21:24:50 UTC (rev 37002)
+++ gnunet-mqtt/m4/ltsugar.m4 2016-04-09 22:41:29 UTC (rev 37003)
@@ -1,6 +1,7 @@
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
@@ -33,7 +34,7 @@
# ------------
# Manipulate m4 lists.
# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
+# Autoconf-2.59, which quotes differently.
m4_define([lt_car], [[$1]])
m4_define([lt_cdr],
[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
@@ -44,7 +45,7 @@
# lt_append(MACRO-NAME, STRING, [SEPARATOR])
# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
# Note that neither SEPARATOR nor STRING are expanded; they are appended
# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
# No SEPARATOR is output if MACRO-NAME was previously undefined (different
Modified: gnunet-mqtt/m4/ltversion.m4
===================================================================
--- gnunet-mqtt/m4/ltversion.m4 2016-04-09 21:24:50 UTC (rev 37002)
+++ gnunet-mqtt/m4/ltversion.m4 2016-04-09 22:41:29 UTC (rev 37003)
@@ -1,6 +1,6 @@
# ltversion.m4 -- version numbers -*- Autoconf -*-
#
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
# Written by Scott James Remnant, 2004
#
# This file is free software; the Free Software Foundation gives
@@ -9,15 +9,15 @@
# @configure_input@
-# serial 3337 ltversion.m4
+# serial 4179 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [1.3337])
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
+[macro_version='2.4.6'
+macro_revision='2.4.6'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
Modified: gnunet-mqtt/m4/lt~obsolete.m4
===================================================================
--- gnunet-mqtt/m4/lt~obsolete.m4 2016-04-09 21:24:50 UTC (rev 37002)
+++ gnunet-mqtt/m4/lt~obsolete.m4 2016-04-09 22:41:29 UTC (rev 37003)
@@ -1,6 +1,7 @@
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
# This file is free software; the Free Software Foundation gives
@@ -11,7 +12,7 @@
# These exist entirely to fool aclocal when bootstrapping libtool.
#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
# which have later been changed to m4_define as they aren't part of the
# exported API, or moved to Autoconf or Automake where they belong.
#
@@ -25,7 +26,7 @@
# included after everything else. This provides aclocal with the
# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
#
# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
# Yes, that means every name once taken will need to remain here until
Modified: gnunet-mqtt/src/mqtt/Makefile.am
===================================================================
--- gnunet-mqtt/src/mqtt/Makefile.am 2016-04-09 21:24:50 UTC (rev 37002)
+++ gnunet-mqtt/src/mqtt/Makefile.am 2016-04-09 22:41:29 UTC (rev 37003)
@@ -24,7 +24,7 @@
#noinst_LTLIBRARIES = libregexutils.la
#libregexutils_la_SOURCES = regex_utils.c
#libregexutils_la_LDFLAGS = \
-# $(GNUNET_LDFLAGS) -lgnunetregex
+# $(GNUNET_LDFLAGS) -lgnunetregex
libgnunetmqtt_la_SOURCES = \
@@ -43,9 +43,9 @@
gnunet-service-mqtt.c
gnunet_service_mqtt_LDADD = \
-lgnunetutil -lgnunetcore -lgnunetdht -lgnunetregex -lgnunethello \
- -lgnunetmesh \
+ -lgnunetcadet \
$(INTLLIBS)
-# $(top_builddir)/src/mqtt/libregexutils.la
+# $(top_builddir)/src/mqtt/libregexutils.la
gnunet_service_mqtt_LDFLAGS = \
$(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic
@@ -83,7 +83,7 @@
-lgnunetutil -lgnunettestbed
test_mqtt_single_peer_LDFLAGS = \
$(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic
-
+
test_mqtt_multiple_peers_SOURCES = \
test_mqtt_multiple_peers.c
test_mqtt_multiple_peers_LDADD = \
@@ -91,7 +91,7 @@
-lgnunetutil -lgnunettestbed
test_mqtt_multiple_peers_LDFLAGS = \
$(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic
-
+
test_mqtt_unsubscribe_SOURCES = \
test_mqtt_unsubscribe.c
test_mqtt_unsubscribe_LDADD = \
@@ -99,7 +99,7 @@
-lgnunetutil -lgnunettestbed
test_mqtt_unsubscribe_LDFLAGS = \
$(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic
-
+
test_mqtt_regex_hash_SOURCES = \
test_mqtt_regex_hash.c
test_mqtt_regex_hash_LDADD = \
@@ -107,7 +107,7 @@
-lgnunetutil -lgnunettestbed
test_mqtt_regex_hash_LDFLAGS = \
$(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic
-
+
test_mqtt_regex_plus_SOURCES = \
test_mqtt_regex_plus.c
test_mqtt_regex_plus_LDADD = \
@@ -115,9 +115,8 @@
-lgnunetutil -lgnunettestbed
test_mqtt_regex_plus_LDFLAGS = \
$(GNUNET_LDFLAGS) $(WINFLAGS) -export-dynamic
-
+
pkgcfg_DATA = mqtt.conf
EXTRA_DIST = \
template.conf template_single_peer.conf test_mqtt_multipeer_topology.dat
-
Modified: gnunet-mqtt/src/mqtt/gnunet-mqtt-publish.c
===================================================================
--- gnunet-mqtt/src/mqtt/gnunet-mqtt-publish.c 2016-04-09 21:24:50 UTC (rev
37002)
+++ gnunet-mqtt/src/mqtt/gnunet-mqtt-publish.c 2016-04-09 22:41:29 UTC (rev
37003)
@@ -64,10 +64,9 @@
* Disconnect from MQTT and free all allocated resources.
*
* @param cls closure
- * @param tc scheduler context
*/
static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
if (NULL != mqtt_handle)
{
Modified: gnunet-mqtt/src/mqtt/gnunet-mqtt-subscribe.c
===================================================================
--- gnunet-mqtt/src/mqtt/gnunet-mqtt-subscribe.c 2016-04-09 21:24:50 UTC
(rev 37002)
+++ gnunet-mqtt/src/mqtt/gnunet-mqtt-subscribe.c 2016-04-09 22:41:29 UTC
(rev 37003)
@@ -59,10 +59,9 @@
* Disconnect from MQTT and free all allocated resources.
*
* @param cls closure
- * @param tc scheduler context
*/
static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
if (NULL != mqtt_handle)
{
Modified: gnunet-mqtt/src/mqtt/gnunet-service-mqtt.c
===================================================================
--- gnunet-mqtt/src/mqtt/gnunet-service-mqtt.c 2016-04-09 21:24:50 UTC (rev
37002)
+++ gnunet-mqtt/src/mqtt/gnunet-service-mqtt.c 2016-04-09 22:41:29 UTC (rev
37003)
@@ -26,9 +26,9 @@
*/
#include <gnunet/platform.h>
#include <gnunet/gnunet_util_lib.h>
-#include <gnunet/gnunet_regex_lib.h>
+#include <gnunet/gnunet_regex_service.h>
#include <gnunet/gnunet_dht_service.h>
-#include <gnunet/gnunet_mesh_service.h>
+#include <gnunet/gnunet_cadet_service.h>
#include <gnunet/gnunet_applications.h>
#include <gnunet/gnunet_configuration_lib.h>
#include "gnunet_protocols_mqtt.h"
@@ -78,12 +78,12 @@
* Task responsible for freeing the context once the message
* associated with it has been delivered
*/
- GNUNET_SCHEDULER_TaskIdentifier free_task;
+ struct GNUNET_SCHEDULER_Task *free_task;
/**
* Pointer to the regex search handle
*/
- struct GNUNET_REGEX_search_handle *regex_search_handle;
+ struct GNUNET_REGEX_Search *regex_search_handle;
};
@@ -170,7 +170,7 @@
/**
* Channel connecting us to the subscriber.
*/
- struct GNUNET_MESH_Channel *channel;
+ struct GNUNET_CADET_Channel *channel;
/**
* Has the subscriber been added to the channel yet?
@@ -186,7 +186,7 @@
* Handle to the current transmission request, NULL
* if none is pending.
*/
- struct GNUNET_MESH_TransmitHandle *transmit_handle;
+ struct GNUNET_CADET_TransmitHandle *transmit_handle;
/**
* Head of linked list of pending messages for this subscriber
@@ -218,7 +218,7 @@
/**
* Handle used to cancel the annnouncement
*/
- struct GNUNET_REGEX_announce_handle *regex_announce_handle;
+ struct GNUNET_REGEX_Announcement *regex_announce_handle;
/**
* The subscribed client
@@ -255,7 +255,7 @@
/**
* Handle to the mesh service.
*/
-static struct GNUNET_MESH_Handle *mesh_handle;
+static struct GNUNET_CADET_Handle *mesh_handle;
/**
* The identity of the local peer.
@@ -517,7 +517,7 @@
if (NULL != subscriber->transmit_handle)
{
- GNUNET_MESH_notify_transmit_ready_cancel (subscriber->transmit_handle);
+ GNUNET_CADET_notify_transmit_ready_cancel (subscriber->transmit_handle);
subscriber->transmit_handle = NULL;
}
while (NULL != (pm = subscriber->pending_head))
@@ -527,7 +527,7 @@
GNUNET_free (pm->msg);
GNUNET_free (pm);
}
- GNUNET_MESH_channel_destroy (subscriber->channel);
+ GNUNET_CADET_channel_destroy (subscriber->channel);
GNUNET_free (subscriber);
}
@@ -549,7 +549,7 @@
{
char *filepath = context->file_path;
- if (GNUNET_SCHEDULER_NO_TASK != context->free_task)
+ if (NULL != context->free_task)
GNUNET_SCHEDULER_cancel (context->free_task);
if (0 != UNLINK (filepath))
@@ -572,8 +572,7 @@
* @param cls closure (RegexSearchContext of the message to be deleted)
*/
static void
-delete_delivered_message (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+delete_delivered_message (void *cls)
{
struct RegexSearchContext *context = cls;
@@ -580,7 +579,7 @@
GNUNET_CONTAINER_DLL_remove (sc_head,
sc_tail,
context);
- context->free_task = GNUNET_SCHEDULER_NO_TASK;
+ context->free_task = NULL;
regex_search_context_free (context);
}
@@ -612,7 +611,7 @@
/**
* Callback called as a result of issuing
- * a GNUNET_MESH_notify_transmit_ready request. A RemoteSubscriberInfo
+ * a GNUNET_CADET_notify_transmit_ready request. A RemoteSubscriberInfo
* is passed as closure, take the head of the list and copy it into buf,
* which has the result of sending the message to the subscriber.
*
@@ -699,7 +698,7 @@
ntohs (msg->size), GNUNET_i2s (&subscriber->id));
subscriber->transmit_handle =
- GNUNET_MESH_notify_transmit_ready (subscriber->channel,
+ GNUNET_CADET_notify_transmit_ready (subscriber->channel,
GNUNET_NO,
GNUNET_TIME_UNIT_FOREVER_REL,
ntohs (msg->size),
@@ -791,11 +790,11 @@
subscriber = GNUNET_new (struct RemoteSubscriberInfo);
- subscriber->channel = GNUNET_MESH_channel_create (mesh_handle,
+ subscriber->channel = GNUNET_CADET_channel_create (mesh_handle,
NULL,
id,
GNUNET_APPLICATION_TYPE_MQTT,
-
GNUNET_MESH_OPTION_RELIABLE);
+
GNUNET_CADET_OPTION_RELIABLE);
subscriber->peer_added = GNUNET_NO;
subscriber->peer_connecting = GNUNET_NO;
@@ -829,11 +828,12 @@
context->publish_msg = publish_msg;
context->file_path = file_path;
context->message_delivered = GNUNET_NO;
- context->free_task = GNUNET_SCHEDULER_NO_TASK;
+ context->free_task = NULL;
context->subscribers = GNUNET_CONTAINER_multipeermap_create (1, GNUNET_NO);
- context->regex_search_handle = GNUNET_REGEX_search (dht_handle, topic,
- subscribed_peer_found,
- context, NULL);
+ context->regex_search_handle = GNUNET_REGEX_search (cfg,
+ topic,
+ &subscribed_peer_found,
+ context);
GNUNET_CONTAINER_DLL_insert (sc_head,
sc_tail,
context);
@@ -951,8 +951,9 @@
subscription_tail,
subscription);
subscription->regex_announce_handle =
- GNUNET_REGEX_announce (dht_handle, &my_id,
- regex_topic,1 , NULL);
+ GNUNET_REGEX_announce (cfg,
+ regex_topic,
+ GNUNET_TIME_UNIT_MINUTES, 1);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"MQTT SUBSCRIBE message received: %s->%s\n",
@@ -1197,7 +1198,7 @@
* node is subscribed to.
*/
static int
-handle_incoming_publish (void *cls, struct GNUNET_MESH_Channel *channel,
+handle_incoming_publish (void *cls, struct GNUNET_CADET_Channel *channel,
void **channel_ctx,
const struct GNUNET_MessageHeader *msg)
{
@@ -1209,7 +1210,7 @@
static int
-handle_channel_message (void *cls, struct GNUNET_MESH_Channel *channel,
+handle_channel_message (void *cls, struct GNUNET_CADET_Channel *channel,
void **channel_ctx,
const struct GNUNET_MessageHeader *msg)
{
@@ -1268,11 +1269,9 @@
* Task run during shutdown.
*
* @param cls unused
- * @param tc unused
*/
static void
-shutdown_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
struct Subscription *subscription;
struct RegexSearchContext *context;
@@ -1295,16 +1294,16 @@
free_remote_subscriber_iterator,
NULL);
GNUNET_DHT_disconnect (dht_handle);
- GNUNET_MESH_disconnect (mesh_handle);
+ GNUNET_CADET_disconnect (mesh_handle);
GNUNET_CONTAINER_multipeermap_destroy (remote_subscribers);
}
static void *
-new_incoming_channel_callback (void *cls, struct GNUNET_MESH_Channel *channel,
+new_incoming_channel_callback (void *cls, struct GNUNET_CADET_Channel *channel,
const struct GNUNET_PeerIdentity *initiator,
uint32_t port,
- enum GNUNET_MESH_ChannelOption options)
+ enum GNUNET_CADET_ChannelOption options)
{
return NULL;
}
@@ -1312,7 +1311,7 @@
static void
incoming_channel_destroyed_callback (void *cls,
- const struct GNUNET_MESH_Channel *channel,
+ const struct GNUNET_CADET_Channel *channel,
void *channel_ctx)
{
}
@@ -1439,7 +1438,7 @@
GNUNET_MESSAGE_TYPE_MQTT_CLIENT_UNSUBSCRIBE, 0},
{NULL, NULL, 0, 0}
};
- static const struct GNUNET_MESH_MessageHandler mesh_handlers[] = {
+ static const struct GNUNET_CADET_MessageHandler mesh_handlers[] = {
{&handle_incoming_publish, GNUNET_MESSAGE_TYPE_MQTT_CLIENT_PUBLISH, 0},
{&handle_channel_message, GNUNET_MESSAGE_TYPE_MQTT_CLIENT_SUBSCRIBE, 0},
{NULL, 0, 0}
@@ -1468,7 +1467,7 @@
GNUNET_CRYPTO_get_peer_identity (c,
&my_id));
dht_handle = GNUNET_DHT_connect (c, 32);
- mesh_handle = GNUNET_MESH_connect (c,
+ mesh_handle = GNUNET_CADET_connect (c,
NULL,
&new_incoming_channel_callback,
&incoming_channel_destroyed_callback,
Modified: gnunet-mqtt/src/mqtt/mqtt_api.c
===================================================================
--- gnunet-mqtt/src/mqtt/mqtt_api.c 2016-04-09 21:24:50 UTC (rev 37002)
+++ gnunet-mqtt/src/mqtt/mqtt_api.c 2016-04-09 22:41:29 UTC (rev 37003)
@@ -84,7 +84,7 @@
/**
* Task for trying to reconnect.
*/
- GNUNET_SCHEDULER_TaskIdentifier reconnect_task;
+ struct GNUNET_SCHEDULER_Task *reconnect_task;
/**
* Head of active SUBSCRIBE requests.
@@ -126,13 +126,13 @@
/**
* Timeout task for this operation.
*/
- GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+ struct GNUNET_SCHEDULER_Task *timeout_task;
/**
* Continuation to call when the request has been
* transmitted (for the first time) to the service; can be NULL.
*/
- GNUNET_SCHEDULER_Task cont;
+ GNUNET_SCHEDULER_TaskCallback cont;
/**
* Closure for 'cont'.
@@ -145,12 +145,12 @@
uint64_t request_id;
/**
- * GNUNET_YES if this message is in our pending queue right now.
+ * #GNUNET_YES if this message is in our pending queue right now.
*/
int in_pending_queue;
/**
- * GNUNET_YES if this message will be ACKed or otherwise responded to.
+ * #GNUNET_YES if this message will be ACKed or otherwise responded to.
*/
int wait_for_response;
};
@@ -281,11 +281,9 @@
* Try reconnecting to the MQTT service.
*
* @param cls GNUNET_MQTT_Handle
- * @param tc scheduler context
*/
static void
-try_reconnect (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+try_reconnect (void *cls)
{
struct GNUNET_MQTT_Handle *handle = cls;
@@ -293,7 +291,7 @@
"Reconnecting with MQTT %p\n",
handle);
handle->retry_time = GNUNET_TIME_STD_BACKOFF (handle->retry_time);
- handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ handle->reconnect_task = NULL;
if (GNUNET_YES != try_connect (handle))
{
@@ -315,7 +313,7 @@
{
if (NULL == handle->client)
return;
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == handle->reconnect_task);
+ GNUNET_assert (NULL == handle->reconnect_task);
if (NULL != handle->th)
{
GNUNET_CLIENT_notify_transmit_ready_cancel (handle->th);
@@ -381,7 +379,7 @@
pm->in_pending_queue = GNUNET_NO;
if (NULL != pm->cont)
- pm->cont (pm->cont_cls, NULL);
+ pm->cont (pm->cont_cls);
GNUNET_free (pm);
}
@@ -398,11 +396,9 @@
* Timeout for the transmission of a PUBLISH request. Clean it up.
*
* @param cls the 'struct PendingMessage'
- * @param tc scheduler context
*/
static void
-publish_timeout (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+publish_timeout (void *cls)
{
struct GNUNET_MQTT_PublishHandle *ph = cls;
struct GNUNET_MQTT_Handle *handle = ph->mqtt_handle;
@@ -412,7 +408,7 @@
GNUNET_CONTAINER_DLL_remove (handle->pending_head, handle->pending_tail,
ph->pending);
ph->pending->in_pending_queue = GNUNET_NO;
- ph->pending->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ ph->pending->timeout_task = NULL;
GNUNET_free (ph->pending);
}
@@ -427,10 +423,9 @@
* Timeout for the transmission of a SUBSCRIBE request. Clean it up.
*
* @param cls the 'struct PendingMessage'
- * @param tc scheduler context
*/
static void
-subscribe_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+subscribe_timeout (void *cls)
{
struct GNUNET_MQTT_SubscribeHandle *sh = cls;
struct GNUNET_MQTT_Handle *handle = sh->mqtt_handle;
@@ -440,7 +435,7 @@
GNUNET_CONTAINER_DLL_remove (handle->pending_head, handle->pending_tail,
sh->pending);
sh->pending->in_pending_queue = GNUNET_NO;
- sh->pending->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ sh->pending->timeout_task = NULL;
GNUNET_free (sh->pending);
}
if (NULL != sh->cont)
@@ -642,15 +637,15 @@
if (NULL != head->cont)
{
- head->cont (head->cont_cls, NULL);
+ head->cont (head->cont_cls);
head->cont = NULL;
head->cont_cls = NULL;
}
- if (head->timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ if (head->timeout_task != NULL)
{
GNUNET_SCHEDULER_cancel (head->timeout_task);
- head->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ head->timeout_task = NULL;
}
process_pending_messages (handle);
@@ -719,11 +714,9 @@
* NULL.
*
* @param cls a struct GNUNET_MQTT_SubscribeHandle
- * @param tc unused
*/
static void
-mark_subscribe_message_gone (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+mark_subscribe_message_gone (void *cls)
{
struct GNUNET_MQTT_SubscribeHandle *sh = cls;
@@ -744,11 +737,9 @@
* It sets the message pointer in the SUBSCRIBE handle to NULL.
*
* @param cls a struct GNUNET_MQTT_SubscribeHandle
- * @param tc unused
*/
static void
-mark_unsubscribe_message_gone (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+mark_unsubscribe_message_gone (void *cls)
{
struct GNUNET_MQTT_SubscribeHandle *sh = cls;
@@ -847,10 +838,10 @@
if (NULL != ph->pending)
{
- if (ph->pending->timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ if (ph->pending->timeout_task != NULL)
{
GNUNET_SCHEDULER_cancel (ph->pending->timeout_task);
- ph->pending->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ ph->pending->timeout_task = NULL;
}
GNUNET_CONTAINER_DLL_remove (handle->pending_head, handle->pending_tail,
@@ -915,7 +906,7 @@
subscribe_msg->request_id = sh->request_id;
subscribe_msg->topic_len = topic_len;
memcpy (&subscribe_msg[1], topic, topic_len);
- GNUNET_CONTAINER_DLL_insert (handle->pending_head,
+ GNUNET_CONTAINER_DLL_insert (handle->pending_head,
handle->pending_tail,
pending);
pending->in_pending_queue = GNUNET_YES;
@@ -951,10 +942,10 @@
}
else
{
- if (sh->pending->timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ if (sh->pending->timeout_task != NULL)
{
GNUNET_SCHEDULER_cancel (sh->pending->timeout_task);
- sh->pending->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ sh->pending->timeout_task = NULL;
}
GNUNET_CONTAINER_DLL_remove (handle->pending_head, handle->pending_tail,
Modified: gnunet-mqtt/src/mqtt/test_mqtt_multiple_peers.c
===================================================================
--- gnunet-mqtt/src/mqtt/test_mqtt_multiple_peers.c 2016-04-09 21:24:50 UTC
(rev 37002)
+++ gnunet-mqtt/src/mqtt/test_mqtt_multiple_peers.c 2016-04-09 22:41:29 UTC
(rev 37003)
@@ -39,7 +39,7 @@
static struct GNUNET_TESTBED_Operation *basic_mqtt_op_subscribe;
-static GNUNET_SCHEDULER_TaskIdentifier shutdown_tid;
+static struct GNUNET_SCHEDULER_Task *shutdown_tid;
static int result;
@@ -50,7 +50,7 @@
static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
if (NULL != basic_mqtt_op_publish)
{
@@ -58,7 +58,7 @@
down the
connection */
basic_mqtt_op_publish = NULL;
}
-
+
if (NULL != basic_mqtt_op_subscribe)
{
GNUNET_TESTBED_operation_done (basic_mqtt_op_subscribe); /* calls the
gmqtt_da() for closing
@@ -78,7 +78,7 @@
down the
connection */
basic_mqtt_op_publish = NULL;
}
-
+
if (NULL != basic_mqtt_op_subscribe)
{
GNUNET_TESTBED_operation_done (basic_mqtt_op_subscribe); /* calls the
gmqtt_da_subscribe() for closing
@@ -98,21 +98,21 @@
FPRINTF (stdout, "%s: %s -> %s\n", _("Message received"), topic,
(char*) data);
GNUNET_free (topic);
- GNUNET_free (data);
+ GNUNET_free (data);
in_time_shutdown_task();
}
static void
-service_connect_comp_publish (void *cls,
+service_connect_comp_publish (void *cls,
struct GNUNET_TESTBED_Operation *op,
void *ca_result,
const char *emsg)
-{
+{
struct GNUNET_TIME_Relative timeout;
const char *topic = "some/topic";
const char *message = "test message";
-
+
timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
request_timeout);
GNUNET_MQTT_publish (mqtt_handle_publish, strlen(topic) + 1, topic,
@@ -126,13 +126,13 @@
struct GNUNET_TESTBED_Operation *op,
void *ca_result,
const char *emsg)
-{
+{
struct GNUNET_TIME_Relative timeout;
const char *topic = "some/topic";
-
+
timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
request_timeout);
-
+
GNUNET_MQTT_subscribe (mqtt_handle_subscribe, strlen(topic) + 1, topic,
timeout,
NULL, NULL,
subscribe_result_callback, NULL);
@@ -140,12 +140,12 @@
static void *
-gmqtt_ca_publish (void *cls,
+gmqtt_ca_publish (void *cls,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
/* Use the provided configuration to connect to service */
- mqtt_handle_publish = GNUNET_MQTT_connect(cfg);
-
+ mqtt_handle_publish = GNUNET_MQTT_connect(cfg);
+
return mqtt_handle_publish;
}
@@ -155,8 +155,8 @@
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
/* Use the provided configuration to connect to service */
- mqtt_handle_subscribe = GNUNET_MQTT_connect(cfg);
-
+ mqtt_handle_subscribe = GNUNET_MQTT_connect(cfg);
+
return mqtt_handle_subscribe;
}
@@ -166,7 +166,7 @@
{
/* Disconnect from gnunet-service-mqtt service */
GNUNET_MQTT_disconnect (mqtt_handle_publish);
- mqtt_handle_publish = NULL;
+ mqtt_handle_publish = NULL;
}
@@ -175,7 +175,7 @@
{
/* Disconnect from gnunet-service-mqtt service */
GNUNET_MQTT_disconnect (mqtt_handle_subscribe);
- mqtt_handle_subscribe = NULL;
+ mqtt_handle_subscribe = NULL;
}
@@ -202,10 +202,10 @@
NULL, /* closure for the above
callback */
gmqtt_ca_subscribe, /* callback to
call with peer's configuration; this should open the needed service connection
*/
gmqtt_da_subscribe, /* callback to
be called when closing the opened service connection */
- NULL); /* closure for the above two
callbacks */
-
- shutdown_tid = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10), &shutdown_task, NULL);
+ NULL); /* closure for the above two
callbacks */
+ shutdown_tid = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10), &shutdown_task, NULL);
+
}
@@ -214,7 +214,7 @@
{
int ret;
result = GNUNET_SYSERR;
-
+
ret = GNUNET_TESTBED_test_run("test mqtt multiple peer comumunication", /*
test case name */
"template.conf", /* template configuration */
2, /* number of peers to start */
Modified: gnunet-mqtt/src/mqtt/test_mqtt_regex_hash.c
===================================================================
--- gnunet-mqtt/src/mqtt/test_mqtt_regex_hash.c 2016-04-09 21:24:50 UTC (rev
37002)
+++ gnunet-mqtt/src/mqtt/test_mqtt_regex_hash.c 2016-04-09 22:41:29 UTC (rev
37003)
@@ -39,7 +39,7 @@
static struct GNUNET_TESTBED_Operation *basic_mqtt_op_subscribe;
-static GNUNET_SCHEDULER_TaskIdentifier shutdown_tid;
+static struct GNUNET_SCHEDULER_Task *shutdown_tid;
static int result;
@@ -50,8 +50,7 @@
static void
-shutdown_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
if (NULL != basic_mqtt_op_publish)
{
@@ -94,7 +93,7 @@
size_t size, void *data)
{
result = GNUNET_OK;
- FPRINTF (stdout,
+ FPRINTF (stdout,
"%s: %s -> %s\n",
_("Message received"),
topic,
@@ -110,11 +109,11 @@
struct GNUNET_TESTBED_Operation *op,
void *ca_result,
const char *emsg)
-{
+{
struct GNUNET_TIME_Relative timeout;
const char *topic = "some/topic/level1/Level2";
const char *message = "test message";
-
+
timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
request_timeout);
GNUNET_MQTT_publish (mqtt_handle_publish, strlen(topic) + 1, topic,
@@ -124,17 +123,17 @@
static void
-service_connect_comp_subscribe (void *cls,
+service_connect_comp_subscribe (void *cls,
struct GNUNET_TESTBED_Operation *op,
void *ca_result,
const char *emsg)
-{
+{
struct GNUNET_TIME_Relative timeout;
const char *topic = "some/topic/#";
-
+
timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
request_timeout);
-
+
GNUNET_MQTT_subscribe (mqtt_handle_subscribe, strlen(topic) + 1, topic,
timeout,
NULL, NULL,
subscribe_result_callback, NULL);
@@ -145,8 +144,8 @@
gmqtt_ca_publish (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
{
/* Use the provided configuration to connect to service */
- mqtt_handle_publish = GNUNET_MQTT_connect(cfg);
-
+ mqtt_handle_publish = GNUNET_MQTT_connect(cfg);
+
return mqtt_handle_publish;
}
@@ -153,10 +152,10 @@
static void *
gmqtt_ca_subscribe (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
+{
/* Use the provided configuration to connect to service */
- mqtt_handle_subscribe = GNUNET_MQTT_connect(cfg);
-
+ mqtt_handle_subscribe = GNUNET_MQTT_connect(cfg);
+
return mqtt_handle_subscribe;
}
@@ -166,7 +165,7 @@
{
/* Disconnect from gnunet-service-mqtt service */
GNUNET_MQTT_disconnect (mqtt_handle_publish);
- mqtt_handle_publish = NULL;
+ mqtt_handle_publish = NULL;
}
@@ -175,7 +174,7 @@
{
/* Disconnect from gnunet-service-mqtt service */
GNUNET_MQTT_disconnect (mqtt_handle_subscribe);
- mqtt_handle_subscribe = NULL;
+ mqtt_handle_subscribe = NULL;
}
@@ -202,19 +201,19 @@
NULL, /* closure
for the above callback */
gmqtt_ca_subscribe,
/* callback to call with peer's configuration; this should open the needed
service connection */
gmqtt_da_subscribe,
/* callback to be called when closing the opened service connection */
- NULL); /* closure
for the above two callbacks */
-
- shutdown_tid = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10),
+ NULL); /* closure
for the above two callbacks */
+
+ shutdown_tid = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10),
&shutdown_task, NULL);
}
-int
+int
main (int argc, char **argv)
{
int ret;
result = GNUNET_SYSERR;
-
+
ret = GNUNET_TESTBED_test_run("test mqtt regex", /* test case name */
"template.conf", /* template configuration */
2, /* number of peers to start */
Modified: gnunet-mqtt/src/mqtt/test_mqtt_regex_plus.c
===================================================================
--- gnunet-mqtt/src/mqtt/test_mqtt_regex_plus.c 2016-04-09 21:24:50 UTC (rev
37002)
+++ gnunet-mqtt/src/mqtt/test_mqtt_regex_plus.c 2016-04-09 22:41:29 UTC (rev
37003)
@@ -28,7 +28,7 @@
#include <gnunet/gnunet_util_lib.h>
#include <gnunet/gnunet_testbed_service.h>
#include <gnunet/gnunet_dht_service.h>
-#include <gnunet/gnunet_regex_lib.h>
+#include <gnunet/gnunet_regex_service.h>
#include "gnunet_mqtt_service.h"
/**
@@ -40,7 +40,7 @@
static struct GNUNET_TESTBED_Operation *basic_mqtt_op_subscribe;
-static GNUNET_SCHEDULER_TaskIdentifier shutdown_tid;
+static struct GNUNET_SCHEDULER_Task *shutdown_tid;
static int result;
@@ -51,8 +51,7 @@
static void
-shutdown_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
if (NULL != basic_mqtt_op_publish)
{
@@ -60,7 +59,7 @@
down the
connection */
basic_mqtt_op_publish = NULL;
}
-
+
if (NULL != basic_mqtt_op_subscribe)
{
GNUNET_TESTBED_operation_done (basic_mqtt_op_subscribe); /* calls the
gmqtt_da() for closing
@@ -96,8 +95,8 @@
size_t size, void *data)
{
result = GNUNET_OK;
- FPRINTF (stdout,
- "%s: %s -> %s\n",
+ FPRINTF (stdout,
+ "%s: %s -> %s\n",
_("Message received"),
topic,
(char*) data);
@@ -112,11 +111,11 @@
struct GNUNET_TESTBED_Operation *op,
void *ca_result,
const char *emsg)
-{
+{
struct GNUNET_TIME_Relative timeout;
const char *topic = "some/IntLevel1/topic";
const char *message = "test message";
-
+
timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
request_timeout);
GNUNET_MQTT_publish (mqtt_handle_publish, strlen(topic) + 1, topic,
@@ -129,13 +128,13 @@
service_connect_comp_subscribe (void *cls, struct GNUNET_TESTBED_Operation *op,
void *ca_result,
const char *emsg)
-{
+{
struct GNUNET_TIME_Relative timeout;
const char *topic = "some/+/topic";
-
+
timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
request_timeout);
-
+
GNUNET_MQTT_subscribe (mqtt_handle_subscribe, strlen(topic) + 1, topic,
timeout,
NULL, NULL,
subscribe_result_callback, NULL);
@@ -146,8 +145,8 @@
gmqtt_ca_publish (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
{
/* Use the provided configuration to connect to service */
- mqtt_handle_publish = GNUNET_MQTT_connect(cfg);
-
+ mqtt_handle_publish = GNUNET_MQTT_connect(cfg);
+
return mqtt_handle_publish;
}
@@ -155,10 +154,10 @@
static void *
gmqtt_ca_subscribe (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
{
-
+
/* Use the provided configuration to connect to service */
- mqtt_handle_subscribe = GNUNET_MQTT_connect(cfg);
-
+ mqtt_handle_subscribe = GNUNET_MQTT_connect(cfg);
+
return mqtt_handle_subscribe;
}
@@ -167,7 +166,7 @@
{
/* Disconnect from gnunet-service-mqtt service */
GNUNET_MQTT_disconnect (mqtt_handle_publish);
- mqtt_handle_publish = NULL;
+ mqtt_handle_publish = NULL;
}
static void
@@ -175,7 +174,7 @@
{
/* Disconnect from gnunet-service-mqtt service */
GNUNET_MQTT_disconnect (mqtt_handle_subscribe);
- mqtt_handle_subscribe = NULL;
+ mqtt_handle_subscribe = NULL;
}
@@ -202,9 +201,9 @@
NULL, /* closure for
the above callback */
gmqtt_ca_subscribe,
/* callback to call with peer's configuration; this should open the needed
service connection */
gmqtt_da_subscribe,
/* callback to be called when closing the opened service connection */
- NULL); /* closure
for the above two callbacks */
-
- shutdown_tid = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10),
+ NULL); /* closure
for the above two callbacks */
+
+ shutdown_tid = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10),
&shutdown_task, NULL);
}
@@ -213,7 +212,7 @@
{
int ret;
result = GNUNET_SYSERR;
-
+
ret = GNUNET_TESTBED_test_run("test mqtt regex", /* test case name */
"template.conf", /* template configuration */
2, /* number of peers to start */
Modified: gnunet-mqtt/src/mqtt/test_mqtt_single_peer.c
===================================================================
--- gnunet-mqtt/src/mqtt/test_mqtt_single_peer.c 2016-04-09 21:24:50 UTC
(rev 37002)
+++ gnunet-mqtt/src/mqtt/test_mqtt_single_peer.c 2016-04-09 22:41:29 UTC
(rev 37003)
@@ -37,7 +37,7 @@
static struct GNUNET_TESTBED_Operation *basic_mqtt_op;
-static GNUNET_SCHEDULER_TaskIdentifier shutdown_tid;
+static struct GNUNET_SCHEDULER_Task *shutdown_tid;
static int result;
@@ -48,9 +48,9 @@
static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
-
+
if (NULL != basic_mqtt_op)
{
GNUNET_TESTBED_operation_done (basic_mqtt_op); /* calls the gmqtt_da()
for closing
@@ -57,7 +57,7 @@
down the connection */
basic_mqtt_op = NULL;
}
-
+
GNUNET_SCHEDULER_shutdown (); /* Also kills the testbed */
}
@@ -83,7 +83,7 @@
result = GNUNET_OK;
FPRINTF (stdout,
"%s: %s -> %s\n",
- _("\nMessage received"),
+ _("\nMessage received"),
topic,
(char*) data);
@@ -97,11 +97,11 @@
service_connect_comp (void *cls, struct GNUNET_TESTBED_Operation *op,
void *ca_result,
const char *emsg)
-{
+{
struct GNUNET_TIME_Relative timeout;
const char *topic = "some/topic";
const char *message = "test message";
-
+
timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
request_timeout);
GNUNET_MQTT_subscribe (mqtt_handle, strlen(topic) + 1, topic, timeout,
@@ -110,7 +110,7 @@
GNUNET_MQTT_publish (mqtt_handle, strlen(topic) + 1, topic,
strlen(message) + 1, message, timeout, NULL,
NULL);
- shutdown_tid = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10),
+ shutdown_tid = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10),
&shutdown_task, NULL);
}
@@ -119,8 +119,8 @@
gmqtt_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
{
/* Use the provided configuration to connect to service */
- mqtt_handle = GNUNET_MQTT_connect(cfg);
-
+ mqtt_handle = GNUNET_MQTT_connect(cfg);
+
return mqtt_handle;
}
@@ -130,7 +130,7 @@
{
/* Disconnect from gnunet-service-mqtt service */
GNUNET_MQTT_disconnect (mqtt_handle);
- mqtt_handle = NULL;
+ mqtt_handle = NULL;
}
@@ -149,7 +149,7 @@
NULL, /* closure for the above
callback */
gmqtt_ca, /* callback to call
with peer's configuration; this should open the needed service connection */
gmqtt_da, /* callback to be
called when closing the opened service connection */
- NULL); /* closure for the
above two callbacks */
+ NULL); /* closure for the
above two callbacks */
}
Modified: gnunet-mqtt/src/mqtt/test_mqtt_unsubscribe.c
===================================================================
--- gnunet-mqtt/src/mqtt/test_mqtt_unsubscribe.c 2016-04-09 21:24:50 UTC
(rev 37002)
+++ gnunet-mqtt/src/mqtt/test_mqtt_unsubscribe.c 2016-04-09 22:41:29 UTC
(rev 37003)
@@ -37,7 +37,7 @@
static struct GNUNET_TESTBED_Operation *basic_mqtt_op;
-static GNUNET_SCHEDULER_TaskIdentifier shutdown_tid;
+static struct GNUNET_SCHEDULER_Task *shutdown_tid;
static int result;
@@ -48,9 +48,9 @@
static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
- shutdown_tid = GNUNET_SCHEDULER_NO_TASK;
+ shutdown_tid = NULL;
if (NULL != basic_mqtt_op)
{
GNUNET_TESTBED_operation_done (basic_mqtt_op); /* calls the gmqtt_da() for
closing
@@ -57,7 +57,7 @@
down the connection */
basic_mqtt_op = NULL;
}
-
+
GNUNET_SCHEDULER_shutdown (); /* Also kills the testbed */
}
@@ -67,8 +67,8 @@
size_t size, void *data)
{
result = GNUNET_SYSERR;
- FPRINTF (stdout,
- "%s: %s -> %s\n",
+ FPRINTF (stdout,
+ "%s: %s -> %s\n",
_("\nMessage received"),
topic,
(char*) data);
@@ -81,12 +81,12 @@
service_connect_comp (void *cls, struct GNUNET_TESTBED_Operation *op,
void *ca_result,
const char *emsg)
-{
+{
struct GNUNET_TIME_Relative timeout;
struct GNUNET_MQTT_SubscribeHandle *sh;
const char *topic = "some/topic";
const char *message = "test message";
-
+
timeout = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
request_timeout);
sh = GNUNET_MQTT_subscribe (mqtt_handle, strlen(topic) + 1, topic, timeout,
@@ -96,8 +96,10 @@
GNUNET_MQTT_publish (mqtt_handle, strlen(topic) + 1, topic,
strlen(message) + 1, message, timeout, NULL,
NULL);
- result = GNUNET_OK;
- GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10), &shutdown_task, NULL);
+ result = GNUNET_OK;
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 10),
+ &shutdown_task,
+ NULL);
}
@@ -105,8 +107,8 @@
gmqtt_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
{
/* Use the provided configuration to connect to service */
- mqtt_handle = GNUNET_MQTT_connect(cfg);
-
+ mqtt_handle = GNUNET_MQTT_connect(cfg);
+
return mqtt_handle;
}
@@ -116,7 +118,7 @@
{
/* Disconnect from gnunet-service-mqtt service */
GNUNET_MQTT_disconnect (mqtt_handle);
- mqtt_handle = NULL;
+ mqtt_handle = NULL;
}
@@ -139,12 +141,12 @@
}
-int
+int
main (int argc, char **argv)
{
int ret;
result = GNUNET_SYSERR;
-
+
ret = GNUNET_TESTBED_test_run("test mqtt unsubscribe operation", /* test
case name */
"template_single_peer.conf", /* template
configuration */
1, /* number of peers to start */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37003 - in gnunet-mqtt: m4 src/mqtt,
gnunet <=