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

MOD aaa-12 解决LTE模块bug 

SOL
修改人：tongyebin
检视人：
This commit is contained in:
tongyebin 2019-10-11 15:17:57 +08:00
parent ec17b2fafd
commit 426a22ee51
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Platform/user/configm/config-server/LTE_config/LTE_config.c
View File

@ -13,17 +13,17 @@ ret_code compare(char *result)
return RET_NULL_INPUT_ERR;
}
if(strcmp(result,"lte no match") == 0)
if(strstr(result,"lte no match") != NULL)
{
return RET_LTE_NO_MATCH_ERR;
}
else if(strcmp(result,"no found lte module") == 0)
else if(strstr(result,"no found lte module") != NULL)
{
return RET_NO_LTE_MODULE_ERR;
}
else if(strcmp(result,"4g init done") == 0)
else if(strstr(result,"4g init done") != NULL)
{
return RET_OK;
}
@ -35,7 +35,7 @@ ret_code compare(char *result)
}
ret_code LTE_config_init(void)
ret_code LTE_config_init()
{
ret_code ret = RET_OK;
char result[RESULT_LENGTH] = {0};
@ -140,6 +140,10 @@ ret_code LTE_json_parse(pointer input, uint *conf_type, int action)
{
g_action = STOP;
}
else if(strcmp(action_type->valuestring,"init") == 0)
{
g_action = INIT;
}
else
{
cJSON_Delete(json_obj);
@ -169,7 +173,6 @@ void killpid()
sprintf(cmd,"kill %d",pid_int);
system(cmd);
pclose(fp);
}
ret_code start_lte()
@ -222,7 +225,7 @@ ret_code start_lte()
pclose(f);
//ɱËÀ½ø³Ì
killpid;
killpid();
rpc_log_info("please check the sim card\n");
return RET_EXEC_SHELL_ERR;
}
@ -321,7 +324,7 @@ ret_code restart_lte()
}
pclose(f);
//ɱËÀ½ø³Ì
killpid;
killpid();
rpc_log_info("please check the sim card\n");
return RET_EXEC_SHELL_ERR;
}
@ -451,6 +454,9 @@ ret_code LTE_config_proc(uint source, uint config_type,
case STOP:
ret = stop_lte();
break;
case INIT:
ret = LTE_config_init();
break;
default:
ret = RET_INPUTERR;
break;

4
Platform/user/configm/config-server/include/LTE_config.h
View File

@ -11,7 +11,6 @@
#include <arpa/inet.h>
#include <sys/ioctl.h>
#include <net/if.h>
#include <unistd.h>
#define INIT_CMD "/etc/ppp/ppp-4G init"
@ -25,11 +24,12 @@
#define RESTART 2
#define STOP 3
#define STATUS 4
#define INIT 5
#define RESULT_LENGTH 60
#define ACTION_LENGTH 10
#define STATUS_LENGTH 5
ret_code LTE_config_init(void);
//ret_code LTE_config_init(void);
ret_code LTE_config_chk(uint source, uint *config_type,
pointer input, int *input_len,