From 9562c7dcbde5c33838976acd3a5611c08f6700d4 Mon Sep 17 00:00:00 2001
From: ChenLing <chenlinghy@cmhi.chinamobile.com>
Date: Wed, 3 Jul 2019 11:00:09 +0800
Subject: [PATCH] =?UTF-8?q?ADD=20=20aaa-12=20=E5=A2=9E=E5=8A=A0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=AE=A1=E7=90=86-=E8=AE=A4=E8=AF=81=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E5=90=8E=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=85=8D=E7=BD=AE=20RCA=EF=BC=9A=20SOL?=
 =?UTF-8?q?=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

---
 Platform/build/user.configm.Makefile          |  2 +-
 .../configm/config-server/include/jumppage.h  | 22 +++++++++++
 .../config-server/jumppage_config/jumppage.c  | 38 +++++++++++++++++++
 .../config-server/userlock_config/userlock.c  |  2 +-
 4 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 Platform/user/configm/config-server/include/jumppage.h
 create mode 100644 Platform/user/configm/config-server/jumppage_config/jumppage.c

diff --git a/Platform/build/user.configm.Makefile b/Platform/build/user.configm.Makefile
index 6556c5bea..e7d8333bc 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
+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
 
 # MRS Board Source Files
 PLAT_LINUX_SRCS = $(COMMON_SRCS)
diff --git a/Platform/user/configm/config-server/include/jumppage.h b/Platform/user/configm/config-server/include/jumppage.h
new file mode 100644
index 000000000..d1f5e85e8
--- /dev/null
+++ b/Platform/user/configm/config-server/include/jumppage.h
@@ -0,0 +1,22 @@
+#ifndef JUMPPAGE_H_
+#define JUMPPAGE_H_
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <sys/ioctl.h>
+#include <net/if.h>
+#include "../../../../common/rpc/rpc_common.h"
+
+
+/*系统管理模块将数据内容(URL地址）发送给web server */
+ret_code jumppage_config_proc(uint source, uint config_type,
+                        pointer input, int input_len,
+                        pointer output, int *output_len);
+
+#endif
\ No newline at end of file
diff --git a/Platform/user/configm/config-server/jumppage_config/jumppage.c b/Platform/user/configm/config-server/jumppage_config/jumppage.c
new file mode 100644
index 000000000..d2c0459a1
--- /dev/null
+++ b/Platform/user/configm/config-server/jumppage_config/jumppage.c
@@ -0,0 +1,38 @@
+#include "../../../../common/rpc/rpc.h"
+#include "../include/parsefile.h"
+#include "../include/configm.h"
+#include "../../../netlink_uapi/libnetlinku.h"
+#include "../include/jumppage.h"
+#include <cjson/cJSON.h>
+#include "../../../../../Common/s2j/s2j.h"
+#include "../../../../../Common/commuapinl.h"
+
+/*全局变量,存放用户跳转的页面 */
+char *jumpurl;
+
+/*初始化 */
+char *jumpurl = NULL; 
+
+/*系统管理模块将数据内容(URL地址）发送给web server */
+ret_code jumppage_config_proc(uint source, uint config_type,
+                        pointer input, int input_len,
+                        pointer output, int *output_len)
+{
+    ret_code ret = RET_OK;
+    char *struct_jumppage; 
+    struct_jumppage = (char *)input;
+  
+    rpc_log_info("jumppage configure:  url: %s\n",
+                 struct_jumppage);
+
+
+    /*将配置信息发送到web server */
+
+
+    /*把本地Portal server的配置信息存入全局变量 */
+    jumpurl = struct_jumppage;
+
+    return RET_OK;
+}
+
+
diff --git a/Platform/user/configm/config-server/userlock_config/userlock.c b/Platform/user/configm/config-server/userlock_config/userlock.c
index 448f20005..07a8c8556 100644
--- a/Platform/user/configm/config-server/userlock_config/userlock.c
+++ b/Platform/user/configm/config-server/userlock_config/userlock.c
@@ -75,7 +75,7 @@ ret_code userlock_config_proc(uint source, uint config_type,
     userlock_configure_t *struct_userlock; 
     struct_userlock = (userlock_configure_t *)input;
   
-    rpc_log_info("userlock configure: 登录时间: %d  用户认证失败次数: %d 用户认证的时间范围: %d 用户锁定时间: %d\n",
+    rpc_log_info("userlock configure: 登录时间: %d  用户认证失败次数: %d 用户认证的时间范围: %d 用户锁定时间: %ld\n",
                 struct_userlock->logintime, struct_userlock->failcount,
                 struct_userlock->timehorizon, struct_userlock->locktime);