From 84bfce8dd67d9d74febaf5ef3c0fe0cd6ec16382 Mon Sep 17 00:00:00 2001 From: Sangjin Kim Date: Wed, 9 Nov 2016 04:03:55 -0800 Subject: [PATCH] Revert "Merge plugin improvement commit" This reverts commit 97f2d53e382e658536c6e38073f695812b57af38. Change-Id: I71c2fbae3f8c3f439304ab51224fdb3daecbdb0e --- src/default_plugin.h | 1 - src/default_plugin_basic.c | 15 --------------- src/default_plugin_main.c | 2 -- src/plugin.c | 16 +++++----------- src/sdb.c | 5 +++-- src/sdbd_plugin.h | 1 - src/services.c | 9 +++------ src/transport_local.c | 1 - 8 files changed, 11 insertions(+), 39 deletions(-) diff --git a/src/default_plugin.h b/src/default_plugin.h index 0c8b5b9..800e495 100644 --- a/src/default_plugin.h +++ b/src/default_plugin.h @@ -26,7 +26,6 @@ int verify_peer_ip ( parameters* in, parameters* out ); int verify_sdbd_launch ( parameters* in, parameters* out ); int verify_root_cmd ( parameters* in, parameters* out ); int get_lock_state ( parameters* in, parameters* out ); -int get_shell_env ( parameters* in, parameters* out ); int auth_support ( parameters* in, parameters* out ); int auth_get_key_file_paths ( parameters* in, parameters* out ); diff --git a/src/default_plugin_basic.c b/src/default_plugin_basic.c index 81f313c..2072824 100644 --- a/src/default_plugin_basic.c +++ b/src/default_plugin_basic.c @@ -198,18 +198,3 @@ int verify_root_cmd ( parameters* in, parameters* out ) return PLUGIN_CMD_SUCCESS; } - -int get_shell_env ( parameters* in, parameters* out ) -{ - if ( out == NULL ) { - D ( "Invalid argument\n" ); - return PLUGIN_CMD_FAIL; - } - - out->number_of_parameter = 1; - out->array_of_parameter = ( parameter* ) malloc ( sizeof ( parameter ) ); - - make_string_parameter ( & ( out->array_of_parameter[0] ), "%s", "" ); - return PLUGIN_CMD_SUCCESS; -} - diff --git a/src/default_plugin_main.c b/src/default_plugin_main.c index ea71971..a118fe7 100644 --- a/src/default_plugin_main.c +++ b/src/default_plugin_main.c @@ -58,8 +58,6 @@ int default_plugin_sync_proc ( int cmd, parameters* in, parameters* out ) ret = auth_get_key_file_paths ( in, out ); } else if ( cmd == PLUGIN_SYNC_CMD_GET_LOCK_STATE ) { ret = get_lock_state ( in, out ); - } else if ( cmd == PLUGIN_SYNC_CMD_GET_SHELL_ENV ) { - ret = get_shell_env ( in, out ); } else { ret = PLUGIN_CMD_NOT_SUPPORT; } diff --git a/src/plugin.c b/src/plugin.c index e8c70b9..ff9f19c 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -326,16 +326,11 @@ int request_conversion_to_plugin ( int cmd, const char* in_buf, char* out_buf, u int ret; parameters in, out; - if ( in_buf != NULL ) { - in.number_of_parameter = 1; - in.array_of_parameter = ( parameter* ) malloc ( sizeof ( parameter ) ); - in.array_of_parameter[0].type = type_string; - in.array_of_parameter[0].v_string.length = strlen ( in_buf ); - in.array_of_parameter[0].v_string.data = strdup ( in_buf ); - } else { - in.number_of_parameter = 0; - in.array_of_parameter = NULL; - } + in.number_of_parameter = 1; + in.array_of_parameter = ( parameter* ) malloc ( sizeof ( parameter ) ); + in.array_of_parameter[0].type = type_string; + in.array_of_parameter[0].v_string.length = strlen ( in_buf ); + in.array_of_parameter[0].v_string.data = strdup ( in_buf ); ret = request_sync_cmd ( cmd, &in, &out ); if ( ret == PLUGIN_CMD_SUCCESS ) { @@ -403,4 +398,3 @@ int request_appcmd_to_plugin ( const char* in_buf ) return fd; } - diff --git a/src/sdb.c b/src/sdb.c index 9a0d5cf..e282ced 100644 --- a/src/sdb.c +++ b/src/sdb.c @@ -1755,9 +1755,10 @@ static void init_capabilities(void) { // Target name of the launch possible - if(!request_capability_to_plugin(CAPABILITY_CAN_LAUNCH, g_capabilities.can_launch, + if(!request_plugin_cmd(SDBD_CMD_PLUGIN_CAP, SDBD_CAP_TYPE_CANLAUNCH, + g_capabilities.can_launch, sizeof(g_capabilities.can_launch))) { - D("failed to request. (%d:%d) \n", PLUGIN_SYNC_CMD_CAPABILITY, CAPABILITY_CAN_LAUNCH); + D("failed to request. (%s:%s) \n", SDBD_CMD_PLUGIN_CAP, SDBD_CAP_TYPE_CANLAUNCH); snprintf(g_capabilities.can_launch, sizeof(g_capabilities.can_launch), "%s", UNKNOWN); } diff --git a/src/sdbd_plugin.h b/src/sdbd_plugin.h index 2bfb450..5159928 100644 --- a/src/sdbd_plugin.h +++ b/src/sdbd_plugin.h @@ -33,7 +33,6 @@ #define PLUGIN_SYNC_CMD_AUTH_SUPPORT 1006 #define PLUGIN_SYNC_CMD_AUTH_GET_KEY_FILEPATHS 1007 #define PLUGIN_SYNC_CMD_GET_LOCK_STATE 1008 -#define PLUGIN_SYNC_CMD_GET_SHELL_ENV 1009 // asynchronous command #define PLUGIN_ASYNC_CMD_AUTH_CONFIRM_PUBLIC 2000 diff --git a/src/services.c b/src/services.c index 1c48905..5d40ce9 100644 --- a/src/services.c +++ b/src/services.c @@ -54,8 +54,6 @@ #include "sdbd_plugin.h" #include "plugin.h" -#define ENV_BUF_MAX 4096 - typedef struct stinfo stinfo; struct stinfo { @@ -649,14 +647,13 @@ static int create_subproc_thread(const char *name, int lines, int columns) /* get environment variables from plugin */ char *envp_plugin = NULL; - envp_plugin = malloc(ENV_BUF_MAX); + envp_plugin = malloc(SDBD_PLUGIN_OUTBUF_MAX); if (envp_plugin == NULL) { D("Cannot allocate the shell commnad buffer."); return -1; } - memset(envp_plugin, 0, ENV_BUF_MAX); - if (!request_conversion_to_plugin(PLUGIN_SYNC_CMD_GET_SHELL_ENV, NULL, - envp_plugin, ENV_BUF_MAX)) { + memset(envp_plugin, 0, SDBD_PLUGIN_OUTBUF_MAX); + if (!request_plugin_cmd(SDBD_CMD_SHELL_ENVVAR, "", envp_plugin, SDBD_PLUGIN_OUTBUF_MAX)) { D("Failed to convert the shell command. (%s)\n", name); free(envp_plugin); return -1; diff --git a/src/transport_local.c b/src/transport_local.c index a6adb0b..849fe05 100644 --- a/src/transport_local.c +++ b/src/transport_local.c @@ -38,7 +38,6 @@ #if !SDB_HOST #include "commandline_sdbd.h" #endif -#include "utils.h" #include "sdbd_plugin.h" #include "plugin.h" -- 2.7.4