cmhi
/
secgateway
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mod aaa-12 增加agingtime.c中的函数，修改顶层makefile中usermanager的位置 

RCA：
SOL：
修改人：zhouzian
检视人：zhouzian
This commit is contained in:
zhouzian 2019-07-04 16:25:06 +08:00
parent 8ab4e9178e
commit 9fb871100c
4 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Common/compile.h
View File

@ -2,10 +2,10 @@
/* Used readelf to get this information form driver of application */ /* Used readelf to get this information form driver of application */
/* "readelf --debug-dump=macro <filename>" */ /* "readelf --debug-dump=macro <filename>" */
#define sGATE_COMPILE_DATE "2019-07-04" #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_MAJOR "20190704"
#define sGATE_COMPILE_SUB "154650" #define sGATE_COMPILE_SUB "162406"
#define sGATE_COMPILE_BY "zza" #define sGATE_COMPILE_BY "zza"
#define sGATE_COMPILE_HOST "esgwdev01" #define sGATE_COMPILE_HOST "esgwdev01"
#define sGATE_GIT_TAGS "76e0ad830-dev" #define sGATE_GIT_TAGS "8ab4e9178-dev"
#define sGATE_GIT_VERS "76e0ad8308f233b00aa7c570d17cefe38cc84e3d" #define sGATE_GIT_VERS "8ab4e9178e1bfa02cef1e2de1991daf1c7593b86"

22
Makefile
View File

@ -28,9 +28,9 @@ MAKE_FLAGS += -j$(shell cat /proc/cpuinfo | grep processor | wc -l)
endif endif
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) ifeq ($(OPT), install)
#$(shell `find ../release -name "*.zip" -delete`) #$(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 $(MLOG)make all $(MAKE_FLAGS) -C Platform/build -f user.openrpc.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=openrpc
endif 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: configm:
ifeq ($(OPT), clean) ifeq ($(OPT), clean)
$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f user.configm.Makefile cleanall MLOG=$(MLOG) MAKE_TARGET=configm $(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 else
$(MLOG)make all $(MAKE_FLAGS) -C Platform/build -f user.redismq.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=redismq $(MLOG)make all $(MAKE_FLAGS) -C Platform/build -f user.redismq.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=redismq
endif 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

2
Platform/build/user.configm.Makefile
View File

@ -27,7 +27,7 @@ VPATH = ../user/configm/config-server
# set the source file, don't used .o because of ... # 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 # MRS Board Source Files
PLAT_LINUX_SRCS = $(COMMON_SRCS) PLAT_LINUX_SRCS = $(COMMON_SRCS)

15
Platform/user/configm/config-server/agingtime_config/agingtime.c
View File

@ -236,3 +236,18 @@ ret_code agingtime_config_proc(uint source, uint config_type,
return RET_OK; 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;
}