floratest5/xiuos
1
0
Fork 0
forked from xuos/xiuos
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

repair somebug of ota/nbiot/adapter agent

Browse Source
This commit is contained in:
Wang_Weigen
2021-11-20 16:52:16 +08:00
parent 251846604a
commit 5a8b6d79aa
7 changed files with 369 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
APP_Framework/Applications/ota/ota.c
+79 -23
View File
@@ -29,17 +29,17 @@ struct ota_header_t
int16 frame_flag; ///< frame start flag 2 Bytes
uint8 dev_type; ///< device type
uint8 burn_mode; ///< data burn way
unsigned long total_len; ///< send data total length caculated from each frame_len
unsigned long dev_hid; ///< device hardware version
unsigned long dev_sid; ///< device software version
char resv[32]; ///< reserve
uint32 total_len; ///< send data total length caculated from each frame_len
uint32 dev_hid; ///< device hardware version
uint32 dev_sid; ///< device software version
char resv[8]; ///< reserve
};
struct ota_frame_t
{
uint32 frame_id; ///< Current frame id
uint32 frame_len; ///< Current frame data length
char frame_data[224]; ///< Current frame data,max length 224
char frame_data[64]; ///< Current frame data,max length 64
uint32 crc; ///< Current frame data crc
};
@@ -47,6 +47,7 @@ struct ota_data
{
struct ota_header_t header;
struct ota_frame_t frame;
char end[2];
};
pthread_t ota_task;
@@ -149,6 +150,11 @@ static int OtaDataRecv(struct Adapter* adapter)
int fd = 0;
fd = open( BOARD_APP_NAME, O_RDWR | O_CREAT | O_TRUNC);
if(fd < 0)
{
printf("open %s failed\n",BOARD_APP_NAME);
return -1;
}
while(1) {
memset(&recv_msg, 0, sizeof(struct ota_data));
@@ -168,73 +174,117 @@ static int OtaDataRecv(struct Adapter* adapter)
if (recv_msg.frame.crc == OtaCrc16(recv_msg.frame.frame_data,recv_msg.frame.frame_len))
{
printf("save current [%d] frame,length[%d] Bytes.\n",recv_msg.frame.frame_id,recv_msg.frame.frame_len);
SaveAppBin(fd, recv_msg.frame.frame_data, recv_msg.frame.frame_len);
}
else
{
printf("current [%d] frame crc check failed,try again\n",recv_msg.frame.frame_id);
printf("current [%d] frame crc check failed,try again!\n",recv_msg.frame.frame_id);
goto try_again;
}
memset(reply, 0, 16);
memcpy(reply, "ok", strlen("ok"));
PrivTaskDelay(200);
send_ok_again:
ret = AdapterDeviceSend(adapter, reply, strlen(reply));
if(ret < 0){
printf("send ok failed.\n");
goto send_ok_again;
}
try_times = 5;
}
else
{
try_again:
if(try_times == 0)
{
printf("oops!!! current [%d] frame try 5 times failed,break out\n",recv_msg.frame.frame_id);
printf("oops!!! current [%d] frame try 5 times failed,break out!\n",recv_msg.frame.frame_id);
ret = -1;
break;
}
memset(reply, 0, 16);
memcpy(reply, "try_again", strlen("try_again"));
memcpy(reply, "retry", strlen("retry"));
AdapterDeviceSend(adapter, reply, strlen(reply));
try_times--;
continue;
}
}
close(fd);
RestartApplication();
if(0 == ret) {
RestartApplication();
}
return ret;
}
static void *OtaKTaskEntry(void *parameter)
{
struct ota_data recv_msg;
char reply[4] = {0};
char reply[16] = {0};
int baud_rate = BAUD_RATE_115200;
int len = 0;
int ret = 0;
struct Adapter* adapter = AdapterDeviceFindByName("4G");
uint8 server_addr[64] = "101.68.82.219";
uint8 server_port[64] = "9898";
// struct Adapter* adapter = AdapterDeviceFindByName("4G");
// uint8 server_addr[64] = "115.238.53.61";
// uint8 server_port[64] = "9898";
adapter->socket.socket_id = 0;
// adapter->socket.socket_id = 0;
AdapterDeviceOpen(adapter);
AdapterDeviceControl(adapter, OPE_INT, &baud_rate);
AdapterDeviceConnect(adapter, CLIENT, server_addr, server_port, IPV4);
// AdapterDeviceOpen(adapter);
// AdapterDeviceControl(adapter, OPE_INT, &baud_rate);
// AdapterDeviceConnect(adapter, CLIENT, server_addr, server_port, IPV4);
/* using nbiot as connection way*/
struct Adapter* adapter = AdapterDeviceFindByName("nbiot");
while(1)
{
ret = AdapterDeviceOpen(adapter);
if(ret < 0)
{
printf("open adapter failed\n");
continue;
}
connect_again:
ret = AdapterDeviceConnect(adapter, 1, "115.238.53.61","9898",1);
if(ret < 0)
{
// AdapterDeviceClose(adapter);
// continue;
goto connect_again;
}
break;
}
while(1)
{
memset(&recv_msg, 0, sizeof(struct ota_data));
/* step1: Confirm the start signal of transmission*/
ret = AdapterDeviceRecv(adapter, &recv_msg, 256);
if(ret > 0 && recv_msg.header.frame_flag == 0x5A5A)
if(ret >= 0 && recv_msg.header.frame_flag == 0x5A5A)
{
if (0 == strncmp("aiit_ota_start",recv_msg.frame.frame_data, strlen("aiit_ota_start")))
{
memset(reply, 0, 4);
memcpy(reply, "ok", strlen("ok"));
AdapterDeviceSend(adapter, reply, strlen(reply));
memset(reply, 0, 16);
memcpy(reply, "ready", strlen("ready"));
PrivTaskDelay(3000);
printf("receive start signal,send [ready] signal to server\n");
send_ready_again:
ret = AdapterDeviceSend(adapter, reply, strlen(reply));
if(ret < 0)
{
goto send_ready_again;
}
printf("start receive ota file.\n");
/* step2: start receive source bin file of application*/
ret = OtaDataRecv(adapter);
if (0 != ret)
{
memset(reply, 0, 4);
memset(reply, 0, 16);
memcpy(reply, "send_restart", strlen("send_restart"));
AdapterDeviceSend(adapter, reply, strlen(reply));
continue;
@@ -245,6 +295,12 @@ static void *OtaKTaskEntry(void *parameter)
}
}
}
else
{
memset(reply, 0, 16);
memcpy(reply, "notready", strlen("notready"));
ret = AdapterDeviceSend(adapter, reply, strlen(reply));
}
PrivTaskDelay(3000); /* check ota signal every 3s */
}
AdapterDeviceClose(adapter);
APP_Framework/Applications/ota/ota_server.c
+35 -22
View File
@@ -33,17 +33,17 @@ struct ota_header_t
int16_t frame_flag; ///< frame start flag 2 Bytes
uint8_t dev_type; ///< device type
uint8_t burn_mode; ///< data burn way
unsigned long total_len; ///< send data total length caculated from each frame_len
unsigned long dev_hid; ///< device hardware version
unsigned long dev_sid; ///< device software version
char resv[32]; ///< reserve
uint32_t total_len; ///< send data total length caculated from each frame_len
uint32_t dev_hid; ///< device hardware version
uint32_t dev_sid; ///< device software version
char resv[8]; ///< reserve
};
struct ota_frame_t
{
uint32_t frame_id; ///< Current frame id
uint32_t frame_len; ///< Current frame data length
char frame_data[224]; ///< Current frame data,max length 224
char frame_data[64]; ///< Current frame data,max length 224
uint32_t crc; ///< Current frame data crc
};
@@ -51,6 +51,7 @@ struct ota_data
{
struct ota_header_t header;
struct ota_frame_t frame;
char end[2];
};
pthread_t ota_ktask;
@@ -129,32 +130,37 @@ int OtaFileSend(int fd)
int file_length = 0;
char * file_buf = NULL;
file_fd = fopen("/tmp/xiuos_app.bin", "r");
file_fd = fopen("/home/aep04/wwg/XiUOS_aiit-arm32-board_app.bin", "r");
if (NULL == file_fd){
printf("open file failed.\n");
return -1;
}
while((ch = fgetc(file_fd)) != EOF)
fseek(file_fd, 0, SEEK_SET);
printf("start send file.\n");
// while((ch = fgetc(file_fd)) != EOF)
while(!feof(file_fd))
{
memset(&data, 0, sizeof(data));
data.header.frame_flag = 0x5A5A;
len = fread( data.frame.frame_data, 200, 1, file_fd );
if(len > 0) {
len = fread( data.frame.frame_data, 1, 64, file_fd );
if(len > 0)
{
data.frame.frame_id = frame_cnt;
data.frame.frame_len = len;
data.frame.crc = OtaCrc16(data.frame.frame_data, len);
file_length += len;
}
memcpy(&data.frame.frame_data[len], "!@", strlen("!@")); /* add '!@' as ending flag */
memcpy(data.end,"!@",2);
fseek(file_fd, len, SEEK_CUR);
try_again:
send(fd, &data, sizeof(data), MSG_NOSIGNAL);
len = recv(fd, buf, sizeof(buf), 0);
if(0 == strncmp(buf, "ok!@", len))
if(0 == strncmp(buf, "ok", len))
{
try_times = 5;
printf("ota send current[%d] frame.\n",frame_cnt);
frame_cnt++;
continue;
}
@@ -185,9 +191,10 @@ try_again:
len = fread(file_buf, file_length,1,file_fd);
if(len > 0) {
data.header.total_len = file_length;
data.frame.frame_len = strlen("aiit_ota_end!@");;
data.frame.frame_len = strlen("aiit_ota_end");;
data.frame.crc = OtaCrc16(file_buf, len);
memcpy(data.frame.frame_data,"aiit_ota_end!@",strlen("aiit_ota_end!@"));
memcpy(data.frame.frame_data,"aiit_ota_end",strlen("aiit_ota_end"));
memcpy(data.end,"!@",2);
}
send(fd, &data, sizeof(data), MSG_NOSIGNAL);
free(file_buf);
@@ -205,16 +212,19 @@ void* server_thread(void* p)
int ret = 0;
printf("pthread = %d\n",fd);
sleep(10);
while(1)
{
memset(&data, 0 , sizeof(struct ota_data));
data.header.frame_flag = 0x5A5A;
memcpy(data.frame.frame_data,"aiit_ota_start!@",strlen("aiit_ota_start!@"));
data.frame.frame_len = strlen("aiit_ota_start!@");
send(fd, &data, sizeof(data), MSG_NOSIGNAL);
memcpy(data.frame.frame_data,"aiit_ota_start",strlen("aiit_ota_start"));
data.frame.frame_len = strlen("aiit_ota_start");
memcpy(data.end,"!@",2);
ret = send(fd, &data, sizeof(data), MSG_NOSIGNAL);
if (ret > 0){
printf("send %s[%d] Bytes\n",data.frame.frame_data,ret);
}
// sleep(1);
len = recv(fd, buf, sizeof(buf), 0);
if (len <= 0)
{
@@ -222,7 +232,8 @@ void* server_thread(void* p)
}
else
{
if(0 == strncmp(buf, "ok!@", len))
printf("recv buf %s\n",buf);
if(0 == strncmp(buf, "ready", len))
{
ret = OtaFileSend(fd);
if (ret == 0) {
@@ -234,12 +245,14 @@ void* server_thread(void* p)
}
}
}
printf("exit fd = %d\n",fd);
close(fd);
pthread_exit(0);
}
void server(void)
{
printf("Server startup\n");
printf("ota Server startup\n");
while(1)
{
struct sockaddr_in fromaddr;