From 8ce2b8abbe86b809c2e8c9b3a22c1e3be7c01f8a Mon Sep 17 00:00:00 2001 From: payton Date: Wed, 6 Sep 2023 21:09:24 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8E=BB=E9=99=A4=E7=BC=96=E8=AF=91=E8=AD=A6?= =?UTF-8?q?=E5=91=8A=202.=E4=BF=AE=E5=A4=8Dftp=E7=9B=B8=E5=85=B3=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=203.=E4=BF=AE=E5=A4=8D=E5=8D=87=E7=BA=A7=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E6=97=B6=E9=87=8D=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/source/sifar/code/include/sf_common.h | 2 +- .../sifar/code/source/common/sf_common.c | 35 ++++++++++++------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/code/lib/source/sifar/code/include/sf_common.h b/code/lib/source/sifar/code/include/sf_common.h index 041edd218..e260e189a 100755 --- a/code/lib/source/sifar/code/include/sf_common.h +++ b/code/lib/source/sifar/code/include/sf_common.h @@ -122,6 +122,6 @@ UINT32 sf_cardv_cap_start(void); UINT32 sf_cardv_hd_cap_start(void); void sf_cardv_set_wait_shared_condition(int in); int sf_cardv_para_signaling_start(void); -UINT32 sf_cardv_wifi_send(); +UINT32 sf_cardv_wifi_send(void); #endif diff --git a/code/lib/source/sifar/code/source/common/sf_common.c b/code/lib/source/sifar/code/source/common/sf_common.c index 36c2449cc..6c34e93d2 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -1257,15 +1257,19 @@ BOOL sf_cmd_ftp(unsigned char argc, char **argv) UIMenuStoreInfo *puiPara = sf_ui_para_get(); //printf("[%s:%d] value:%d\n", __FUNCTION__, __LINE__,value); if(4 == argc) - { + { + memset(puiPara ->FtpIp,'\0', sizeof(puiPara ->FtpIp)); + memset(puiPara ->FtpPort, '\0', sizeof(puiPara ->FtpPort)); + memset(puiPara ->FtpUsr, '\0', sizeof(puiPara ->FtpUsr)); + memset(puiPara ->FtpPwd,'\0', sizeof(puiPara ->FtpPwd)); strncpy((char *)puiPara->FtpIp, argv[0], ((sizeof(puiPara->FtpIp) <= strlen(argv[0])) ? (sizeof(puiPara->FtpIp)) : (strlen(argv[0])))); - strncpy((char *)puiPara->FtpPort, argv[0], ((sizeof(puiPara->FtpPort) <= strlen(argv[0])) ? (sizeof(puiPara->FtpPort)) : (strlen(argv[0])))); - strncpy((char *)puiPara->FtpUsr, argv[0], ((sizeof(puiPara->FtpUsr) <= strlen(argv[0])) ? (sizeof(puiPara->FtpUsr)) : (strlen(argv[0])))); - strncpy((char *)puiPara->FtpPwd, argv[0], ((sizeof(puiPara->FtpPwd) <= strlen(argv[0])) ? (sizeof(puiPara->FtpPwd)) : (strlen(argv[0])))); + strncpy((char *)puiPara->FtpPort, argv[1], ((sizeof(puiPara->FtpPort) <= strlen(argv[1])) ? (sizeof(puiPara->FtpPort)) : (strlen(argv[1])))); + strncpy((char *)puiPara->FtpUsr, argv[2], ((sizeof(puiPara->FtpUsr) <= strlen(argv[2])) ? (sizeof(puiPara->FtpUsr)) : (strlen(argv[2])))); + strncpy((char *)puiPara->FtpPwd, argv[3], ((sizeof(puiPara->FtpPwd) <= strlen(argv[3])) ? (sizeof(puiPara->FtpPwd)) : (strlen(argv[3])))); Save_MenuInfo(); } - printf("[%s:%d] FtpIp:%s\n", __FUNCTION__, __LINE__,puiPara->FtpIp); + printf("[%s:%d] FtpIp:%s FtpPort:%s FtpUsr:%s FtpPwd:%s\n", __FUNCTION__, __LINE__,puiPara->FtpIp,puiPara ->FtpPort,puiPara ->FtpUsr,puiPara ->FtpPwd); return TRUE; } @@ -1275,15 +1279,19 @@ BOOL sf_cmd_ftps(unsigned char argc, char **argv) UIMenuStoreInfo *puiPara = sf_ui_para_get(); //printf("[%s:%d] value:%d\n", __FUNCTION__, __LINE__,value); if(4 == argc) - { + { + memset(puiPara ->FtpsIp,'\0', sizeof(puiPara ->FtpsIp)); + memset(puiPara ->FtpsPort, '\0', sizeof(puiPara ->FtpsPort)); + memset(puiPara ->FtpsUsr, '\0', sizeof(puiPara ->FtpsUsr)); + memset(puiPara ->FtpsPwd,'\0', sizeof(puiPara ->FtpsPwd)); strncpy((char *)puiPara->FtpsIp, argv[0], ((sizeof(puiPara->FtpsIp) <= strlen(argv[0])) ? (sizeof(puiPara->FtpsIp)) : (strlen(argv[0])))); - strncpy((char *)puiPara->FtpsPort, argv[0], ((sizeof(puiPara->FtpsPort) <= strlen(argv[0])) ? (sizeof(puiPara->FtpsPort)) : (strlen(argv[0])))); - strncpy((char *)puiPara->FtpsUsr, argv[0], ((sizeof(puiPara->FtpsUsr) <= strlen(argv[0])) ? (sizeof(puiPara->FtpsUsr)) : (strlen(argv[0])))); - strncpy((char *)puiPara->FtpsPwd, argv[0], ((sizeof(puiPara->FtpsPwd) <= strlen(argv[0])) ? (sizeof(puiPara->FtpsPwd)) : (strlen(argv[0])))); + strncpy((char *)puiPara->FtpsPort, argv[1], ((sizeof(puiPara->FtpsPort) <= strlen(argv[1])) ? (sizeof(puiPara->FtpsPort)) : (strlen(argv[1])))); + strncpy((char *)puiPara->FtpsUsr, argv[2], ((sizeof(puiPara->FtpsUsr) <= strlen(argv[2])) ? (sizeof(puiPara->FtpsUsr)) : (strlen(argv[2])))); + strncpy((char *)puiPara->FtpsPwd, argv[3], ((sizeof(puiPara->FtpsPwd) <= strlen(argv[3])) ? (sizeof(puiPara->FtpsPwd)) : (strlen(argv[3])))); Save_MenuInfo(); } - printf("[%s:%d] FtpIp:%s\n", __FUNCTION__, __LINE__,puiPara->FtpIp); + printf("[%s:%d] FtpsIp:%s FtpsPort:%s FtpsUsr:%s FtpsPwd:%s\n", __FUNCTION__, __LINE__,puiPara->FtpsIp,puiPara ->FtpsPort,puiPara ->FtpsUsr,puiPara ->FtpsPwd); return TRUE; } @@ -2023,7 +2031,8 @@ void* sf_sys_do_upgrade(void *arg) } sf_mcu_reg_set(SF_MCU_SOFT_UPDATE, 0); sf_set_send_statu(FALSE); - if(PWR_ON_SETUP == sf_cardv_convert_power_on_mode()){ + //if(PWR_ON_SETUP == sf_cardv_convert_power_on_mode()) + { vos_util_delay_ms(1000); Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, 0); } @@ -2594,7 +2603,7 @@ UINT32 sf_cardv_hd_cap_start(void) } -UINT32 sf_cardv_wifi_send() +UINT32 sf_cardv_wifi_send(void) { SINT32 fd = 0; SINT32 sendBuffLen = 0; @@ -2604,7 +2613,7 @@ UINT32 sf_cardv_wifi_send() if(SF_SUCCESS == sf_share_mem_hd_update()) { - SF_REPORT_WIFI_ATTR_S* wifiCfg = sf_wifi_cfg_get(); + //SF_REPORT_WIFI_ATTR_S* wifiCfg = sf_wifi_cfg_get(); fd = sf_get_wifi_socket(); SF_CHAR filePath[64] = { 0 };