From 43980f3096655df2b2ecec50e700dd6989b0e0d6 Mon Sep 17 00:00:00 2001 From: michele papalini Date: Tue, 10 Dec 2019 13:40:16 +0100 Subject: [HICN-442] new forwarding strategy Signed-off-by: michele papalini Change-Id: I62c03bddedc83e523fc60f4b50d2c69e38b50318 Signed-off-by: Angelo Mantellini Signed-off-by: michele papalini --- hicn-light/src/hicn/config/configurationFile.c | 3 +++ hicn-light/src/hicn/config/controlAddListener.c | 8 +++++++- hicn-light/src/hicn/config/controlSetStrategy.c | 6 ++---- 3 files changed, 12 insertions(+), 5 deletions(-) (limited to 'hicn-light/src/hicn/config') diff --git a/hicn-light/src/hicn/config/configurationFile.c b/hicn-light/src/hicn/config/configurationFile.c index 3cce740ac..5f9c9ce9d 100644 --- a/hicn-light/src/hicn/config/configurationFile.c +++ b/hicn-light/src/hicn/config/configurationFile.c @@ -288,6 +288,9 @@ bool configurationFile_Process(ConfigurationFile *configFile) { } success = false; } + for(int i = 0; i < parcList_Size(args); i++){ + free(parcList_GetAtIndex(args, i)); + } parcList_Release(&args); parcMemory_Deallocate((void **)©); } diff --git a/hicn-light/src/hicn/config/controlAddListener.c b/hicn-light/src/hicn/config/controlAddListener.c index d4537b855..2f0fd3f67 100644 --- a/hicn-light/src/hicn/config/controlAddListener.c +++ b/hicn-light/src/hicn/config/controlAddListener.c @@ -119,7 +119,13 @@ static CommandReturn _CreateListener(CommandParser *parser, CommandOps *ops, } // Fill remaining payload fields - memcpy(addListenerCommand->interfaceName, interfaceName, SYMBOLIC_NAME_LEN); + size_t name_size = strlen((const char *)interfaceName); + if(name_size > SYMBOLIC_NAME_LEN){ + //cut the string + name_size = SYMBOLIC_NAME_LEN; + } + + memcpy(addListenerCommand->interfaceName, interfaceName, name_size); addListenerCommand->listenerMode = mode; addListenerCommand->connectionType = type; addListenerCommand->port = htons((uint16_t)atoi(port)); diff --git a/hicn-light/src/hicn/config/controlSetStrategy.c b/hicn-light/src/hicn/config/controlSetStrategy.c index 5357a413e..10fec964b 100644 --- a/hicn-light/src/hicn/config/controlSetStrategy.c +++ b/hicn-light/src/hicn/config/controlSetStrategy.c @@ -45,8 +45,7 @@ static const char *_commandSetStrategyHelp = "help set strategy"; static const char *_commandSetStrategyOptions[LAST_STRATEGY_VALUE] = { "loadbalancer", "random", - "random_per_dash_segment", - "loadbalancer_with_delay", + "low_latency", }; // ==================================================== @@ -151,8 +150,7 @@ static CommandReturn _controlSetStrategy_HelpExecute(CommandParser *parser, printf("available strategies:\n"); printf(" random\n"); printf(" loadbalancer\n"); - printf(" random_per_dash_segment\n"); - printf(" loadbalancer_with_delay\n"); + printf(" low_latency\n"); printf("\n"); return CommandReturn_Success; } -- cgit 1.2.3-korg