aboutsummaryrefslogtreecommitdiffstats
path: root/hicn-light
diff options
context:
space:
mode:
Diffstat (limited to 'hicn-light')
-rw-r--r--hicn-light/src/command_line/controller/hicnLightControl_main.c52
-rw-r--r--hicn-light/src/command_line/daemon/hicnLightDaemon_main.c52
-rw-r--r--hicn-light/src/core/messageHandler.h4
3 files changed, 91 insertions, 17 deletions
diff --git a/hicn-light/src/command_line/controller/hicnLightControl_main.c b/hicn-light/src/command_line/controller/hicnLightControl_main.c
index 03f74692f..ff1a20ab0 100644
--- a/hicn-light/src/command_line/controller/hicnLightControl_main.c
+++ b/hicn-light/src/command_line/controller/hicnLightControl_main.c
@@ -80,14 +80,52 @@ typedef struct controller_main_state {
ControlState *controlState;
} ControlMainState;
+static void _printRed(const char *output) {
+
+#ifndef _WIN32
+ printf("\033[0;31m%s", output);
+#else
+ HANDLE hConsole = NULL;
+ WORD currentConsoleAttr;
+ CONSOLE_SCREEN_BUFFER_INFO csbi;
+ hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
+ if (GetConsoleScreenBufferInfo(hConsole, &csbi))
+ currentConsoleAttr = csbi.wAttributes;
+ SetConsoleTextAttribute(hConsole, 4);
+ printf("%s", output);
+ SetConsoleTextAttribute(hConsole, currentConsoleAttr);
+#endif
+
+}
+
+static void _printWhite(const char *output) {
+
+#ifndef _WIN32
+ printf("\033[0m%s", output);
+#else
+ HANDLE hConsole = NULL;
+ WORD currentConsoleAttr;
+ CONSOLE_SCREEN_BUFFER_INFO csbi;
+ SetConsoleTextAttribute(hConsole, 7);
+ if (GetConsoleScreenBufferInfo(hConsole, &csbi))
+ currentConsoleAttr = csbi.wAttributes;
+ hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
+ printf("%s", output);
+ SetConsoleTextAttribute(hConsole, currentConsoleAttr);
+#endif
+
+}
+
static void _displayForwarderLogo(void) {
- const char cli_banner[] =
- "\033[0;31m ____ ___ _ \033[0m __ _ __ _ __ __\n"
- "\033[0;31m / __// _ \\ (_)___ \033[0m / / (_)____ ___ ____/ /(_)___ _ / / / /_\n"
- "\033[0;31m / _/ / // /_ / // _ \\ \033[0m / _ \\ / // __// _ \\___/ // // _ `// _ \\/ __/\n"
- "\033[0;31m/_/ /____/(_)/_/ \\___/ \033[0m/_//_//_/ \\__//_//_/ /_//_/ \\_, //_//_/\\__/\n"
- " /___/ \n";
- printf("%s", cli_banner);
+ _printRed(" ____ ___ _ ");
+ _printWhite(" __ _ __ _ __ __\n");
+ _printRed(" / __// _ \\ (_)___ ");
+ _printWhite(" / / (_)____ ___ ____/ /(_)___ _ / / / /_\n");
+ _printRed(" / _/ / // /_ / // _ \\ ");
+ _printWhite(" / _ \\ / // __// _ \\___/ // // _ `// _ \\/ __/\n");
+ _printRed("/_/ /____/(_)/_/ \\___/ ");
+ _printWhite("/_//_//_/ \\__//_//_/ /_//_/ \\_, //_//_/\\__/\n");
+ _printWhite(" /___/ \n");
printf("\n");
}
diff --git a/hicn-light/src/command_line/daemon/hicnLightDaemon_main.c b/hicn-light/src/command_line/daemon/hicnLightDaemon_main.c
index 1b7e92e75..533bb9cf0 100644
--- a/hicn-light/src/command_line/daemon/hicnLightDaemon_main.c
+++ b/hicn-light/src/command_line/daemon/hicnLightDaemon_main.c
@@ -36,14 +36,52 @@
#include <src/core/dispatcher.h>
#include <src/core/forwarder.h>
+static void _printRed(const char *output) {
+
+#ifndef _WIN32
+ printf("\033[0;31m%s", output);
+#else
+ HANDLE hConsole = NULL;
+ WORD currentConsoleAttr;
+ CONSOLE_SCREEN_BUFFER_INFO csbi;
+ if (GetConsoleScreenBufferInfo(hConsole, &csbi))
+ currentConsoleAttr = csbi.wAttributes;
+ hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
+ SetConsoleTextAttribute(hConsole, 4);
+ printf("%s", output);
+ SetConsoleTextAttribute(hConsole, currentConsoleAttr);
+#endif
+
+}
+
+static void _printWhite(const char *output) {
+
+#ifndef _WIN32
+ printf("\033[0m%s", output);
+#else
+ HANDLE hConsole = NULL;
+ WORD currentConsoleAttr;
+ CONSOLE_SCREEN_BUFFER_INFO csbi;
+ if (GetConsoleScreenBufferInfo(hConsole, &csbi))
+ currentConsoleAttr = csbi.wAttributes;
+ hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
+ SetConsoleTextAttribute(hConsole, 7);
+ printf("%s", output);
+ SetConsoleTextAttribute(hConsole, currentConsoleAttr);
+#endif
+
+}
+
static void _displayForwarderLogo(void) {
- const char cli_banner[] =
- "\033[0;31m ____ ___ _ \033[0m __ _ __ _ __ __\n"
- "\033[0;31m / __// _ \\ (_)___ \033[0m / / (_)____ ___ ____/ /(_)___ _ / / / /_\n"
- "\033[0;31m / _/ / // /_ / // _ \\ \033[0m / _ \\ / // __// _ \\___/ // // _ `// _ \\/ __/\n"
- "\033[0;31m/_/ /____/(_)/_/ \\___/ \033[0m/_//_//_/ \\__//_//_/ /_//_/ \\_, //_//_/\\__/\n"
- " /___/ \n";
- printf("%s", cli_banner);
+ _printRed(" ____ ___ _ ");
+ _printWhite(" __ _ __ _ __ __\n");
+ _printRed(" / __// _ \\ (_)___ ");
+ _printWhite(" / / (_)____ ___ ____/ /(_)___ _ / / / /_\n");
+ _printRed(" / _/ / // /_ / // _ \\ ");
+ _printWhite(" / _ \\ / // __// _ \\___/ // // _ `// _ \\/ __/\n");
+ _printRed("/_/ /____/(_)/_/ \\___/ ");
+ _printWhite("/_//_//_/ \\__//_//_/ /_//_/ \\_, //_//_/\\__/\n");
+ _printWhite(" /___/ \n");
printf("\n");
}
diff --git a/hicn-light/src/core/messageHandler.h b/hicn-light/src/core/messageHandler.h
index cf8ab3672..f469ac5b0 100644
--- a/hicn-light/src/core/messageHandler.h
+++ b/hicn-light/src/core/messageHandler.h
@@ -41,8 +41,6 @@
#define PATH_LABEL_MASK 0x8000 // 1000 0000 0000 0000
#define NOT_PATH_LABEL_MASK 0x7fff // 0111 0000 0000 0000
#define UINT16_T_MASK 0x0000ffff // 1111 1111 1111 1111
-#define NEVER_EXPIRE \
- 16777216 // 2^16 (max urgent pointer) * 2^8 (max reserved + NS bits)
/*** HICN ALLOWED PORTS ***/
#define CONTROL_PORT 9695
@@ -435,7 +433,7 @@ static inline bool messageHandler_HasContentExpiryTime(const uint8_t *message) {
hicn_data_get_expiry_time((hicn_header_t *)message, &expirationTime);
if (res < 0) return false;
- if (expirationTime == NEVER_EXPIRE) return false;
+ if (expirationTime == HICN_MAX_LIFETIME) return false;
return true;
}