[HICN-298] Release new hICN app for Android

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

1 files changed, 122 insertions, 82 deletions

diff --git a/ctrl/facemgr/src/interfaces/hicn_light/hicn_light.c b/ctrl/facemgr/src/interfaces/hicn_light/hicn_light.c
index 85694573d..e42c6c6ae 100644
--- a/ctrl/facemgr/src/interfaces/hicn_light/hicn_light.c
+++ b/ctrl/facemgr/src/interfaces/hicn_light/hicn_light.c
@@ -18,27 +18,70 @@
  * \brief hICN light interface
  */
 #include <stdbool.h>
-#include <stdlib.h> // arc4random [random, rand]
 #include <stdio.h> // snprintf
 #include <time.h> // time
 
 #include <hicn/ctrl.h>
+#include <hicn/facemgr.h>
+#include <hicn/util/ip_address.h>
+#include <hicn/util/log.h>
 
-#include "../../facemgr.h"
+#include "../../facelet.h"
 #include "../../interface.h"
-#include "../../util/ip_address.h"
-#include "../../util/log.h"
 #include "../../util/map.h"
-#include "../../event.h"
 
 #define DEFAULT_ROUTE_COST 0
 
+typedef enum {
+    HL_STATE_UNDEFINED,
+    HL_STATE_FACES_SENT,
+    HL_STATE_DONE,
+} hl_state_t;
+
 typedef struct {
     hc_sock_t * s;
-    bool busy;
+    hl_state_t state;
 } hl_data_t;
 
-int hl_initialize(interface_t * interface, face_rules_t * rules, void ** pdata)
+int hl_process_state(interface_t * interface)
+{
+    hl_data_t * data = (hl_data_t *)interface->data;
+
+    hc_data_t * faces;
+#if 0
+    char buf[MAXSZ_FACE];
+#endif
+
+    switch(data->state)
+    {
+        case HL_STATE_UNDEFINED:
+            if (hc_face_list(data->s, &faces) < 0) {
+                /* Blocking call */
+                printf("Could not retrieve face list\n");
+                return -1;
+            }
+            foreach_face(f, faces) {
+#if 0
+                hc_face_snprintf(buf, MAXSZ_FACE, f);
+                printf("Face: %s\n", buf);
+#endif
+                facelet_t * facelet = facelet_create_from_face(&f->face);
+                facelet_set_event(facelet, FACELET_EVENT_GET);
+                facelet_raise_event(facelet, interface);
+            }
+            break;
+
+        case HL_STATE_FACES_SENT:
+            break;
+
+        default: /* HL_STATE_DONE never called */
+            break;
+    }
+
+    return 0;
+}
+
+int hl_initialize(interface_t * interface, void * cfg)
 {
     hl_data_t * data = malloc(sizeof(hl_data_t));
     if (!data) {
@@ -57,51 +100,52 @@ int hl_initialize(interface_t * interface, face_rules_t * rules, void ** pdata)
         goto ERR_CONNECT;
     }
 
-    data->busy = false;
+    data->state = HL_STATE_UNDEFINED;
+
+    interface->data = data;
 
-    *pdata = data;
+    hl_process_state(interface);
 
-    return FACEMGR_SUCCESS;
+    return 0;
 
 ERR_CONNECT:
     hc_sock_free(data->s);
 ERR_SOCK:
     free(data);
 ERR_MALLOC:
-    return FACEMGR_FAILURE;
+    return -1;
 }
 
 int hl_finalize(interface_t * interface)
 {
     //hc_data_t * data = interface->data;
     //hc_sock_close(data->s);
-    return FACEMGR_SUCCESS;
+    return 0;
 }
 
-int hl_on_event(interface_t * interface, const event_t * event)
+int hl_on_event(interface_t * interface, const facelet_t * facelet)
 {
-    hc_face_t face;
+    hc_face_t hc_face;
     hc_route_t route;
     int rc;
     hl_data_t * data = (hl_data_t *)interface->data;
 
-    /* XXX We need  a queue or a socket pool to process concurrent events */
-    if (data->busy) {
-        ERROR("[hicn_light] Busy !");
-        return FACEMGR_FAILURE;
-    }
+    face_t * face = NULL;
+    if (facelet_get_face(facelet, &face) < 0)
+        return -1;
+
+    switch(facelet_get_event(facelet)) {
 
-    switch(event->type) {
-        case EVENT_TYPE_CREATE:
+        case FACELET_EVENT_CREATE:
 
             /* Create face */
-            face.face = *event->face;
-            rc = hc_face_create(data->s, &face);
+            hc_face.face = *face;
+            rc = hc_face_create(data->s, &hc_face);
             if (rc < 0) {
                 ERROR("Failed to create face\n");
                 goto ERR;
             }
-            DEBUG("Created face id=%d\n", face.id);
+            INFO("Created face id=%d\n", hc_face.id);
 
 #if 0
             /* Add default route v4 */
@@ -134,88 +178,84 @@ int hl_on_event(interface_t * interface, const event_t * event)
             }
 #endif
 
-#if 1
-            /* We add routes based on face tags */
-
-            if (policy_tags_has(event->face->tags, POLICY_TAG_TRUSTED)) {
-                route = (hc_route_t) {
-                    .face_id = face.id,
-                    .family = AF_INET6,
-                    .len = 16,
-                    .cost = DEFAULT_ROUTE_COST,
-                };
-                if (ip_address_pton("b001::", &route.remote_addr) < 0) {
-                    ERROR("Failed to convert prefix");
-                    goto ERR;
-                }
-                if (hc_route_create(data->s, &route) < 0) {
-                    ERROR("Failed to create hICN/IPv6 route");
-                    goto ERR;
-                }
+            /* Adding default route */
+            route = (hc_route_t) {
+                .face_id = hc_face.id,
+                .family = AF_INET6,
+                .len = 0,
+                .cost = DEFAULT_ROUTE_COST,
+            };
+            if (ip_address_pton("::", &route.remote_addr) < 0) {
+                ERROR("Failed to convert prefix");
+                goto ERR;
+            }
+            if (hc_route_create(data->s, &route) < 0) {
+                ERROR("Failed to create hICN/IPv6 route");
+                goto ERR;
+            }
 
-                route = (hc_route_t) {
-                    .face_id = face.id,
-                    .family = AF_INET6,
-                    .len = 16,
-                    .cost = DEFAULT_ROUTE_COST,
-                };
-                if (ip_address_pton("d001::", &route.remote_addr) < 0) {
-                    ERROR("Failed to convert prefix");
+            break;
+
+        case FACELET_EVENT_DELETE:
+            /* Removing a face should also remove associated routes */
+            /* Create face */
+            hc_face.face = *face;
+            rc = hc_face_delete(data->s, &hc_face);
+            if (rc < 0) {
+                ERROR("Failed to delete face\n");
+                goto ERR;
+            }
+            INFO("Deleted face id=%d\n", hc_face.id);
+            break;
+
+        case FACELET_EVENT_UPDATE:
+            /* Currently, only admin_state is supported */
+            if (facelet_get_admin_state_status(facelet) == FACELET_ATTR_STATUS_DIRTY) {
+                hc_face.face = *face;
+                hc_face_t * face_found;
+                rc = hc_face_get(data->s, &hc_face, &face_found);
+                if (rc < 0) {
+                    ERROR("Failed to find face\n");
                     goto ERR;
                 }
-                if (hc_route_create(data->s, &route) < 0) {
-                    ERROR("Failed to create hICN/IPv6 route");
+                if (!face_found) {
+                    ERROR("Face to update has not been found");
                     goto ERR;
                 }
+                char conn_id_or_name[NAME_LEN];
+                snprintf(conn_id_or_name, NAME_LEN, "%d", face_found->id);
+                free(face_found);
+                printf("Face id = %d\n", face_found->id);
 
-            } else {
-
-                route = (hc_route_t) {
-                    .face_id = face.id,
-                    .family = AF_INET6,
-                    .len = 16,
-                    .cost = DEFAULT_ROUTE_COST,
-                };
-                if (ip_address_pton("c001::", &route.remote_addr) < 0) {
-                    ERROR("Failed to convert prefix");
+                face_state_t admin_state;
+                if (facelet_get_admin_state(facelet, &admin_state) < 0) {
+                    ERROR("Failed to retrieve facelet admin state");
                     goto ERR;
                 }
-                if (hc_route_create(data->s, &route) < 0) {
-                    ERROR("Failed to create hICN/IPv6 route");
+
+                printf("Setting admin state");
+                if (hc_connection_set_admin_state(data->s, conn_id_or_name, admin_state) < 0) {
+                    ERROR("Failed to update admin state");
                     goto ERR;
                 }
+                INFO("Admin state updated");
             }
-#endif
-
-            break;
-
-        case EVENT_TYPE_DELETE:
-            /* Removing a face should also remove associated routes */
-            /* Create face */
-            face.face = *event->face;
-            rc = hc_face_delete(data->s, &face);
-            if (rc < 0) {
-                ERROR("Failed to delete face\n");
-                goto ERR;
-            }
-            INFO("Deleted face id=%d\n", face.id);
             break;
 
         default:
-            ERROR("Unknown event %s\n", event_type_str[event->type]);
+            ERROR("Unknown event %s\n", facelet_event_str[facelet_get_event(facelet)]);
             /* Unsupported events */
             goto ERR;
     }
 
-    return FACEMGR_SUCCESS;
+    return 0;
 
 ERR:
-    return FACEMGR_FAILURE;
+    return -1;
 }
 
 const interface_ops_t hicn_light_ops = {
     .type = "hicn_light",
-    .is_singleton = false,
     .initialize = hl_initialize,
     .finalize = hl_finalize,
     .on_event = hl_on_event,