From 6ba69649febbd612f4e08fd786940ae782ee9c06 Mon Sep 17 00:00:00 2001
From: ChenLing <chenlinghy@cmhi.chinamobile.com>
Date: Mon, 8 Jul 2019 16:53:40 +0800
Subject: [PATCH] =?UTF-8?q?Mod=20=20aaa-12=20=E8=A7=A3=E5=86=B3=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=AE=A1=E7=90=86-=E9=A1=B5=E9=9D=A2=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=86=85=E5=AD=98=E6=B3=84=E6=BC=8F=20RCA=EF=BC=9A=20?=
 =?UTF-8?q?SOL=EF=BC=9A=20=E4=BF=AE=E6=94=B9=E4=BA=BA=EF=BC=9Achenling=20?=
 =?UTF-8?q?=E6=A3=80=E8=A7=86=E4=BA=BA=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Common/compile.h                                   | 14 +++++++-------
 Makefile                                           | 13 +++++++++++--
 Platform/build/user.authfree.Makefile              |  7 ++++---
 .../config-server/jumppage_config/jumppage.c       |  1 +
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/Common/compile.h b/Common/compile.h
index 3de092a71..8f26558ee 100755
--- a/Common/compile.h
+++ b/Common/compile.h
@@ -1,11 +1,11 @@
 /* This file is auto generated,for sGATE version info */
 /* Used readelf to get this information form driver of application */
 /* "readelf --debug-dump=macro <filename>" */
-#define sGATE_COMPILE_DATE "2019-07-04"
-#define sGATE_COMPILE_TIME "16:24:06"
-#define sGATE_COMPILE_MAJOR "20190704"
-#define sGATE_COMPILE_SUB "162406"
-#define sGATE_COMPILE_BY "zza"
+#define sGATE_COMPILE_DATE "2019-07-08"
+#define sGATE_COMPILE_TIME "16:43:21"
+#define sGATE_COMPILE_MAJOR "20190708"
+#define sGATE_COMPILE_SUB "164321"
+#define sGATE_COMPILE_BY "cl"
 #define sGATE_COMPILE_HOST "esgwdev01"
-#define sGATE_GIT_TAGS "8ab4e9178-dev"
-#define sGATE_GIT_VERS "8ab4e9178e1bfa02cef1e2de1991daf1c7593b86"
+#define sGATE_GIT_TAGS "422ab40d7-dev"
+#define sGATE_GIT_VERS "422ab40d72986d1bba93e7eba5379cd61f5d9c24"
diff --git a/Makefile b/Makefile
index 697212c6b..b174ccdeb 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 usermanager configm redismq 
+.PHONY : demo conntrack netlink trace openrpc usermanager configm redismq userlockdemo
 
-all: demo conntrack netlink trace openrpc usermanager configm redismq
+all: demo conntrack netlink trace openrpc usermanager configm redismq userlockdemo
 
 ifeq ($(OPT), install)
 #$(shell `find ../release -name "*.zip" -delete`)
@@ -156,3 +156,12 @@ 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
+
+userlockdemo:
+ifeq ($(OPT), clean)
+	$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f user.authfree.Makefile cleanall MLOG=$(MLOG) MAKE_TARGET=userlock
+else ifeq ($(OPT), install)
+	$(MLOG)make $(MAKE_FLAGS) -C Platform/build -f user.authfree.Makefile install DIR=$(DIR) MLOG=$(MLOG) MAKE_TARGET=userlock
+else
+	$(MLOG)make all $(MAKE_FLAGS) -C Platform/build -f user.authfree.Makefile MLOG=$(MLOG) DISABLE_WARRING=$(DIS_BUILD_WARRING) MAKE_TARGET=userlock
+endif
diff --git a/Platform/build/user.authfree.Makefile b/Platform/build/user.authfree.Makefile
index 882b8cd7d..f5ecf5d86 100755
--- a/Platform/build/user.authfree.Makefile
+++ b/Platform/build/user.authfree.Makefile
@@ -1,6 +1,6 @@
 
 # target name, the target name must have the same name of c source file
-TARGET_NAME=authfree
+TARGET_NAME=userlock
 
 # target 
 # for linux module driver: KO
@@ -22,13 +22,13 @@ DEBUG 			= TRUE
 PLAT_LINUX		?= TRUE
 PLAT_ARM64		?= FALSE
 
-VPATH = ../user/configm/config-server/authfree_config/
+VPATH = ../user/configm/config-server/userlock_config/
 
 # source code
 
 # set the source file, don't used .o because of ...
 
-COMMON_SRCS = authfree.c
+COMMON_SRCS = userlock.c
 
 # MRS Board Source Files
 PLAT_LINUX_SRCS = $(COMMON_SRCS)
@@ -36,6 +36,7 @@ PLAT_ARM64_SRCS = $(COMMON_SRCS)
 
 # gcc CFLAGS
 PLAT_ARM64_CFLAGS := -I../user/configm/config-server/include -I../../Common -I../common/configm -I../common/rpc -I../common/rpc/hashtable
+PLAT_ARM64_CFLAGS += -I../include/
 PLAT_LINUX_CFLAGS := $(PLAT_ARM64_CFLAGS)
 
 
diff --git a/Platform/user/configm/config-server/jumppage_config/jumppage.c b/Platform/user/configm/config-server/jumppage_config/jumppage.c
index fbfe26454..2efb91570 100644
--- a/Platform/user/configm/config-server/jumppage_config/jumppage.c
+++ b/Platform/user/configm/config-server/jumppage_config/jumppage.c
@@ -65,6 +65,7 @@ ret_code jumppage_config_proc(uint source, uint config_type,
     ret_char = cJSON_PrintUnformatted(res);
     memcpy(output, ret_char, sizeof(ret_char)+1);
 
+    cJSON_Delete(ret_char);
     cJSON_Delete(res);
     return RET_OK;