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

Merge branch 'master' of git.komect.net:ISG/secogateway

This commit is contained in:
黄昕 2019-09-03 17:36:45 +08:00
parent 65b3b53762 78ca3cdc35
commit 1e86c3a9f8
8 changed files with 252 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Common/ret_errno.h
View File

@ -31,19 +31,38 @@ typedef uint ret_code;
/* NETCONFIG_MODULE 0x00010000 ~ 0x0001ffff*/
#define RET_IPINVALID (uint)((uint)NETCONFIG_MODULE<<16|1)
#define RET_BRNAMEERR (uint)((uint)NETCONFIG_MODULE<<16|1)
#define RET_BRNAMEERR (uint)((uint)NETCONFIG_MODULE<<16|2)
/* VLANCONFIG_MODULE 0x00050000 ~ 0x0005ffff*/
#define RET_VIDNUM_INVALID (uint)((uint)VLAN_CONFIG_MODULE<<16|1)
#define RET_VID_INVALID (uint)((uint)VLAN_CONFIG_MODULE<<16|1)
#define RET_VID_EXIST (uint)((uint)VLAN_CONFIG_MODULE<<16|1)
#define RET_VID_NOT_EXIST (uint)((uint)VLAN_CONFIG_MODULE<<16|1)
#define RET_INTERFACE_NOT_EXIST (uint)((uint)VLAN_CONFIG_MODULE<<16|1)
#define RET_ATTR_INVALID (uint)((uint)VLAN_CONFIG_MODULE<<16|1)
#define RET_OPTYPE_ERR (uint)((uint)VLAN_CONFIG_MODULE<<16|1)
#define RET_SYS_VCONFIG_ERR (uint)((uint)VLAN_CONFIG_MODULE<<16|1)
#define RET_SYS_IFCONFIG_ERR (uint)((uint)VLAN_CONFIG_MODULE<<16|1)
#define RET_SYS_FILEOP_ERR (uint)((uint)VLAN_CONFIG_MODULE<<16|1)
#define RET_VID_INVALID (uint)((uint)VLAN_CONFIG_MODULE<<16|2)
#define RET_VID_EXIST (uint)((uint)VLAN_CONFIG_MODULE<<16|3)
#define RET_VID_NOT_EXIST (uint)((uint)VLAN_CONFIG_MODULE<<16|4)
#define RET_INTERFACE_NOT_EXIST (uint)((uint)VLAN_CONFIG_MODULE<<16|5)
#define RET_ATTR_INVALID (uint)((uint)VLAN_CONFIG_MODULE<<16|6)
#define RET_OPTYPE_ERR (uint)((uint)VLAN_CONFIG_MODULE<<16|7)
#define RET_SYS_VCONFIG_ERR (uint)((uint)VLAN_CONFIG_MODULE<<16|8)
#define RET_SYS_IFCONFIG_ERR (uint)((uint)VLAN_CONFIG_MODULE<<16|9)
#define RET_SYS_FILEOP_ERR (uint)((uint)VLAN_CONFIG_MODULE<<16|10)
/* STATIC_ROUTING_MODULE 0x00090000 ~ 0x0009ffff*/
#define RET_OPEN_FILE_ERR (uint)((uint)STATIC_ROUTING_CONFIG_MODULE<<16|1)
#define RET_EXEC_ERR (uint)((uint)STATIC_ROUTING_CONFIG_MODULE<<16|2)
#define RET_METRIC_ERR (uint)((uint)STATIC_ROUTING_CONFIG_MODULE<<16|3)
#define RET_NETMASK_ERR (uint)((uint)STATIC_ROUTING_CONFIG_MODULE<<16|4)
#define RET_EMPTY_STRING (uint)((uint)STATIC_ROUTING_CONFIG_MODULE<<16|5)
#define RET_WRONG_TYPE (uint)((uint)STATIC_ROUTING_CONFIG_MODULE<<16|6)
#define RET_VERSION_ERR (uint)((uint)STATIC_ROUTING_CONFIG_MODULE<<16|7)
#define RET_DESTIP_ERR (uint)((uint)STATIC_ROUTING_CONFIG_MODULE<<16|8)
#define RET_GATEWAY_ERR (uint)((uint)STATIC_ROUTING_CONFIG_MODULE<<16|9)
#define RET_GW_DEV_ERR (uint)((uint)STATIC_ROUTING_CONFIG_MODULE<<16|10)
@ -81,7 +100,18 @@ typedef uint ret_code;
{ RET_OPTYPE_ERR, "OperationTypeError"},\
{ RET_SYS_VCONFIG_ERR, "SystemVconfigError"},\
{ RET_SYS_IFCONFIG_ERR, "SystemIfconfigError"},\
{ RET_SYS_FILEOP_ERR, "SystemFileOperationError"}\
{ RET_SYS_FILEOP_ERR, "SystemFileOperationError"},\
\
{ RET_OPEN_FILE_ERR, "CanNotOpenConfigFile"},\
{ RET_EXEC_ERR, "CanNotExecuateShell"},\
{ RET_METRIC_ERR, "InvalidMetric"},\
{ RET_NETMASK_ERR, "InvalidNetmask"},\
{ RET_EMPTY_STRING, "InputEmpty"},\
{ RET_WRONG_TYPE, "WrongType"},\
{ RET_VERSION_ERR, "InvalidProtocol"},\
{ RET_DESTIP_ERR, "InvalidDestIP"},\
{ RET_GATEWAY_ERR, "InvalidGateway"},\
{ RET_GW_DEV_ERR, "Gateway&DevEmpty"}\
}
struct err_disc {

95
Platform/user/configm/config-server/static_routing_config/static_routing_config.c
View File

@ -38,7 +38,7 @@ ret_code routing_to_json(int count, routing_t *buff_total, pointer output, int *
if(ret_root == NULL)
{
cJSON_Delete(ret_root);
return RET_NOMEM;
return RET_EMPTY_STRING;
}
cJSON_AddNumberToObject(ret_root,"total number",count);
@ -48,7 +48,7 @@ ret_code routing_to_json(int count, routing_t *buff_total, pointer output, int *
if(json_array == NULL)
{
cJSON_Delete(json_array);
return RET_NOMEM;
return RET_EMPTY_STRING;
}
if(count > 0)
{
@ -104,7 +104,7 @@ ret_code routing_json_parse(pointer input, uint *conf_type, routing_t *conf_buff
{
rpc_log_info("json obj is NULL \n");
cJSON_Delete(json_obj);
return RET_INPUTERR;
return RET_EMPTY_STRING;
}
rpc_log_info("json input:\n %s \n", cJSON_Print(json_obj));
@ -114,7 +114,7 @@ ret_code routing_json_parse(pointer input, uint *conf_type, routing_t *conf_buff
if(NULL == operate)
{
cJSON_Delete(json_obj);
return RET_INPUTERR;
return RET_EMPTY_STRING;
}
/*根据operate的值给conf_type赋值*/
@ -133,7 +133,7 @@ ret_code routing_json_parse(pointer input, uint *conf_type, routing_t *conf_buff
}
else
{
return RET_INPUTERR;
return RET_WRONG_TYPE;
}
route = cJSON_GetObjectItem(json_obj,"route");
@ -141,13 +141,13 @@ ret_code routing_json_parse(pointer input, uint *conf_type, routing_t *conf_buff
if(NULL == route)
{
cJSON_Delete(json_obj);
return RET_INPUTERR;
return RET_EMPTY_STRING;
}
version = cJSON_GetObjectItem(route,"version");
if(!version)
{
return RET_INPUTERR;
return RET_VERSION_ERR;
}
else
{
@ -159,7 +159,7 @@ ret_code routing_json_parse(pointer input, uint *conf_type, routing_t *conf_buff
destip = cJSON_GetObjectItem(route,"destip");
if(!destip)
{
return RET_INPUTERR;
return RET_DESTIP_ERR;
}
else
{
@ -168,9 +168,9 @@ ret_code routing_json_parse(pointer input, uint *conf_type, routing_t *conf_buff
rpc_log_info("destip:%s \n", conf_buff->destip);
netmask = cJSON_GetObjectItem(route,"netmask");
if(!netmask)
if((!netmask) || (netmask->valueint < 0) || (netmask->valueint > 128))
{
return RET_INPUTERR;
return RET_NETMASK_ERR;
}
else
{
@ -205,7 +205,7 @@ ret_code routing_json_parse(pointer input, uint *conf_type, routing_t *conf_buff
if((!metric) || (metric->valueint) < 0 || (metric->valueint)
> 10000)
{
return RET_INPUTERR;
return RET_METRIC_ERR;
}
else
{
@ -235,7 +235,7 @@ ret_code insert_into_file(char *string)
if(NULL == f)
{
rpc_log_error("open config file fail\n");
return RET_SYSERR;
return RET_OPEN_FILE_ERR;
}
fseek(f,0,SEEK_SET);
@ -279,7 +279,7 @@ ret_code delete_from_file(char *string)
if(NULL == f)
{
rpc_log_error("open config file fail\n");
return RET_SYSERR;
return RET_OPEN_FILE_ERR;
}
fseek(f,0,SEEK_END);
@ -338,14 +338,14 @@ ret_code add_routing_exe (char *string)
if(NULL == string)
{
return RET_INPUTERR;
return RET_EMPTY_STRING;
}
status = system(string);
if (-1 == status)
{
rpc_log_error("system shell error!\n");
return RET_SYSERR;
return RET_EXEC_ERR;
}
else {
if (WIFEXITED(status)){
@ -355,12 +355,12 @@ ret_code add_routing_exe (char *string)
}
else{
rpc_log_error("run shell script fail,script exit code:%d\n",WEXITSTATUS(status));
return RET_SYSERR;
return RET_EXEC_ERR;
}
}
else {
rpc_log_error("exit status = [%d]\n",WEXITSTATUS(status));
return RET_SYSERR;
return RET_EXEC_ERR;
}
}
@ -375,14 +375,14 @@ ret_code del_routing_exe (char *string, char *string_del)
if(NULL == string || NULL == string_del)
{
return RET_INPUTERR;
return RET_EMPTY_STRING;
}
status = system(string);
if (-1 == status)
{
rpc_log_error("system shell error!\n");
return RET_SYSERR;
return RET_EXEC_ERR;
}
else {
if (WIFEXITED(status)){
@ -404,13 +404,13 @@ ret_code del_routing_exe (char *string, char *string_del)
}
else
{
return RET_SYSERR;
return RET_EXEC_ERR;
}
}
}
else {
rpc_log_error("exit status = [%d]\n",WEXITSTATUS(status));
return RET_SYSERR;
return RET_EXEC_ERR;
}
}
@ -478,7 +478,7 @@ ret_code default_routing_proc(routing_t *conf_buff, uint config_type){
if (conf_buff == NULL)
{
return RET_NULLP;
return RET_EMPTY_STRING;
}
judge_para(&flag,gw_t,dev_t);
@ -536,7 +536,7 @@ ret_code default_routing_proc(routing_t *conf_buff, uint config_type){
else
{
return RET_ERR;
return RET_VERSION_ERR;
}
}
@ -591,11 +591,16 @@ ret_code default_routing_proc(routing_t *conf_buff, uint config_type){
return RET_ERR;
}
}
else
{
return RET_VERSION_ERR;
}
}
else
{
return RET_ERR;
return RET_WRONG_TYPE;
}
return ret;
@ -620,7 +625,7 @@ ret_code routing_add(routing_t *conf_buff)
if (metric_t < 1)
{
return RET_INPUTERR;
return RET_METRIC_ERR;
}
judge_para(&flag,gw_t,dev_t);
@ -641,7 +646,8 @@ ret_code routing_add(routing_t *conf_buff)
}
else
{
return RET_INPUTERR;
rpc_log_info("netmask error \n");
return RET_NETMASK_ERR;
}
switch (flag){
@ -664,10 +670,6 @@ ret_code routing_add(routing_t *conf_buff)
else if (version_t == IPV6_VERSION)
{
if(netmask_t < 0 || netmask_t >128)
{
return RET_INPUTERR;
}
switch(flag){
case 1:
sprintf(string,"route -A inet6 add %s/%d gw %s dev %s metric %d\n",destip_t,netmask_t,gw_t,dev_t,metric_t);
@ -686,6 +688,7 @@ ret_code routing_add(routing_t *conf_buff)
}
}
return ret;
}
@ -721,7 +724,7 @@ ret_code routing_del(routing_t *conf_buff)
}
else
{
return RET_INPUTERR;
return RET_NETMASK_ERR;
}
switch (flag){
@ -797,14 +800,14 @@ ret_code get_all_from_file (pointer output, int *output_len)
if(NULL == f)
{
rpc_log_error("open config file fail\n");
return RET_SYSERR;
return RET_OPEN_FILE_ERR;
}
buff_total = rpc_new0(routing_t, ROUTING_TABLE_MAX_NUMBER);
//buff_total = (routing_t *)malloc(ROUTING_TABLE_MAX_NUMBER*sizeof(routing_t));
if(buff_total == NULL)
{
return RET_NOMEM;
return RET_EMPTY_STRING;
}
memset(buff,0,sizeof(buff));
@ -952,7 +955,7 @@ ret_code config_recovery()
if(NULL == f)
{
rpc_log_error("open config file fail\n");
return RET_SYSERR;
return RET_OPEN_FILE_ERR;
}
memset(buff,0,sizeof(buff));
@ -1046,13 +1049,13 @@ ret_code routing_config_chk(uint source, uint *config_type,
/*判断协议是否正确*/
if((conf_buff->version != IPV4_VERSION) && (conf_buff->version != IPV6_VERSION))
{
return RET_CHKERR;
return RET_VERSION_ERR;
}
else if(strcmp(conf_buff->gateway,"") == 0 && strcmp(conf_buff->dev,"") == 0)
{
rpc_log_info(" gateway and dev are NULL\n");
return RET_CHKERR;
return RET_GW_DEV_ERR;
}
else if(conf_buff->version == IPV4_VERSION)
@ -1063,7 +1066,7 @@ ret_code routing_config_chk(uint source, uint *config_type,
if(a<0 || a>255 || b<0 || b>255 || c<0 || c>255 || d<0 |d>255)
{
rpc_log_info("ip address wrong:%d %d %d %d\n",a,b,c,d);
return RET_CHKERR;
return RET_DESTIP_ERR;
}
if(strcmp(conf_buff->gateway,"") != 0)
@ -1072,7 +1075,7 @@ ret_code routing_config_chk(uint source, uint *config_type,
if(a1<0 || a1>255 || b1<0 || b1>255 || c1<0 || c1>255 || d1<0 |d1>255)
{
rpc_log_info("gateway address wrong:%d %d %d %d\n",a1,b1,c1,d1);
return RET_CHKERR;
return RET_GATEWAY_ERR;
}
}
}
@ -1084,13 +1087,13 @@ ret_code routing_config_chk(uint source, uint *config_type,
if ((*output_len)<(ROUTING_TABLE_MAX_NUMBER * sizeof(routing_t)))
{
rpc_log_info("getall check error\n");
return RET_CHKERR;
return RET_NOMEM;
}
}
else
{
return RET_CHKERR;
return RET_WRONG_TYPE;
}
@ -1150,7 +1153,7 @@ ret_code routing_config_proc(uint source, uint config_type,
}
else
{
return RET_INPUTERR;
return RET_NETMASK_ERR;
}
}
@ -1166,7 +1169,7 @@ ret_code routing_config_proc(uint source, uint config_type,
break;
default:
ret = RET_NOTSUPPORT;
ret = RET_WRONG_TYPE;
}
return ret;
@ -1224,12 +1227,12 @@ ret_code all_routing_config_chk(uint source, uint * config_type,
if ((*output_len)<(ROUTING_TABLE_MAX_NUMBER * sizeof(routing_t)))
{
rpc_log_info("getall check error\n");
return RET_CHKERR;
return RET_NOMEM;
}
}
else
{
return RET_INPUTERR;
return RET_WRONG_TYPE;
}
return ret;
@ -1265,7 +1268,7 @@ ret_code all_routing_get_all(uint source,
if (NULL == f)
{
rpc_log_error("get ipv4 routing info fail\n");
return RET_SYSERR;
return RET_OPEN_FILE_ERR;
}
conf_buff = rpc_new0(routing_t,ROUTING_TABLE_MAX_NUMBER);
@ -1325,7 +1328,7 @@ next_while:
if (NULL == f)
{
rpc_log_error("get ipv6 routing info fail\n");
return RET_SYSERR;
return RET_OPEN_FILE_ERR;
}
fseek(f,0,SEEK_SET);

6
Platform/user/configm/config-server/user_manager_config/usermanager-server/user.c
View File

@ -427,14 +427,14 @@ bool mod_user_web(USERLIST* ulist)
/* 密码发生改变，下线用户 */
if (0 == ulist->resetpwd)
{
offline_force_one_user(user_id);
//offline_force_one_user(user_id);
return true;
}
/* 公用账号改为单用户登陆，下线用户 */
if (1 == ulist->multi && 0 == temp_user->multi)
{
offline_force_one_user(user_id);
//offline_force_one_user(user_id);
return true;
}
@ -444,7 +444,7 @@ bool mod_user_web(USERLIST* ulist)
cur_time = time(NULL);
if (cur_time < g_user_table[user_id].valid_begin_time || cur_time > g_user_table[user_id].valid_end_time)
{
offline_force_one_user(user_id);
//offline_force_one_user(user_id);
return true;
}
}

4
Platform/user/configm/config-server/web_config/auth_parameters.c
View File

@ -329,7 +329,7 @@ ret_code authpara_config_proc(uint source, uint config_type,
ret_int = strlen(ret_char);
if(output_len) {
*output_len = ret_int;
*output_len = ret_int + 1;
}
/*超出2k的内存，报错 */
@ -340,7 +340,7 @@ ret_code authpara_config_proc(uint source, uint config_type,
return RET_NOMEM;
}
memcpy(output, ret_char, ret_int + 1);
memcpy(output, ret_char, ret_int);
free(ret_char);
cJSON_Delete(res);

2
Platform/user/database/database.c
View File

@ -92,7 +92,7 @@ void * connect_database (int module_id)
SQLSetConnectAttr( hdbc, SQL_ATTR_ODBC_CURSORS, (SQLPOINTER)SQL_CUR_USE_ODBC, 0 );
ret = SQLConnect( hdbc, "meng", SQL_NTS, "", SQL_NTS, "", SQL_NTS );
ret = SQLConnect( hdbc, "mysql", SQL_NTS, "", SQL_NTS, "", SQL_NTS );
if (ret != SQL_SUCCESS)
{
return NULL;

8
Platform/user/ulog/log-sched/log_file.c
View File

@ -9,7 +9,7 @@
#define LOG_CONF_FILE_NAME "log-file.conf"
#define LOG_LOGRATATE_FILE_NAME "/etc/logrotate.d/log-syslog"
#define LOG_LOGROTATE_FILE_NAME "/etc/logrotate.d/log-syslog"
#define DEFAULT_LOG_FILE "/var/log/syslog-test"
#define DEFAULT_LOG_DEL_OVER_DAYS (30 * 6)
@ -50,7 +50,7 @@ static level_str_t g_level_array[] = {
#define MAX_LOG_LEVEL_VALUE (sizeof(g_level_array) / sizeof(level_str_t))
static int write_logratate_conf(const log_file_t *conf, const char *log_path)
static int write_logrotate_conf(const log_file_t *conf, const char *log_path)
{
int ret = -1;
FILE *fp = NULL;
@ -72,7 +72,7 @@ static int write_logratate_conf(const log_file_t *conf, const char *log_path)
}
fp = fopen(LOG_LOGRATATE_FILE_NAME, "w");
fp = fopen(LOG_LOGROTATE_FILE_NAME, "w");
if (fp == NULL) {
ULOG_ERR(g_log, "Opening logratate file:%s is failure:%s", LOG_CONF_FILE_NAME, strerror(errno));
goto END;
@ -117,7 +117,7 @@ static int conf_log_file(const log_file_t *conf)
}
/********** logrotate **********/
if (write_logratate_conf(conf, path) != 0) {
if (write_logrotate_conf(conf, path) != 0) {
ULOG_ERR(g_log, "Logratate configure which is written is failure");
return -1;
}

152
libs/src/lighttpd-1.4.51/src/mod_webm.c Normal file → Executable file
View File

@ -24,13 +24,14 @@ typedef enum { WEBM_HANDLE_INVALID_INDEX = -1,
WEBM_HANDLE_LOGIN,
WEBM_HANDLE_HOMEPAGE,
/* 以下是页面取数展示的case，后续提升性能可能通过数据库查询，所以先放到一起 */
/* <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҳ<EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD>չʾ<EFBFBD><EFBFBD>case<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܿ<EFBFBD><EFBFBD><EFBFBD>ͨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><EFBFBD>ѯ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȷŵ<EFBFBD>һ<EFBFBD><EFBFBD> */
WEBM_HANDLE_CONFIG_LIST_GROUP,
/* 以下是配置操作相关的case */
/* <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ò<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ص<EFBFBD>case */
WEBM_HANDLE_CONFIG_ADD_GROUP,
WEBM_HANDLE_CONFIG_UUID_GROUP,
WEBM_HANDLE_CONFIG_MOD_GROUP,
WEBM_HANDLE_CONFIG_DEL_GROUP,
WEBM_HANDLE_CONFIG_ADD_USER,
WEBM_HANDLE_CONFIG_MODWEB_USER,
@ -38,15 +39,31 @@ typedef enum { WEBM_HANDLE_INVALID_INDEX = -1,
WEBM_HANDLE_CONFIG_LIST_USER,
WEBM_HANDLE_CONFIG_UUID_USER,
WEBM_HANDLE_CONFIG_DETAIL_USER,
WEBM_HANDLE_CONFIG_DEL_USER,
WEBM_HANDLE_CONFIG_IPV4,
WEBM_HANDLE_CONFIG_VLAN_SET,
WEBM_HANDLE_CONFIG_VLAN_GET,
WEBM_HANDLE_MAX,
WEBM_HANDLE_CONFIG_HOST_SET,
WEBM_HANDLE_CONFIG_HOST_GET,
WEBM_HANDLE_CONFIG_SUBNET_SET,
WEBM_HANDLE_CONFIG_SUBNET_GET,
WEBM_HANDLE_CONFIG_RELAY_SET,
WEBM_HANDLE_CONFIG_DHCPD_LEASE_GET,
WEBM_HANDLE_CONFIG_SHARED_NETWORK_SET,
WEBM_HANDLE_CONFIG_SHARED_NETWORK_GET,
WEBM_HANDLE_CONFIG_CLIENT_SET,
WEBM_HANDLE_CONFIG_CLIENT_GET,
WEBM_HANDLE_CONFIG_MOD_AUTHPARA,
WEBM_HANDLE_CONFIG_ADD_AUTHRULE,
WEBM_HANDLE_CONFIG_MOV_AUTHRULE,
WEBM_HANDLE_CONFIG_DEL_AUTHRULE,
WEBM_HANDLE_CONFIG_MOD_AUTHRULE,
WEBM_HANDLE_CONFIG_DEL_AUTHRULE
WEBM_HANDLE_CONFIG_GET_AUTHRULE,
WEBM_HANDLE_MAX
} webm_handle_index;
typedef struct _webm_config_st
@ -129,7 +146,15 @@ extern int webm_config_send_proc(server *srv, uint32_t config_type, uint64 confg
USER_MANAGER_CONFIG_GROUP, \
webm_config_send_proc \
},\
{\
\
{\
WEBM_HANDLE_CONFIG_DEL_GROUP, \
"/FSG-CF/um-group-delete", \
CM_CONFIG_SET, \
USER_MANAGER_CONFIG_GROUP, \
webm_config_send_proc \
},\
{\
WEBM_HANDLE_CONFIG_ADD_USER, \
"/FSG-CF/um-user-add", \
CM_CONFIG_SET, \
@ -171,6 +196,13 @@ extern int webm_config_send_proc(server *srv, uint32_t config_type, uint64 confg
USER_MANAGER_CONFIG_USER, \
webm_config_send_proc \
},\
{\
WEBM_HANDLE_CONFIG_DEL_USER, \
"/FSG-CF/um-user-delete", \
CM_CONFIG_SET, \
USER_MANAGER_CONFIG_USER, \
webm_config_send_proc \
},\
{\
WEBM_HANDLE_CONFIG_IPV4, \
"/ISG-CF/ipv4", \
@ -192,6 +224,76 @@ extern int webm_config_send_proc(server *srv, uint32_t config_type, uint64 confg
VLAN_CONFIG, \
webm_config_send_proc \
}, \
{\
WEBM_HANDLE_CONFIG_HOST_SET, \
"/FSG-CF/host-set", \
CM_CONFIG_SET, \
DHCP_HOST_CONFIG, \
webm_config_send_proc \
}, \
{\
WEBM_HANDLE_CONFIG_HOST_GET, \
"/FSG-GF/host-get", \
CM_CONFIG_GET, \
DHCP_HOST_CONFIG, \
webm_config_send_proc \
}, \
{\
WEBM_HANDLE_CONFIG_SUBNET_SET, \
"/FSG-CF/subnet-set", \
CM_CONFIG_SET, \
DHCP_SUBNET_CONFIG, \
webm_config_send_proc \
}, \
{\
WEBM_HANDLE_CONFIG_SUBNET_GET, \
"/FSG-GF/subnet-get", \
CM_CONFIG_GET, \
DHCP_SUBNET_CONFIG, \
webm_config_send_proc \
}, \
{\
WEBM_HANDLE_CONFIG_RELAY_SET, \
"/FSG-CF/relay-set", \
CM_CONFIG_SET, \
DHCP_RELAY_CONFIG, \
webm_config_send_proc \
}, \
{\
WEBM_HANDLE_CONFIG_CLIENT_SET, \
"/FSG-CF/client-set", \
CM_CONFIG_SET, \
DHCP_CLIENT_CONFIG, \
webm_config_send_proc \
}, \
{\
WEBM_HANDLE_CONFIG_CLIENT_GET, \
"/FSG-GF/client-get", \
CM_CONFIG_GET, \
DHCP_CLIENT_CONFIG, \
webm_config_send_proc \
}, \
{\
WEBM_HANDLE_CONFIG_DHCPD_LEASE_GET, \
"/FSG-GF/dhcpd-lease-get", \
CM_CONFIG_GET_ALL, \
DHCP_DHCPD_LEASE, \
webm_config_send_proc \
}, \
{\
WEBM_HANDLE_CONFIG_SHARED_NETWORK_SET, \
"/FSG-CF/shared-network-set", \
CM_CONFIG_SET, \
DHCP_SHARED_NETWORK_CONFIG, \
webm_config_send_proc \
}, \
{\
WEBM_HANDLE_CONFIG_SHARED_NETWORK_GET, \
"/FSG-GF/shared-network-get", \
CM_CONFIG_GET_ALL, \
DHCP_SHARED_NETWORK_CONFIG, \
webm_config_send_proc \
}, \
{\
WEBM_HANDLE_CONFIG_MOD_AUTHPARA, \
"/FSG-CF/userauth-parameters-mod", \
@ -209,8 +311,8 @@ extern int webm_config_send_proc(server *srv, uint32_t config_type, uint64 confg
}, \
\
{\
WEBM_HANDLE_CONFIG_MOD_AUTHRULE, \
"/FSG-GF/userauth-rule-mod", \
WEBM_HANDLE_CONFIG_MOV_AUTHRULE, \
"/FSG-GF/userauth-rule-mov", \
CM_CONFIG_SET, \
AUTHFREE_CONFIG, \
webm_config_send_proc \
@ -222,6 +324,22 @@ extern int webm_config_send_proc(server *srv, uint32_t config_type, uint64 confg
CM_CONFIG_SET, \
AUTHFREE_CONFIG, \
webm_config_send_proc \
}, \
\
{\
WEBM_HANDLE_CONFIG_MOD_AUTHRULE, \
"/FSG-GF/userauth-rule-mod", \
CM_CONFIG_SET, \
AUTHFREE_CONFIG, \
webm_config_send_proc \
}, \
\
{\
WEBM_HANDLE_CONFIG_GET_AUTHRULE, \
"/FSG-GF/userauth-rule-get", \
CM_CONFIG_SET, \
AUTHFREE_CONFIG, \
webm_config_send_proc \
} \
\
}
@ -314,7 +432,7 @@ int webm_config_send_proc(server *srv, uint32_t config_type, uint64 confg_id, ch
mess_str = "";
}
if (NULL == cJSON_AddStringToObject(root,"message","系统错误"))
if (NULL == cJSON_AddStringToObject(root,"message","ϵͳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"))
{
log_error_write(srv, __FILE__, __LINE__, "s", "json fail");
goto end;
@ -404,9 +522,9 @@ int webm_login_proc(server *srv, uint32_t config_type, uint64 confg_id, char *da
int ret = 1;
mod_webm_plugin_data *p_d = point;
p_d = p_d;//解决编译告警；
confg_id = confg_id;//解决编译告警；
config_type = config_type;//解决编译告警；
p_d = p_d;//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>澯<EFBFBD><EFBFBD>
confg_id = confg_id;//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>澯<EFBFBD><EFBFBD>
config_type = config_type;//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>澯<EFBFBD><EFBFBD>
if (NULL == data_out)
{
@ -467,10 +585,10 @@ int webm_homepage_ifstatus_proc(server *srv, uint32_t config_type, uint64 confg_
int ret = 1;
mod_webm_plugin_data *p_d = point;
p_d = p_d;//解决编译告警；
confg_id = confg_id;//解决编译告警；
data_in = data_in;//解决编译告警；
config_type = config_type;//解决编译告警；
p_d = p_d;//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>澯<EFBFBD><EFBFBD>
confg_id = confg_id;//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>澯<EFBFBD><EFBFBD>
data_in = data_in;//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>澯<EFBFBD><EFBFBD>
config_type = config_type;//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>澯<EFBFBD><EFBFBD>
if (NULL == data_out)
{
@ -660,8 +778,8 @@ static handler_t mod_webm_uri_handler(server *srv, connection *con, void *p_d)
SETDEFAULTS_FUNC(mod_webm_set_defaults)
{
mod_webm_plugin_data *p = p_d;
p = p;//解决编译告警；
srv = srv;//解决编译告警；
p = p;//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>澯<EFBFBD><EFBFBD>
srv = srv;//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>澯<EFBFBD><EFBFBD>
return HANDLER_GO_ON;
}

17
systemd_service/platform_usr_configm.service Normal file
View File

@ -0,0 +1,17 @@
[Unit]
Description=Config manager daemon
After=network.target
[Service]
Type=simple
ExecStart=/usr/Product_usr/configm-aarch64.exe
Restart=always
RestartSec=10s
TimeoutSec=0
#RemainAfterExit=yes
#PrivateTmp=true
[Install]
WantedBy=multi-user.target