From 6b84ec54083da9911f5ad4816d0eb4f4745afad4 Mon Sep 17 00:00:00 2001
From: Jordan Augé <jordan.auge+fdio@cisco.com>
Date: Mon, 7 Oct 2019 09:52:33 +0200
Subject: [HICN-298] Release new hICN app for Android
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I43adc62fadf00690b687078d739788dffdc5e566
Signed-off-by: Jordan Augé <jordan.auge+fdio@cisco.com>
---
 hicn-light/src/hicn/utils/commands.h | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'hicn-light/src/hicn/utils/commands.h')

diff --git a/hicn-light/src/hicn/utils/commands.h b/hicn-light/src/hicn/utils/commands.h
index 223bbffaa..834da6259 100644
--- a/hicn-light/src/hicn/utils/commands.h
+++ b/hicn-light/src/hicn/utils/commands.h
@@ -31,7 +31,9 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include <hicn/utils/policy.h>
+#ifdef WITH_POLICY
+#include <hicn/policy.h>
+#endif /* WITH_POLICY */
 
 typedef struct in6_addr ipv6_addr_t;
 typedef uint32_t ipv4_addr_t;
@@ -113,9 +115,7 @@ typedef enum { ETHER_MODE, IP_MODE, HICN_MODE } listener_mode;
 
 typedef struct {
   char symbolic[16];
-#ifdef __linux__
   char interfaceName[16];
-#endif
   union commandAddr address;
   uint16_t port;
   // uint16_t etherType;
@@ -130,6 +130,7 @@ typedef struct {
 
 typedef struct {
   char symbolic[16];
+  //char interfaceName[16];
   union commandAddr remoteIp;
   union commandAddr localIp;
   uint16_t remotePort;
@@ -165,6 +166,9 @@ typedef struct {
   add_connection_command connectionData;
   uint32_t connid;
   uint8_t state;
+  uint8_t admin_state;
+  char connectionName[16];
+  char interfaceName[16];
 } list_connections_command;
 
 // SIZE=64
@@ -273,6 +277,8 @@ typedef struct {
 
 typedef struct {
   union commandAddr address;
+  char listenerName[16];
+  char interfaceName[16];
   uint32_t connid;
   uint16_t port;
   uint8_t addressType;
@@ -300,6 +306,7 @@ typedef struct {
 typedef struct {
   char symbolicOrConnid[16];
   uint8_t admin_state;
+  uint16_t pad16;
 } connection_set_admin_state_command;
 
 #ifdef WITH_POLICY
-- 
cgit 1.2.3-korg