diff options
author | Angelo Mantellini <angelo.mantellini@cisco.com> | 2020-06-15 10:02:57 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@fd.io> | 2020-06-15 10:02:57 +0000 |
commit | 961352d7801c4f4bbee2990690b7d5ac5e3c88d6 (patch) | |
tree | 20f3915fa8220caec629cfbc1dd918acc359e0e4 /hicn-light/src/hicn/config/controlAdd.c | |
parent | 0f3841ea94ed9019a538516d774f5936b301e9a0 (diff) | |
parent | 9e2c045d6118ef264d6cf8fc655b72d7c4c403dc (diff) |
Merge "[HICN-626] Return output from libhicnlight"
Diffstat (limited to 'hicn-light/src/hicn/config/controlAdd.c')
-rw-r--r-- | hicn-light/src/hicn/config/controlAdd.c | 49 |
1 files changed, 34 insertions, 15 deletions
diff --git a/hicn-light/src/hicn/config/controlAdd.c b/hicn-light/src/hicn/config/controlAdd.c index e10b56e99..cac8e7913 100644 --- a/hicn-light/src/hicn/config/controlAdd.c +++ b/hicn-light/src/hicn/config/controlAdd.c @@ -35,10 +35,18 @@ // =================================================== static void _controlAdd_Init(CommandParser *parser, CommandOps *ops); -static CommandReturn _controlAdd_Execute(CommandParser *parser, CommandOps *ops, - PARCList *args); + +static CommandReturn _controlAdd_Execute(CommandParser *parser, + CommandOps *ops, + PARCList *args, + char *output, + size_t output_size); + static CommandReturn _controlAdd_HelpExecute(CommandParser *parser, - CommandOps *ops, PARCList *args); + CommandOps *ops, + PARCList *args, + char *output, + size_t output_size); // =================================================== @@ -58,7 +66,10 @@ CommandOps *controlAdd_CreateHelp(ControlState *state) { // =================================================== static CommandReturn _controlAdd_HelpExecute(CommandParser *parser, - CommandOps *ops, PARCList *args) { + CommandOps *ops, + PARCList *args, + char *output, + size_t output_size) { CommandOps *ops_add_connection = controlAddConnection_Create(NULL); CommandOps *ops_add_route = controlAddRoute_Create(NULL); CommandOps *ops_add_punting = controlAddPunting_Create(NULL); @@ -66,16 +77,21 @@ static CommandReturn _controlAdd_HelpExecute(CommandParser *parser, #ifdef WITH_POLICY CommandOps *ops_add_policy = controlAddPolicy_Create(NULL); #endif /* WITH_POLICY */ - - printf("Available commands:\n"); - printf(" %s\n", ops_add_connection->command); - printf(" %s\n", ops_add_route->command); - printf(" %s\n", ops_add_punting->command); - printf(" %s\n", ops_add_listener->command); #ifdef WITH_POLICY - printf(" %s\n", ops_add_policy->command); + snprintf(output, output_size, "Available commands:\n %s\n %s\n %s\n %s\n %s\n\n", + ops_add_connection->command, + ops_add_route->command, + ops_add_punting->command, + ops_add_listener->command, + ops_add_policy->command); +#else + snprintf(output, output_size, "Available commands:\n %s\n %s\n %s\n %s\n\n", + ops_add_connection->command, + ops_add_route->command, + ops_add_punting->command, + ops_add_listener->command); + #endif /* WITH_POLICY */ - printf("\n"); commandOps_Destroy(&ops_add_connection); commandOps_Destroy(&ops_add_route); @@ -103,7 +119,10 @@ static void _controlAdd_Init(CommandParser *parser, CommandOps *ops) { #endif /* WITH_POLICY */ } -static CommandReturn _controlAdd_Execute(CommandParser *parser, CommandOps *ops, - PARCList *args) { - return _controlAdd_HelpExecute(parser, ops, args); +static CommandReturn _controlAdd_Execute(CommandParser *parser, + CommandOps *ops, + PARCList *args, + char *output, + size_t output_size) { + return _controlAdd_HelpExecute(parser, ops, args, output, output_size); } |