mirror/OpenBK7231T_App
3
0
Fork 0
mirror of https://github.com/openshwprojects/OpenBK7231T_App.git synced 2026-02-10 04:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #565 from iprak/w600-new-ota

Browse Source 
W600: Added OTA support
This commit is contained in:
openshwprojects
2023-01-02 10:18:40 +01:00
committed by GitHub
parent 975d621ef4 9c02c1e9b1
commit 86c733e78f
3 changed files with 146 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/httpserver/http_tcp_server.c
View File

@ -16,6 +16,8 @@
// See: https://github.com/openshwprojects/OpenBK7231T_App/issues/314
#if PLATFORM_BEKEN
#define HTTP_CLIENT_STACK_SIZE 8192
#elif PLATFORM_W600
#define HTTP_CLIENT_STACK_SIZE 8192
#else
#define HTTP_CLIENT_STACK_SIZE 2048
#endif

172
src/httpserver/rest_interface.c
View File

@ -12,24 +12,33 @@
#include "../littlefs/our_lfs.h"
#endif
#include "lwip/sockets.h"
#if PLATFORM_XR809
#include <image/flash.h>
uint32_t flash_read(uint32_t flash, uint32_t addr, void* buf, uint32_t size);
#define FLASH_INDEX_XR809 0
#elif PLATFORM_BL602
#elif PLATFORM_W600
#include "wm_socket_fwup.h"
#include "wm_fwup.h"
#elif PLATFORM_W800
#else
extern UINT32 flash_read(char* user_buf, UINT32 count, UINT32 address);
#endif
#include "../new_cfg.h"
// Commands register, execution API and cmd tokenizer
#include "../cmnds/cmd_public.h"
#if PLATFORM_XR809
uint32_t flash_read(uint32_t flash, uint32_t addr, void* buf, uint32_t size);
#define FLASH_INDEX_XR809 0
#elif PLATFORM_BL602
#elif PLATFORM_W600 || PLATFORM_W800
#else
extern UINT32 flash_read(char* user_buf, UINT32 count, UINT32 address);
#endif
#define MAX_JSON_VALUE_LENGTH 128
@ -198,6 +207,8 @@ static int http_rest_post(http_request_t* request) {
return http_rest_post_flash(request, START_ADR_OF_BK_PARTITION_OTA, LFS_BLOCKS_END);
#elif PLATFORM_BK7231N
return http_rest_post_flash(request, START_ADR_OF_BK_PARTITION_OTA, LFS_BLOCKS_END);
#elif PLATFORM_W600
return http_rest_post_flash(request, -1, -1);
#else
// TODO
#endif
@ -450,7 +461,7 @@ static int http_rest_get_lfs_delete(http_request_t* request) {
strcpy(fpath, request->url + strlen("api/del/"));
ADDLOG_DEBUG(LOG_FEATURE_API, "LFS delete of %s", fpath);
lfsres = lfs_remove(&lfs,fpath);
lfsres = lfs_remove(&lfs, fpath);
if (lfsres == LFS_ERR_OK) {
ADDLOG_DEBUG(LOG_FEATURE_API, "LFS delete of %s OK", fpath);
@ -458,7 +469,7 @@ static int http_rest_get_lfs_delete(http_request_t* request) {
poststr(request, "OK");
}
else {
ADDLOG_DEBUG(LOG_FEATURE_API, "LFS delete of %s error %i", fpath,lfsres);
ADDLOG_DEBUG(LOG_FEATURE_API, "LFS delete of %s error %i", fpath, lfsres);
poststr(request, "Error");
}
poststr(request, NULL);
@ -891,36 +902,139 @@ static int http_rest_error(http_request_t* request, int code, char* msg) {
static int http_rest_post_flash(http_request_t* request, int startaddr, int maxaddr) {
#if PLATFORM_XR809
#elif PLATFORM_BL602
#if PLATFORM_XR809 || PLATFORM_BL602 || PLATFORM_W800
return 0; //Operation not supported yet
#endif
#elif PLATFORM_W600 || PLATFORM_W800
int total = 0;
int towrite = request->bodylen;
char* writebuf = request->bodystart;
int writelen = request->bodylen;
int nRetCode = 0;
char error_message[256];
ADDLOG_DEBUG(LOG_FEATURE_OTA, "OTA post len %d", request->contentLength);
#ifdef PLATFORM_W600
if (writelen < 0) {
ADDLOG_DEBUG(LOG_FEATURE_OTA, "ABORTED: %d bytes to write", writelen);
return http_rest_error(request, -20, "writelen < 0");
}
struct pbuf* p;
//Data is uploaded in 1024 sized chunks, creating a bigger buffer just in case this assumption changes.
//The code below is based on sdk\OpenW600\src\app\ota\wm_http_fwup.c
char* Buffer = (char*)os_malloc(2048 + 3);
memset(Buffer, 0, 2048 + 3);
if (request->contentLength >= 0) {
towrite = request->contentLength;
}
int recvLen = 0;
int totalLen = 0;
//bk_printf("\ntowrite %d writelen=%d\n", towrite, writelen);
do
{
if (writelen > 0) {
//bk_printf("Copying %d from writebuf to Buffer towrite=%d\n", writelen, towrite);
memcpy(Buffer + 3, writebuf, writelen);
if (recvLen == 0) {
T_BOOTER* booter = (T_BOOTER*)(Buffer + 3);
bk_printf("magic_no=%u, img_type=%u, zip_type=%u\n", booter->magic_no, booter->img_type, booter->zip_type);
if (TRUE == tls_fwup_img_header_check(booter))
{
totalLen = booter->upd_img_len + sizeof(T_BOOTER);
}
else
{
sprintf(error_message, "Image header check failed");
nRetCode = -19;
break;
}
nRetCode = socket_fwup_accept(0, ERR_OK);
if (nRetCode != ERR_OK) {
sprintf(error_message, "Firmware update startup failed");
break;
}
}
p = pbuf_alloc(PBUF_TRANSPORT, writelen + 3, PBUF_REF);
if (!p) {
sprintf(error_message, "Unable to allocate memory for buffer");
nRetCode = -18;
break;
}
if (recvLen == 0) {
*Buffer = SOCKET_FWUP_START;
}
else if (recvLen == (totalLen - writelen)) {
*Buffer = SOCKET_FWUP_END;
}
else {
*Buffer = SOCKET_FWUP_DATA;
}
*(Buffer + 1) = (writelen >> 8) & 0xFF;
*(Buffer + 2) = writelen & 0xFF;
p->payload = Buffer;
p->len = p->tot_len = writelen + 3;
nRetCode = socket_fwup_recv(0, p, ERR_OK);
if (nRetCode != ERR_OK) {
sprintf(error_message, "Firmware data processing failed");
break;
}
else {
recvLen += writelen;
bk_printf("Downloaded %d / %d\n", recvLen, totalLen);
}
towrite -= writelen;
}
if (towrite > 0) {
writebuf = request->received;
writelen = recv(request->fd, writebuf, request->receivedLenmax, 0);
if (writelen < 0) {
sprintf(error_message, "recv returned %d - end of data - remaining %d", writelen, towrite);
nRetCode = -17;
}
}
} while ((nRetCode == 0) && (towrite > 0) && (writelen >= 0));
tls_mem_free(Buffer);
if (nRetCode != 0) {
ADDLOG_ERROR(LOG_FEATURE_OTA, error_message);
socket_fwup_err(0, nRetCode);
return http_rest_error(request, nRetCode, error_message);
}
#else
int total = 0;
int towrite;
char* writebuf;
int writelen;
ADDLOG_DEBUG(LOG_FEATURE_API, "OTA post len %d", request->contentLength);
init_ota(startaddr);
towrite = request->bodylen;
writebuf = request->bodystart;
writelen = request->bodylen;
if (request->contentLength >= 0) {
towrite = request->contentLength;
}
if (writelen < 0 || (startaddr + writelen > maxaddr)) {
ADDLOG_DEBUG(LOG_FEATURE_API, "ABORTED: %d bytes to write", writelen);
ADDLOG_DEBUG(LOG_FEATURE_OTA, "ABORTED: %d bytes to write", writelen);
return http_rest_error(request, -20, "writelen < 0 or end > 0x200000");
}
do {
//ADDLOG_DEBUG(LOG_FEATURE_API, "%d bytes to write", writelen);
//ADDLOG_DEBUG(LOG_FEATURE_OTA, "%d bytes to write", writelen);
add_otadata((unsigned char*)writebuf, writelen);
total += writelen;
startaddr += writelen;
@ -929,17 +1043,17 @@ static int http_rest_post_flash(http_request_t* request, int startaddr, int maxa
writebuf = request->received;
writelen = recv(request->fd, writebuf, request->receivedLenmax, 0);
if (writelen < 0) {
ADDLOG_DEBUG(LOG_FEATURE_API, "recv returned %d - end of data - remaining %d", writelen, towrite);
ADDLOG_DEBUG(LOG_FEATURE_OTA, "recv returned %d - end of data - remaining %d", writelen, towrite);
}
}
} while ((towrite > 0) && (writelen >= 0));
ADDLOG_DEBUG(LOG_FEATURE_API, "%d total bytes written", total);
close_ota();
#endif
ADDLOG_DEBUG(LOG_FEATURE_OTA, "%d total bytes written", total);
http_setup(request, httpMimeTypeJson);
hprintf255(request, "{\"size\":%d}", total);
close_ota();
poststr(request, NULL);
#endif
return 0;
}