From 15ad172a847fa667c57a4594ef4158405db9a984 Mon Sep 17 00:00:00 2001 From: Angelo Mantellini Date: Tue, 31 Mar 2020 17:50:43 +0200 Subject: [HICN-554] hicn-light refactoring MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I36f2d393741d4502ce14d3791158e43e3e9cd4cf Signed-off-by: Jordan Augé --- hicn-light/src/hicn/config/controlAddRoute.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'hicn-light/src/hicn/config/controlAddRoute.c') diff --git a/hicn-light/src/hicn/config/controlAddRoute.c b/hicn-light/src/hicn/config/controlAddRoute.c index 8a1adf6d6..f7b83e3a8 100644 --- a/hicn-light/src/hicn/config/controlAddRoute.c +++ b/hicn-light/src/hicn/config/controlAddRoute.c @@ -109,29 +109,29 @@ static CommandReturn _controlAddRoute_Execute(CommandParser *parser, } // allocate command payload - add_route_command *addRouteCommand = - parcMemory_AllocateAndClear(sizeof(add_route_command)); + cmd_route_add_t *cmd = + parcMemory_AllocateAndClear(sizeof(cmd_route_add_t)); // check and set IP address - if (inet_pton(AF_INET, addr, &addRouteCommand->address.v4.as_u32) == 1) { + if (inet_pton(AF_INET, addr, &cmd->address.v4.as_u32) == 1) { if (len > 32) { printf("ERROR: exceeded INET mask length, max=32\n"); - parcMemory_Deallocate(&addRouteCommand); + parcMemory_Deallocate(&cmd); free(addr); return CommandReturn_Failure; } - addRouteCommand->addressType = ADDR_INET; - } else if (inet_pton(AF_INET6, addr, &addRouteCommand->address.v6.as_in6addr) == 1) { + cmd->family = AF_INET; + } else if (inet_pton(AF_INET6, addr, &cmd->address.v6.as_in6addr) == 1) { if (len > 128) { printf("ERROR: exceeded INET6 mask length, max=128\n"); - parcMemory_Deallocate(&addRouteCommand); + parcMemory_Deallocate(&cmd); free(addr); return CommandReturn_Failure; } - addRouteCommand->addressType = ADDR_INET6; + cmd->family = AF_INET6; } else { printf("Error: %s is not a valid network address \n", addr); - parcMemory_Deallocate(&addRouteCommand); + parcMemory_Deallocate(&cmd); free(addr); return CommandReturn_Failure; } @@ -139,13 +139,13 @@ static CommandReturn _controlAddRoute_Execute(CommandParser *parser, free(addr); // Fill remaining payload fields - addRouteCommand->len = len; - addRouteCommand->cost = (uint16_t)cost; - strcpy(addRouteCommand->symbolicOrConnid, symbolicOrConnid); + cmd->len = len; + cmd->cost = (uint16_t)cost; + strcpy(cmd->symbolicOrConnid, symbolicOrConnid); // send message and receive response - struct iovec *response = utils_SendRequest(state, ADD_ROUTE, addRouteCommand, - sizeof(add_route_command)); + struct iovec *response = utils_SendRequest(state, COMMAND_TYPE_ROUTE_ADD, cmd, + sizeof(cmd_route_add_t)); if (!response) { // get NULL pointer return CommandReturn_Failure; -- cgit 1.2.3-korg