4 files changed, 80 insertions, 0 deletions

diff --git a/src/lib/block/Makefile.am b/src/lib/block/Makefile.am
new file mode 100644
index 0000000..b3af878
--- /dev/null
+++ b/src/lib/block/Makefile.am
@@ -0,0 +1,16 @@
+# This Makefile.am is in the public domain
+lib_LTLIBRARIES = \
+        libgnunetblockdbus.la
+
+libgnunetblockdbus_la_SOURCES = \
+        gnunet_block_dbus_lib.c \
+        gnunet_block_dbus_lib_pop.c \
+        gnunet_block_dbus_lib_push.c
+
+libgnunetblockdbus_la_CFLAGS = \
+        -I$(top_builddir)/src/lib/include \
+        $(DBUS_CFLAGS)
+
+libgnunetblockdbus_la_LDFLAGS = \
+        $(DBUS_LIBS)
+        
diff --git a/src/lib/block/gnunet_block_dbus_lib.c b/src/lib/block/gnunet_block_dbus_lib.c
new file mode 100644
index 0000000..c0e52fe
--- /dev/null
+++ b/src/lib/block/gnunet_block_dbus_lib.c
@@ -0,0 +1,26 @@
+#include "config.h"
+
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_block_lib.h>
+
+#include "gnunet_block_dbus_lib.h"
+
+const struct GNUNET_DBUS_StringEnumPair GNUNET_BLOCK_DBUS_type_description[] = {
+    {"any",            GNUNET_BLOCK_TYPE_ANY},
+    {"fs_dblock",      GNUNET_BLOCK_TYPE_FS_DBLOCK},
+    {"fs_iblock",      GNUNET_BLOCK_TYPE_FS_IBLOCK},
+    {"fs_kblock",      GNUNET_BLOCK_TYPE_FS_KBLOCK},
+    {"fs_sblock",      GNUNET_BLOCK_TYPE_FS_SBLOCK},
+    {"fs_nblock",      GNUNET_BLOCK_TYPE_FS_NBLOCK},
+    {"fs_ondemand",    GNUNET_BLOCK_TYPE_FS_ONDEMAND},
+    {"dht_hello",      GNUNET_BLOCK_TYPE_DHT_HELLO},
+    {"test",           GNUNET_BLOCK_TYPE_TEST},
+    {"fs_ublock",      GNUNET_BLOCK_TYPE_FS_UBLOCK},
+    {"dns",            GNUNET_BLOCK_TYPE_DNS},
+    {"gns_namerecord", GNUNET_BLOCK_TYPE_GNS_NAMERECORD},
+    {"regex",          GNUNET_BLOCK_TYPE_REGEX},
+    {"regex_accept",   GNUNET_BLOCK_TYPE_REGEX_ACCEPT},
+    {NULL,             0}
+};
+
diff --git a/src/lib/block/gnunet_block_dbus_lib_pop.c b/src/lib/block/gnunet_block_dbus_lib_pop.c
new file mode 100644
index 0000000..8323495
--- /dev/null
+++ b/src/lib/block/gnunet_block_dbus_lib_pop.c
@@ -0,0 +1,20 @@
+#include "config.h"
+
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_block_lib.h>
+
+#include "gnunet_dbus_lib.h"
+#include "gnunet_block_dbus_lib.h"
+
+DBusMessage *
+GNUNET_BLOCK_DBUS_pop_type (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const char *arg_name,
+    enum GNUNET_BLOCK_Type *value)
+{
+  return GNUNET_DBUS_pop_enum (message, iter, arg_name, (int *)value, GNUNET_BLOCK_DBUS_type_description);
+};
+
+
diff --git a/src/lib/block/gnunet_block_dbus_lib_push.c b/src/lib/block/gnunet_block_dbus_lib_push.c
new file mode 100644
index 0000000..1aaca01
--- /dev/null
+++ b/src/lib/block/gnunet_block_dbus_lib_push.c
@@ -0,0 +1,18 @@
+#include "config.h"
+
+#include <gnunet/platform.h>
+#include <gnunet/gnunet_common.h>
+#include <gnunet/gnunet_block_lib.h>
+
+#include "gnunet_dbus_lib.h"
+#include "gnunet_block_dbus_lib.h"
+
+void
+GNUNET_BLOCK_DBUS_push_type (
+    DBusMessage *message,
+    DBusMessageIter *iter,
+    const enum GNUNET_BLOCK_Type *value)
+{
+  return GNUNET_DBUS_push_enum (message, iter, (const int *)value, GNUNET_BLOCK_DBUS_type_description);
+};
+