diff --git a/Common/compile.h b/Common/compile.h index 7ad1425a3..3de092a71 100755 --- a/Common/compile.h +++ b/Common/compile.h @@ -2,10 +2,10 @@ /* Used readelf to get this information form driver of application */ /* "readelf --debug-dump=macro " */ #define sGATE_COMPILE_DATE "2019-07-04" -#define sGATE_COMPILE_TIME "15:46:50" +#define sGATE_COMPILE_TIME "16:24:06" #define sGATE_COMPILE_MAJOR "20190704" -#define sGATE_COMPILE_SUB "154650" +#define sGATE_COMPILE_SUB "162406" #define sGATE_COMPILE_BY "zza" #define sGATE_COMPILE_HOST "esgwdev01" -#define sGATE_GIT_TAGS "76e0ad830-dev" -#define sGATE_GIT_VERS "76e0ad8308f233b00aa7c570d17cefe38cc84e3d" +#define sGATE_GIT_TAGS "8ab4e9178-dev" +#define sGATE_GIT_VERS "8ab4e9178e1bfa02cef1e2de1991daf1c7593b86" diff --git a/Makefile b/Makefile index 7d35eac2e..a70567279 100755 --- a/Makefile +++ b/Makefile @@ -28,9 +28,9 @@ MAKE_FLAGS += -j$(shell cat /proc/cpuinfo | grep processor | wc -l) endif endif -.PHONY : demo conntrack netlink trace openrpc configm redismq usermanager +.PHONY : demo conntrack netlink trace openrpc usermanager configm redismq -all: demo conntrack netlink trace openrpc configm redismq usermanager +all: demo conntrack netlink trace openrpc usermanager configm redismq ifeq ($(OPT), install) #$(shell `find ../release -name "*.zip" -delete`) @@ -123,6 +123,15 @@ else $(MLOG)make all $(MAKE_FLAGS) -C Platform/build -f user.openrpc.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=openrpc endif +usermanager: +ifeq ($(OPT), clean) + $(MLOG)make $(MAKE_FLAGS) -C Product/build -f user.usermanager.Makefile cleanall MLOG=$(MLOG) MAKE_TARGET=usermanager +else ifeq ($(OPT), install) + $(MLOG)make $(MAKE_FLAGS) -C Product/build -f user.usermanager.Makefile install DIR=$(DIR) MLOG=$(MLOG) MAKE_TARGET=usermanager +else + $(MLOG)make all $(MAKE_FLAGS) -C Product/build -f user.usermanager.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=usermanager +endif + configm: ifeq ($(OPT), clean) $(MLOG)make $(MAKE_FLAGS) -C Platform/build -f user.configm.Makefile cleanall MLOG=$(MLOG) MAKE_TARGET=configm @@ -147,12 +156,3 @@ else ifeq ($(OPT), install) else $(MLOG)make all $(MAKE_FLAGS) -C Platform/build -f user.redismq.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=redismq endif - -usermanager: -ifeq ($(OPT), clean) - $(MLOG)make $(MAKE_FLAGS) -C Product/build -f user.usermanager.Makefile cleanall MLOG=$(MLOG) MAKE_TARGET=usermanager -else ifeq ($(OPT), install) - $(MLOG)make $(MAKE_FLAGS) -C Product/build -f user.usermanager.Makefile install DIR=$(DIR) MLOG=$(MLOG) MAKE_TARGET=usermanager -else - $(MLOG)make all $(MAKE_FLAGS) -C Product/build -f user.usermanager.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=usermanager -endif \ No newline at end of file diff --git a/Platform/build/user.configm.Makefile b/Platform/build/user.configm.Makefile index 25804cce2..944ec901d 100755 --- a/Platform/build/user.configm.Makefile +++ b/Platform/build/user.configm.Makefile @@ -27,7 +27,7 @@ VPATH = ../user/configm/config-server # set the source file, don't used .o because of ... -COMMON_SRCS = configserver.c ipconfig/ipconfig.c ipconfig/parsefile.c authfree_config/authfree.c localportal_config/localportal.c userlock_config/userlock.c jumppage_config/jumppage.c user_manager_config/user_group_config.c +COMMON_SRCS = configserver.c ipconfig/ipconfig.c ipconfig/parsefile.c authfree_config/authfree.c localportal_config/localportal.c userlock_config/userlock.c jumppage_config/jumppage.c user_manager_config/user_group_config.c agingtime_config/agingtime.c # MRS Board Source Files PLAT_LINUX_SRCS = $(COMMON_SRCS) diff --git a/Platform/user/configm/config-server/agingtime_config/agingtime.c b/Platform/user/configm/config-server/agingtime_config/agingtime.c index b241f1adc..26656ca45 100644 --- a/Platform/user/configm/config-server/agingtime_config/agingtime.c +++ b/Platform/user/configm/config-server/agingtime_config/agingtime.c @@ -236,3 +236,18 @@ ret_code agingtime_config_proc(uint source, uint config_type, return RET_OK; } +ret_code agingtime_config_get(uint source, + pointer input, int input_len, + pointer output, int *output_len) +{ + ret_code ret = RET_OK; + return ret; +} + +ret_code agingtime_config_get_all(uint source, uint64 config_id, + pointer output, short *single_len, + int *cnt) +{ + ret_code ret = RET_OK; + return ret; +} \ No newline at end of file