[HICN-298] Release new hICN app for Android

Change-Id: I43adc62fadf00690b687078d739788dffdc5e566
Signed-off-by: Jordan Augé <jordan.auge+fdio@cisco.com>

3 files changed, 119 insertions, 14 deletions

diff --git a/ctrl/facemgr/src/interfaces/dummy/CMakeLists.txt b/ctrl/facemgr/src/interfaces/dummy/CMakeLists.txt
index 1af3b4b2a..05276bc5a 100644
--- a/ctrl/facemgr/src/interfaces/dummy/CMakeLists.txt
+++ b/ctrl/facemgr/src/interfaces/dummy/CMakeLists.txt
@@ -12,6 +12,7 @@
 # limitations under the License.
 
 list(APPEND HEADER_FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/dummy.h
 )
 
 list(APPEND SOURCE_FILES
diff --git a/ctrl/facemgr/src/interfaces/dummy/dummy.c b/ctrl/facemgr/src/interfaces/dummy/dummy.c
index b0c558388..6a21792a2 100644
--- a/ctrl/facemgr/src/interfaces/dummy/dummy.c
+++ b/ctrl/facemgr/src/interfaces/dummy/dummy.c
@@ -19,31 +19,101 @@
  */
 
 #include <stdlib.h>
+#include <unistd.h> // close
+
+#include <hicn/facemgr.h>
 
-#include "../../interface.h"
 #include "../../common.h"
-#include "../../event.h"
-#include "../../face.h"
-#include "../../facemgr.h"
+#include "../../facelet.h"
+#include "../../interface.h"
+
+#include "dummy.h"
 
 #define DEFAULT_PORT 9695
 
-int dummy_initialize(interface_t * interface, face_rules_t * rules, void **pdata) {
-    ip_address_t local = IPV4_LOOPBACK;
-    ip_address_t remote = IPV4_LOOPBACK;
-    face_t * face = face_create_udp(&local, DEFAULT_PORT, &remote, DEFAULT_PORT, AF_INET);
-    event_raise(EVENT_TYPE_CREATE, face, interface);
-    return FACEMGR_SUCCESS;
+#define UNUSED(x) ((void)x)
+
+/*
+ * Internal data
+ */
+typedef struct {
+    /* The configuration data will likely be allocated on the stack (or should
+     * be freed) by the caller, we recommend to make a copy of this data.
+     * This copy can further be altered with default values.
+     */
+    dummy_cfg_t cfg;
+
+    /* ... */
+
+    int fd; /* Sample internal data: file descriptor */
+} dummy_data_t;
+
+int dummy_initialize(interface_t * interface, void * cfg)
+{
+    dummy_data_t * data = malloc(sizeof(dummy_data_t));
+    if (!data)
+        goto ERR_MALLOC;
+    interface->data = data;
+
+    /* Use default values for unspecified configuration parameters */
+    if (cfg) {
+        data->cfg = *(dummy_cfg_t *)cfg;
+    } else {
+        memset(&data->cfg, 0, sizeof(data->cfg));
+    }
+
+    /* ... */
+
+    data->fd = 0;
+
+    /* ... */
+
+    /*
+     * We should return a negative value in case of error, and a positive value
+     * otherwise:
+     *  - a file descriptor (>0) will be added to the event loop; or
+     *  - 0 if we don't use any file descriptor
+     */
+    return data->fd;
+
+ERR_MALLOC:
+    return -1;
+}
+
+int dummy_finalize(interface_t * interface)
+{
+    dummy_data_t * data = (dummy_data_t*)interface->data;
+
+    if (data->fd > 0)
+        close(data->fd);
+
+    return 0;
 }
 
-int dummy_finalize(interface_t * interface) {
-    return FACEMGR_SUCCESS;
+int dummy_callback(interface_t * interface)
+{
+    dummy_data_t * data = (dummy_data_t*)interface->data;
+    UNUSED(data);
+
+    /* ... */
+
+    return 0;
+}
+
+int dummy_on_event(interface_t * interface, const facelet_t * facelet)
+{
+    dummy_data_t * data = (dummy_data_t*)interface->data;
+    UNUSED(data);
+
+    /* ... */
+
+    return 0;
 }
 
 interface_ops_t dummy_ops = {
     .type = "dummy",
-    .is_singleton = true,
     .initialize = dummy_initialize,
     .finalize = dummy_finalize,
-    .on_event = NULL,
+    .callback = dummy_callback,
+    .on_event = dummy_on_event,
 };
diff --git a/ctrl/facemgr/src/interfaces/dummy/dummy.h b/ctrl/facemgr/src/interfaces/dummy/dummy.h
new file mode 100644
index 000000000..22fe5d1a6
--- /dev/null
+++ b/ctrl/facemgr/src/interfaces/dummy/dummy.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2017-2019 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * \file dummy.h
+ * \brief Dummy interface
+ *
+ * This class serves as a template to implement new face maanger interfaces, and
+ * can be used for test purposes.
+ */
+
+#ifndef FACEMGR_INTERFACE_DUMMY_H
+#define FACEMGR_INTERFACE_DUMMY_H
+
+/*
+ * Configuration data
+ */
+typedef struct {
+    /* ... */
+} dummy_cfg_t;
+
+#endif /* FACEMGR_INTERFACE_DUMMY_H */