[Feature][ZXW-41] merged 0601 version
Change-Id: I667af6bb09d65581d455b73f8984c160b2c67ad8
diff --git a/ap/app/zte_comm/nvserver/nvserver.c b/ap/app/zte_comm/nvserver/nvserver.c
index b7a197d..d00b176 100755
--- a/ap/app/zte_comm/nvserver/nvserver.c
+++ b/ap/app/zte_comm/nvserver/nvserver.c
@@ -30,144 +30,143 @@
file,char*key,char*value);static int nvunset(char*file,char*key);static int
nvclear(char*file);static int nvreset(char*file);static int nvcommit(char*file);
T_NV_NODE*nv_list;int nvserver_main(int argc,char*argv[]){int msgId=
-(0x21b7+228-0x229b);T_NV_MSG_INFO rcvBuf;T_NV_MSG_RESULT sndBuf;struct msqid_ds
-msgInfo;prctl(PR_SET_NAME,"\x6e\x76\x73\x65\x72\x76\x65\x72",(0x8ac+1107-0xcff),
-(0x325+7130-0x1eff),(0xac5+7170-0x26c7));memset(&rcvBuf,(0x1bd7+1186-0x2079),
-sizeof(rcvBuf));memset(&sndBuf,(0xc5f+4745-0x1ee8),sizeof(sndBuf));memset(&
-msgInfo,(0x12e2+609-0x1543),sizeof(msgInfo));msgId=msgget(MODULE_ID_NV,IPC_CREAT
-|(0x14e3+145-0x13f4));if(-(0x1096+3747-0x1f38)==msgId){printf(
+(0xf9d+1777-0x168e);T_NV_MSG_INFO rcvBuf;T_NV_MSG_RESULT sndBuf;struct msqid_ds
+msgInfo;prctl(PR_SET_NAME,"\x6e\x76\x73\x65\x72\x76\x65\x72",(0x692+5200-0x1ae2)
+,(0x37d+8962-0x267f),(0xe2a+4064-0x1e0a));memset(&rcvBuf,(0x2bf+4784-0x156f),
+sizeof(rcvBuf));memset(&sndBuf,(0x135+7123-0x1d08),sizeof(sndBuf));memset(&
+msgInfo,(0x1335+1600-0x1975),sizeof(msgInfo));msgId=msgget(MODULE_ID_NV,
+IPC_CREAT|(0x1cf7+159-0x1c16));if(-(0x550+6473-0x1e98)==msgId){printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x20\x6d\x73\x67\x67\x65\x74\x20\x6d\x73\x67\x49\x64\x20\x66\x61\x69\x6c\x2c\x20\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64" "\n"
-,errno);return-(0x39a+1709-0xa46);}if(-(0x59b+239-0x689)!=msgctl(msgId,IPC_STAT,
-&msgInfo)){msgInfo.msg_qbytes=262144;if(-(0x1594+3177-0x21fc)==msgctl(msgId,
-IPC_SET,&msgInfo))printf(
+,errno);return-(0x1e2+4748-0x146d);}if(-(0x15fb+3897-0x2533)!=msgctl(msgId,
+IPC_STAT,&msgInfo)){msgInfo.msg_qbytes=262144;if(-(0x4a0+8126-0x245d)==msgctl(
+msgId,IPC_SET,&msgInfo))printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x20\x6d\x73\x67\x63\x74\x6c\x20\x6d\x73\x67\x49\x64\x20\x66\x61\x69\x6c\x2c\x20\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64" "\n"
-,errno);}if(nvDirInit()!=(0xe14+3810-0x1cf6)){printf(
+,errno);}if(nvDirInit()!=(0x1386+1034-0x1790)){printf(
"\x6e\x76\x44\x69\x72\x49\x6e\x69\x74\x20\x66\x61\x69\x6c\x65\x21" "\n");return-
-(0x983+7212-0x25ae);}nvConfig();nvInit();while((0x4a8+5403-0x19c2)){if(-
-(0x7a0+694-0xa55)==msgrcv(msgId,&rcvBuf,sizeof(T_NV_MSG_INFO)-sizeof(long),
-MSG_TYPE_NV,(0x1555+856-0x18ad))){printf(
+(0x103+4607-0x1301);}nvConfig();nvInit();while((0x92a+6724-0x236d)){if(-
+(0x713+565-0x947)==msgrcv(msgId,&rcvBuf,sizeof(T_NV_MSG_INFO)-sizeof(long),
+MSG_TYPE_NV,(0x160d+1056-0x1a2d))){printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x20\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x6d\x73\x67\x72\x63\x76\x20\x66\x61\x69\x6c\x2c\x20\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64\x21" "\n"
-,errno);continue;}analyMsg(&rcvBuf,&sndBuf);if(-(0x93+7684-0x1e96)==msgsnd(msgId
-,&sndBuf,sizeof(T_NV_MSG_RESULT)-sizeof(long),(0x1429+1555-0x1a3c))){printf(
+,errno);continue;}analyMsg(&rcvBuf,&sndBuf);if(-(0x1723+2233-0x1fdb)==msgsnd(
+msgId,&sndBuf,sizeof(T_NV_MSG_RESULT)-sizeof(long),(0xc5a+11-0xc65))){printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x20\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x6d\x73\x67\x73\x6e\x64\x20\x66\x61\x69\x6c\x2c\x20\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64\x21" "\n"
-,errno);continue;}}return((0xb32+2857-0x165b));}static void configdir(char*dir){
+,errno);continue;}}return((0x3b8+8720-0x25c8));}static void configdir(char*dir){
DIR*dp;int ret;struct dirent*entry;struct stat statbuf;if((dp=opendir(dir))==
NULL){fprintf(stderr,
"\x63\x61\x6e\x6e\x6f\x74\x20\x6f\x70\x65\x6e\x20\x64\x69\x72\x65\x63\x74\x6f\x72\x79\x3a\x20\x25\x73" "\n"
,dir);return;}chdir(dir);while((entry=readdir(dp))!=NULL){ret=lstat(entry->
-d_name,&statbuf);if(ret<(0xda4+2642-0x17f6)){fprintf(stderr,
+d_name,&statbuf);if(ret<(0x409+5808-0x1ab9)){fprintf(stderr,
"\x6c\x73\x74\x61\x74\x20\x65\x72\x72\x6f\x72\x3a\x20\x25\x73" "\n",strerror(
errno));chdir("\x2e\x2e");closedir(dp);return;}if(!S_ISDIR(statbuf.st_mode)){if(
-strcmp("\x2e",entry->d_name)==(0x3a5+2764-0xe71)||strcmp("\x2e\x2e",entry->
-d_name)==(0x7cd+7314-0x245f))continue;if(!isNvConfiged(entry->d_name)){if(
+strcmp("\x2e",entry->d_name)==(0xb93+2285-0x1480)||strcmp("\x2e\x2e",entry->
+d_name)==(0xce3+3622-0x1b09))continue;if(!isNvConfiged(entry->d_name)){if(
addConfigFile(entry->d_name,NULL)!=RESULT_SUCCESS)printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x63\x6f\x6e\x66\x69\x67\x20\x25\x73\x20\x65\x72\x72\x6f\x72\x21" "\n"
,entry->d_name);}}}chdir("\x2e\x2e");closedir(dp);}static void nvConfig(){char*
-val=NULL;FILE*fp=NULL;char buf[NV_MAX_CONFIG_LEN]={(0x100c+1798-0x1712)};fp=
-fopen(NV_CONFIG_FILE,"\x72\x6f");if(!fp){printf(
+val=NULL;FILE*fp=NULL;char buf[NV_MAX_CONFIG_LEN]={(0x97b+272-0xa8b)};fp=fopen(
+NV_CONFIG_FILE,"\x72\x6f");if(!fp){printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x6f\x70\x65\x6e\x20\x25\x73\x20\x66\x69\x6c\x65\x20\x66\x61\x69\x6c\x20\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64\x21" "\n"
,NV_CONFIG_FILE,errno);return;}while(fgets(buf,NV_MAX_CONFIG_LEN,fp)){if(buf[
-(0xcf6+6519-0x266d)]=='\n'||buf[(0x12ec+869-0x1651)]==
-((char)(0x837+2206-0x10b2)))continue;val=strchr(buf,((char)(0xbd8+3563-0x1986)))
-;if(!val){printf(
+(0xf7d+5635-0x2580)]=='\n'||buf[(0x572+6671-0x1f81)]==((char)(0x377+1667-0x9d7))
+)continue;val=strchr(buf,((char)(0x17ab+3339-0x2479)));if(!val){printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x25\x73\x20\x66\x69\x6c\x65\x20\x66\x6f\x72\x6d\x61\x74\x20\x65\x72\x72\x6f\x72\x3a\x20\x73\x74\x72\x20\x3d\x20\x25\x73\x21" "\n"
-,NV_CONFIG_FILE,buf);continue;}buf[strlen(buf)-(0x394+4011-0x133e)]='\0';*val++=
-'\0';if(!isCfgConfiged(buf)){if(addConfigFile(val,buf)!=RESULT_SUCCESS)printf(
+,NV_CONFIG_FILE,buf);continue;}buf[strlen(buf)-(0x1cb9+1681-0x2349)]='\0';*val++
+='\0';if(!isCfgConfiged(buf)){if(addConfigFile(val,buf)!=RESULT_SUCCESS)printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x63\x6f\x6e\x66\x69\x67\x20\x25\x73\x20\x65\x72\x72\x6f\x72\x21" "\n"
,buf);}}fclose(fp);configdir(NV_FS_MAIN_PATH);}static int nvDirInit(){if(access(
-NV_FS_PATH,F_OK)!=(0x41a+6568-0x1dc2)){if(mkdir(NV_FS_PATH,(0x9fc+7306-0x2499))
-!=(0x2a5+5311-0x1764)){printf(
+NV_FS_PATH,F_OK)!=(0x967+3017-0x1530)){if(mkdir(NV_FS_PATH,(0xaba+2657-0x132e))
+!=(0xbc7+1659-0x1242)){printf(
"\x6e\x65\x72\x76\x65\x72\x20\x6d\x6b\x64\x69\x72\x20\x25\x73\x20\x66\x61\x6c\x69\x2c\x65\x72\x72\x6e\x6f\x3d\x25\x64" "\n"
-,NV_FS_PATH,errno);return-(0x1034+4881-0x2344);}if(mkdir(NV_FS_MAIN_PATH,
-(0x588+2040-0xb93))!=(0x7bc+4919-0x1af3)){printf(
+,NV_FS_PATH,errno);return-(0x8d6+3871-0x17f4);}if(mkdir(NV_FS_MAIN_PATH,
+(0xe1a+713-0xef6))!=(0x1124+2701-0x1bb1)){printf(
"\x6e\x65\x72\x76\x65\x72\x20\x6d\x6b\x64\x69\x72\x20\x25\x73\x20\x66\x61\x6c\x69\x2c\x65\x72\x72\x6e\x6f\x3d\x25\x64" "\n"
-,NV_FS_MAIN_PATH,errno);return-(0x1d8+243-0x2ca);}if(mkdir(NV_FS_BACKUP_PATH,
-(0xcaf+1773-0x11af))!=(0x7ad+7206-0x23d3)){printf(
+,NV_FS_MAIN_PATH,errno);return-(0xadc+3711-0x195a);}if(mkdir(NV_FS_BACKUP_PATH,
+(0x1133+5774-0x25d4))!=(0x10ef+1653-0x1764)){printf(
"\x6e\x65\x72\x76\x65\x72\x20\x6d\x6b\x64\x69\x72\x20\x25\x73\x20\x66\x61\x6c\x69\x2c\x65\x72\x72\x6e\x6f\x3d\x25\x64" "\n"
-,NV_FS_BACKUP_PATH,errno);return-(0x3ca+3435-0x1134);}}else{if(access(
-NV_FS_MAIN_PATH,F_OK)!=(0x605+6134-0x1dfb)){if(mkdir(NV_FS_MAIN_PATH,
-(0x7a3+436-0x76a))!=(0x1805+667-0x1aa0)){printf(
+,NV_FS_BACKUP_PATH,errno);return-(0x5b1+3287-0x1287);}}else{if(access(
+NV_FS_MAIN_PATH,F_OK)!=(0x838+2209-0x10d9)){if(mkdir(NV_FS_MAIN_PATH,
+(0x25a+3379-0xda0))!=(0x63d+3509-0x13f2)){printf(
"\x6e\x65\x72\x76\x65\x72\x20\x6d\x6b\x64\x69\x72\x20\x25\x73\x20\x66\x61\x6c\x69\x2c\x65\x72\x72\x6e\x6f\x3d\x25\x64" "\n"
-,NV_FS_MAIN_PATH,errno);return-(0xdf7+1150-0x1274);}}if(access(NV_FS_BACKUP_PATH
-,F_OK)!=(0x1b69+1144-0x1fe1)){if(mkdir(NV_FS_BACKUP_PATH,(0x1721+808-0x185c))!=
-(0xcd+9272-0x2505)){printf(
+,NV_FS_MAIN_PATH,errno);return-(0xd01+6301-0x259d);}}if(access(NV_FS_BACKUP_PATH
+,F_OK)!=(0x1a7f+1439-0x201e)){if(mkdir(NV_FS_BACKUP_PATH,(0xd63+905-0xeff))!=
+(0x13a9+1438-0x1947)){printf(
"\x6e\x65\x72\x76\x65\x72\x20\x6d\x6b\x64\x69\x72\x20\x25\x73\x20\x66\x61\x6c\x69\x2c\x65\x72\x72\x6e\x6f\x3d\x25\x64" "\n"
-,NV_FS_BACKUP_PATH,errno);return-(0x1ad+9035-0x24f7);}}}return
-(0x148c+3042-0x206e);}static void nvInit(){T_NV_NODE*list=NULL;char nvMainFile[
-NV_PATH_LEN]={(0x2e8+5704-0x1930)};char nvBackupFile[NV_PATH_LEN]={
-(0x1c4c+977-0x201d)};for(list=nv_list;list;list=list->next){snprintf(nvMainFile,
-NV_PATH_LEN,"\x25\x73\x2f\x25\x73",NV_FS_MAIN_PATH,list->nvFile);snprintf(
+,NV_FS_BACKUP_PATH,errno);return-(0x14c2+732-0x179d);}}}return
+(0xdc8+1270-0x12be);}static void nvInit(){T_NV_NODE*list=NULL;char nvMainFile[
+NV_PATH_LEN]={(0x1067+1826-0x1789)};char nvBackupFile[NV_PATH_LEN]={
+(0x15bd+2250-0x1e87)};for(list=nv_list;list;list=list->next){snprintf(nvMainFile
+,NV_PATH_LEN,"\x25\x73\x2f\x25\x73",NV_FS_MAIN_PATH,list->nvFile);snprintf(
nvBackupFile,NV_PATH_LEN,"\x25\x73\x2f\x25\x73",NV_FS_BACKUP_PATH,list->nvFile);
if(checkNvFs(nvMainFile)){if(!checkNvFs(nvBackupFile))restoreNvFs(nvBackupFile,
nvMainFile);}else if(checkNvFs(nvBackupFile)){restoreNvFs(nvMainFile,
nvBackupFile);}else{loadFactroyParam(list);nvcommit(list->nvFile);continue;}
loadNvFs(list->nvFile);if(!strcmp(list->nvFile,NV_CFG)&&get_update_status()==
-(0x802+3439-0x156f)){reloadFactroyParam(list);delete_not_needed(list);nvcommit(
+(0x658+3729-0x14e7)){reloadFactroyParam(list);delete_not_needed(list);nvcommit(
list->nvFile);
#ifdef FOTA_AB
-dual_AB_set_fota_status_for_nv((0x230+1171-0x6c3));
+dual_AB_set_fota_status_for_nv((0x10f+5819-0x17ca));
#endif
-}}}uint hash(const char*s){uint hash=(0x7d1+4436-0x1925);while(*s){hash=
+}}}uint hash(const char*s){uint hash=(0x506+7684-0x230a);while(*s){hash=
NV_HASH_MUL*hash+*s++;}return hash;}static int loadFactroyParam(T_NV_NODE*list){
char*val=NULL;FILE*fp=NULL;T_NV_CONFIG*config=NULL;char buf[NV_MAX_ITEM_LEN]={
-(0xb55+863-0xeb4)};for(config=list->fileList;config;config=config->next){fp=
+(0x1810+1389-0x1d7d)};for(config=list->fileList;config;config=config->next){fp=
fopen(config->configFile,"\x72\x6f");if(!fp){printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x6f\x70\x65\x6e\x20\x25\x73\x20\x66\x69\x6c\x65\x20\x66\x61\x69\x6c\x20\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64\x21" "\n"
,config->configFile,errno);return RESULT_FILE_OPEN_FAIL;}while(fgets(buf,
-NV_MAX_ITEM_LEN,fp)){if(buf[(0x11fb+960-0x15bb)]=='\n'||buf[(0x8dc+1148-0xd58)]
-==((char)(0x12d5+4039-0x2279)))continue;val=strchr(buf,((char)(0xe7+1722-0x764))
-);if(!val){printf(
+NV_MAX_ITEM_LEN,fp)){if(buf[(0x519+663-0x7b0)]=='\n'||buf[(0x17dd+2775-0x22b4)]
+==((char)(0x5b+5361-0x1529)))continue;val=strchr(buf,((char)(0x210+1561-0x7ec)))
+;if(!val){printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x25\x73\x20\x66\x69\x6c\x65\x20\x66\x6f\x72\x6d\x61\x74\x20\x65\x72\x72\x6f\x72\x3a\x73\x74\x72\x69\x6e\x67\x20\x3d\x20\x25\x73" "\n"
-,config->configFile,buf);continue;}if(buf[strlen(buf)-(0xa3b+7323-0x26d5)]=='\n'
-)buf[strlen(buf)-(0x1654+2547-0x2046)]='\0';*val++='\0';nvset(list->nvFile,buf,
-val,(0x54c+3663-0x139a));}printf(
+,config->configFile,buf);continue;}if(buf[strlen(buf)-(0x1d91+1330-0x22c2)]==
+'\n')buf[strlen(buf)-(0x3ca+3390-0x1107)]='\0';*val++='\0';nvset(list->nvFile,
+buf,val,(0x1faa+588-0x21f5));}printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x6c\x6f\x61\x64\x46\x61\x63\x74\x72\x6f\x79\x50\x61\x72\x61\x6d\x20\x25\x73\x21" "\n"
,config->configFile);fclose(fp);}return RESULT_SUCCESS;}static bool checkNvFs(
-char*file){int len=(0x425+8073-0x23ae);int cnt=(0x32f+3665-0x1180);FILE*fp=NULL;
-char*buf=NULL;struct stat statbuff={(0x68+901-0x3ed)};if(stat(file,&statbuff)<
-(0x1bc8+365-0x1d35))return false;len=statbuff.st_size;if(len<NV_CHECK_SIZE)
+char*file){int len=(0x203+5707-0x184e);int cnt=(0xd2+428-0x27e);FILE*fp=NULL;
+char*buf=NULL;struct stat statbuff={(0xec2+4197-0x1f27)};if(stat(file,&statbuff)
+<(0x12e6+1104-0x1736))return false;len=statbuff.st_size;if(len<NV_CHECK_SIZE)
return false;fp=fopen(file,"\x72\x6f");if(!fp)return false;buf=(char*)malloc(len
-);if(!buf){fclose(fp);return false;}cnt=(0x1362+2711-0x1df9);while(cnt<len){cnt=
-cnt+fread(buf+cnt,(0x109a+5013-0x242e),len-cnt,fp);if(ferror(fp)){clearerr(fp);
+);if(!buf){fclose(fp);return false;}cnt=(0x256+5568-0x1816);while(cnt<len){cnt=
+cnt+fread(buf+cnt,(0x1865+293-0x1989),len-cnt,fp);if(ferror(fp)){clearerr(fp);
free(buf);fclose(fp);return false;}}if(len!=cnt){free(buf);fclose(fp);return
false;}if(getSum(buf,len-NV_CHECK_SIZE)+NV_FILE_FLAG!=*(uint*)(buf+len-
NV_CHECK_SIZE)){free(buf);fclose(fp);return false;}free(buf);fclose(fp);return
true;}static int copyfile(const char*from,const char*to){int fd_to;int fd_from;
-char buf[(0x136b+5791-0x1a0a)];ssize_t nread;int ret=-(0xf07+2228-0x17ba);
-fd_from=open(from,O_RDONLY);if(fd_from<(0x5c1+8279-0x2618))return-
-(0xa30+6645-0x2423);fd_to=open(to,O_RDWR|O_CREAT|O_TRUNC|O_SYNC,
-(0x1701+3253-0x2216));if(fd_to<(0x18c9+425-0x1a72)){ret=-(0x6f9+2022-0xedc);goto
- out_error;}while((0xdb6+6155-0x25c0)){char*out_ptr;ssize_t nwritten;nread=read(
-fd_from,buf,sizeof(buf));if(nread==(0x160d+3003-0x21c8)){break;}else{if(nread<
-(0x158+5810-0x180a)){if(errno==EINTR||errno==EAGAIN){continue;}else{ret=-
-(0x147+3804-0x101f);goto out_error;}}}out_ptr=buf;do{nwritten=write(fd_to,
-out_ptr,nread);if(nwritten>(0x274+6785-0x1cf5)){nread-=nwritten;out_ptr+=
-nwritten;}else{if(nwritten<(0x1e6d+1603-0x24b0)){if(errno==EINTR||errno==EAGAIN)
-{continue;}else{ret=-(0x470+7125-0x2040);goto out_error;}}}}while(nread>
-(0x1466+4545-0x2627));}ret=fsync(fd_to);if(ret<(0x860+2703-0x12ef)){printf(
+char buf[(0x246b+2358-0x1da1)];ssize_t nread;int ret=-(0xb67+718-0xe34);fd_from=
+open(from,O_RDONLY);if(fd_from<(0x44a+113-0x4bb))return-(0x451+1685-0xae4);fd_to
+=open(to,O_RDWR|O_CREAT|O_TRUNC|O_SYNC,(0x73d+8248-0x25d5));if(fd_to<
+(0x102b+4386-0x214d)){ret=-(0xd21+6588-0x26da);goto out_error;}while(
+(0x677+4919-0x19ad)){char*out_ptr;ssize_t nwritten;nread=read(fd_from,buf,sizeof
+(buf));if(nread==(0x407+5708-0x1a53)){break;}else{if(nread<(0x1e38+2156-0x26a4))
+{if(errno==EINTR||errno==EAGAIN){continue;}else{ret=-(0x8b9+5996-0x2021);goto
+out_error;}}}out_ptr=buf;do{nwritten=write(fd_to,out_ptr,nread);if(nwritten>
+(0x1ad4+690-0x1d86)){nread-=nwritten;out_ptr+=nwritten;}else{if(nwritten<
+(0x13d5+2399-0x1d34)){if(errno==EINTR||errno==EAGAIN){continue;}else{ret=-
+(0x4ad+5382-0x19ae);goto out_error;}}}}while(nread>(0x935+2807-0x142c));}ret=
+fsync(fd_to);if(ret<(0xf8c+3864-0x1ea4)){printf(
"\x53\x79\x6e\x63\x20\x46\x61\x69\x6c\x65\x64\x3a\x25\x73\x2c\x20\x66\x69\x6c\x65\x20\x70\x61\x74\x68\x3a\x25\x73"
-,strerror(errno),to);goto out_error;}if(close(fd_to)<(0x4f3+3686-0x1359)){fd_to=
--(0xa63+6633-0x244b);ret=-(0x6c7+1636-0xd25);goto out_error;}close(fd_from);
-return(0x112a+739-0x140d);out_error:printf(
+,strerror(errno),to);goto out_error;}if(close(fd_to)<(0x1182+5388-0x268e)){fd_to
+=-(0x1fc9+961-0x2389);ret=-(0x13c5+1023-0x17be);goto out_error;}close(fd_from);
+return(0x1137+617-0x13a0);out_error:printf(
"\x63\x6f\x70\x79\x66\x69\x6c\x65\x20\x25\x73\x20\x74\x6f\x20\x25\x73\x20\x65\x72\x72\x6f\x72\x3a\x25\x64" "\n"
-,from,to,ret);close(fd_from);if(fd_to>=(0x668+3927-0x15bf))close(fd_to);return
+,from,to,ret);close(fd_from);if(fd_to>=(0x9fd+3476-0x1791))close(fd_to);return
ret;}static int restoreNvFs(char*dstFile,char*srcFile){if(copyfile(srcFile,
-dstFile)!=(0xb6b+697-0xe24))return RESULT_FAIL;return RESULT_SUCCESS;}static int
- loadNvFs(char*file){int len=(0xf85+835-0x12c8);int cnt=(0x3b1+4574-0x158f);FILE
-*fp=NULL;char*buf=NULL;char*name=NULL;char*value=NULL;char*eq=NULL;struct stat
-statbuff={(0x19e4+2563-0x23e7)};char nvFile[NV_PATH_LEN]={(0x89a+7054-0x2428)};
-sprintf(nvFile,"\x25\x73\x2f\x25\x73",NV_FS_MAIN_PATH,file);if(stat(nvFile,&
-statbuff)<(0xf39+3366-0x1c5f))return RESULT_FAIL;len=statbuff.st_size;if(
-NV_CHECK_SIZE>len)return RESULT_FAIL;fp=fopen(nvFile,"\x72\x6f");if(!fp)return
-RESULT_FILE_OPEN_FAIL;len=len-NV_CHECK_SIZE;buf=(char*)malloc(len+
-(0x16f2+2490-0x20ab));if(!buf){fclose(fp);return RESULT_MALLOC_FAIL;}memset(buf,
-(0x1787+1795-0x1e8a),len+(0x777+1771-0xe61));cnt=(0x36d+8250-0x23a7);while(cnt<
-len){cnt=cnt+fread(buf+cnt,(0x205d+1677-0x26e9),len-cnt,fp);if(ferror(fp)){
+dstFile)!=(0x1721+2720-0x21c1))return RESULT_FAIL;return RESULT_SUCCESS;}static
+int loadNvFs(char*file){int len=(0xf3f+654-0x11cd);int cnt=(0x1630+323-0x1773);
+FILE*fp=NULL;char*buf=NULL;char*name=NULL;char*value=NULL;char*eq=NULL;struct
+stat statbuff={(0x70a+3788-0x15d6)};char nvFile[NV_PATH_LEN]={
+(0xe23+2248-0x16eb)};sprintf(nvFile,"\x25\x73\x2f\x25\x73",NV_FS_MAIN_PATH,file)
+;if(stat(nvFile,&statbuff)<(0x502+149-0x597))return RESULT_FAIL;len=statbuff.
+st_size;if(NV_CHECK_SIZE>len)return RESULT_FAIL;fp=fopen(nvFile,"\x72\x6f");if(!
+fp)return RESULT_FILE_OPEN_FAIL;len=len-NV_CHECK_SIZE;buf=(char*)malloc(len+
+(0xb1b+3129-0x1753));if(!buf){fclose(fp);return RESULT_MALLOC_FAIL;}memset(buf,
+(0xd63+4577-0x1f44),len+(0x1a7b+645-0x1cff));cnt=(0x8ef+2116-0x1133);while(cnt<
+len){cnt=cnt+fread(buf+cnt,(0x496+3505-0x1246),len-cnt,fp);if(ferror(fp)){
clearerr(fp);fclose(fp);free(buf);return RESULT_FILE_READ_FAIL;}}if(cnt!=len){
fclose(fp);free(buf);return RESULT_FILE_READ_FAIL;}buf[len]='\0';name=buf;while(
-*name){if(!(eq=strchr(name,((char)(0xe94+4620-0x2063))))){break;}*eq='\0';value=
-eq+(0x218+4518-0x13bd);nvset(file,name,value,(0x1c68+107-0x1cd2));*eq=
-((char)(0xb08+4409-0x1c04));name=value+strlen(value)+(0x1a2d+3131-0x2667);}free(
+*name){if(!(eq=strchr(name,((char)(0x1ab1+653-0x1d01))))){break;}*eq='\0';value=
+eq+(0x50b+5471-0x1a69);nvset(file,name,value,(0xeb1+3329-0x1bb1));*eq=
+((char)(0x1805+782-0x1ad6));name=value+strlen(value)+(0x141+9350-0x25c6);}free(
buf);fclose(fp);return RESULT_SUCCESS;}static void analyMsg(T_NV_MSG_INFO*
msgrecv,T_NV_MSG_RESULT*msgsnd){switch(msgrecv->nvType){case MSG_GET:msgsnd->
result=nvget(msgrecv->file,msgrecv->key,msgsnd->value);break;case MSG_SET:msgsnd
@@ -183,101 +182,101 @@
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x20\x70\x61\x72\x61\x6d\x20\x69\x6c\x6c\x65\x67\x61\x6c\x21" "\n"
);return RESULT_INVAL;}if(configFile){newConfig=(T_NV_CONFIG*)malloc(sizeof(
T_NV_CONFIG));if(!newConfig)return RESULT_MALLOC_FAIL;strncpy(newConfig->
-configFile,configFile,NV_PATH_LEN-(0xdb7+785-0x10c7));newConfig->configFile[
-NV_PATH_LEN-(0x111a+2299-0x1a14)]='\0';newConfig->next=NULL;}for(list=nv_list;
-list;list=list->next){if(strcmp(list->nvFile,nvFile)==(0x1cc7+754-0x1fb9))break;
-}if(!list){newList=(T_NV_NODE*)malloc(sizeof(T_NV_NODE));if(!newList){if(
+configFile,configFile,NV_PATH_LEN-(0x8e2+877-0xc4e));newConfig->configFile[
+NV_PATH_LEN-(0x827+4579-0x1a09)]='\0';newConfig->next=NULL;}for(list=nv_list;
+list;list=list->next){if(strcmp(list->nvFile,nvFile)==(0x7ff+236-0x8eb))break;}
+if(!list){newList=(T_NV_NODE*)malloc(sizeof(T_NV_NODE));if(!newList){if(
newConfig)free(newConfig);return RESULT_MALLOC_FAIL;}newList->next=NULL;strncpy(
-newList->nvFile,nvFile,NV_PATH_LEN-(0x57a+1342-0xab7));newList->nvFile[
-NV_PATH_LEN-(0x158f+3870-0x24ac)]='\0';memset(newList->nvTable,(0x4a3+762-0x79d)
-,NV_HASH_LEN*(0x92a+7293-0x25a3));newList->fileList=newConfig;if(!nv_list)
-nv_list=newList;else{newList->next=nv_list->next;nv_list->next=newList;}}else if
-(!list->fileList)list->fileList=newConfig;else{if(newConfig==NULL)return
-RESULT_FAIL;newConfig->next=list->fileList->next;list->fileList->next=newConfig;
-}return RESULT_SUCCESS;}static bool isCfgConfiged(char*configFile){T_NV_NODE*
-list=NULL;T_NV_CONFIG*config=NULL;for(list=nv_list;list;list=list->next){for(
-config=list->fileList;config;config=config->next){if(!strcmp(config->configFile,
-configFile))return true;}}return false;}static bool isNvConfiged(char*nvFile){
-T_NV_NODE*list=NULL;for(list=nv_list;list;list=list->next){if(!strcmp(list->
-nvFile,nvFile))return true;}return false;}static uint getSum(const char*s,int
-len){uint sum=(0x1d4a+1848-0x2482);char*data=(char*)s;while(len-- >
-(0x939+7536-0x26a9)){sum+=(*data++);}return sum;}static int saveNvFs(char*nvName
-,char*nvFile){int i=(0x8ad+7758-0x26fb);int sum=(0xb0d+6120-0x22f5);int bufSize=
-(0xd5+7480-0x1e0d);int itemSize=(0x3a5+878-0x713);int ret=(0x14e0+4574-0x26be);
-int fp=(0x371+7724-0x219d);char*buf=NULL;T_NV_NODE*list=NULL;T_NV_ITEM*item=NULL
-;for(list=nv_list;list;list=list->next){if(strcmp(list->nvFile,nvName))continue;
-fp=open(nvFile,O_SYNC|O_RDWR|O_CREAT|O_TRUNC,(0xea3+1522-0x12f5));if(fp==-
-(0x20b+9077-0x257f)){printf(
+newList->nvFile,nvFile,NV_PATH_LEN-(0x6d1+2315-0xfdb));newList->nvFile[
+NV_PATH_LEN-(0xcc4+406-0xe59)]='\0';memset(newList->nvTable,(0xca0+493-0xe8d),
+NV_HASH_LEN*(0xdd1+1493-0x13a2));newList->fileList=newConfig;if(!nv_list)nv_list
+=newList;else{newList->next=nv_list->next;nv_list->next=newList;}}else if(!list
+->fileList)list->fileList=newConfig;else{if(newConfig==NULL)return RESULT_FAIL;
+newConfig->next=list->fileList->next;list->fileList->next=newConfig;}return
+RESULT_SUCCESS;}static bool isCfgConfiged(char*configFile){T_NV_NODE*list=NULL;
+T_NV_CONFIG*config=NULL;for(list=nv_list;list;list=list->next){for(config=list->
+fileList;config;config=config->next){if(!strcmp(config->configFile,configFile))
+return true;}}return false;}static bool isNvConfiged(char*nvFile){T_NV_NODE*list
+=NULL;for(list=nv_list;list;list=list->next){if(!strcmp(list->nvFile,nvFile))
+return true;}return false;}static uint getSum(const char*s,int len){uint sum=
+(0x1424+4397-0x2551);char*data=(char*)s;while(len-- >(0x109d+4867-0x23a0)){sum+=
+(*data++);}return sum;}static int saveNvFs(char*nvName,char*nvFile){int i=
+(0xcaf+3241-0x1958);int sum=(0x7b1+3097-0x13ca);int bufSize=(0x38+2128-0x888);
+int itemSize=(0x194+5992-0x18fc);int ret=(0x11a+7134-0x1cf8);int fp=
+(0x779+6093-0x1f46);char*buf=NULL;T_NV_NODE*list=NULL;T_NV_ITEM*item=NULL;for(
+list=nv_list;list;list=list->next){if(strcmp(list->nvFile,nvName))continue;fp=
+open(nvFile,O_SYNC|O_RDWR|O_CREAT|O_TRUNC,(0x590+8888-0x26a8));if(fp==-
+(0x7c2+6181-0x1fe6)){printf(
"\x6f\x70\x65\x6e\x20\x25\x73\x20\x66\x61\x69\x6c\x2c\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64" "\n"
,nvFile,errno);return RESULT_FILE_OPEN_FAIL;}buf=(char*)malloc(NV_BLOCK_SIZE);if
-(!buf){close(fp);return RESULT_MALLOC_FAIL;}for(i=(0xbcd+3580-0x19c9);i<
+(!buf){close(fp);return RESULT_MALLOC_FAIL;}for(i=(0x855+4427-0x19a0);i<
NV_HASH_LEN;i++){for(item=list->nvTable[i];item;item=item->next){if(strcmp(
nvFile,NV_FS_SHOW)&&!item->saveFlag)continue;itemSize=strlen(item->key)+strlen(
-item->value)+(0x1985+1354-0x1ecd);if(bufSize+itemSize>NV_BLOCK_SIZE){if(write(fp
-,buf,bufSize)<(0x77a+5645-0x1d87)){printf(
+item->value)+(0xaed+3813-0x19d0);if(bufSize+itemSize>NV_BLOCK_SIZE){if(write(fp,
+buf,bufSize)<(0x207+773-0x50c)){printf(
"\x65\x72\x72\x6f\x72\x20\x25\x73\x20\x25\x64\x3a\x20\x77\x72\x69\x74\x65\x20\x66\x61\x69\x6c\x20\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64" "\n"
,__FILE__,__LINE__,errno);close(fp);free(buf);return RESULT_FILE_WRITE_FAIL;}sum
-+=getSum(buf,bufSize);bufSize=(0x105d+5503-0x25dc);}sprintf(buf+bufSize,
++=getSum(buf,bufSize);bufSize=(0x72c+3029-0x1301);}sprintf(buf+bufSize,
"\x25\x73\x3d\x25\x73",item->key,item->value);bufSize+=itemSize;}}if(bufSize!=
-(0x690+6537-0x2019)){if(write(fp,buf,bufSize)<(0x3a1+3191-0x1018)){printf(
+(0x9e0+6384-0x22d0)){if(write(fp,buf,bufSize)<(0x757+853-0xaac)){printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x20\x77\x72\x69\x74\x65\x20\x66\x61\x69\x6c\x20\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64" "\n"
,errno);close(fp);free(buf);return RESULT_FILE_WRITE_FAIL;}sum+=getSum(buf,
-bufSize);}sum+=NV_FILE_FLAG;if(write(fp,&sum,NV_CHECK_SIZE)<(0x2f6+7424-0x1ff6))
-{printf(
+bufSize);}sum+=NV_FILE_FLAG;if(write(fp,&sum,NV_CHECK_SIZE)<(0x127a+1921-0x19fb)
+){printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x20\x77\x72\x69\x74\x65\x20\x66\x61\x69\x6c\x20\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64" "\n"
,errno);close(fp);free(buf);return RESULT_FILE_WRITE_FAIL;}ret=fsync(fp);free(
-buf);close(fp);if(ret<(0xc80+2216-0x1528)){printf(
+buf);close(fp);if(ret<(0x69c+591-0x8eb)){printf(
"\x53\x79\x6e\x63\x20\x46\x61\x69\x6c\x65\x64\x3a\x25\x73\x2c\x20\x66\x69\x6c\x65\x20\x70\x61\x74\x68\x3a\x25\x73"
,strerror(errno),nvFile);return ret;}return RESULT_SUCCESS;}return
RESULT_NO_FILE;}static int nvget(char*file,char*key,char*value){int index=
-(0x352+8306-0x23c4);T_NV_NODE*list=NULL;T_NV_ITEM*item=NULL;for(list=nv_list;
-list;list=list->next){if(strcmp(list->nvFile,file))continue;index=hash(key)%
+(0x1718+29-0x1735);T_NV_NODE*list=NULL;T_NV_ITEM*item=NULL;for(list=nv_list;list
+;list=list->next){if(strcmp(list->nvFile,file))continue;index=hash(key)%
NV_HASH_LEN;for(item=list->nvTable[index];item;item=item->next){if(strcmp(item->
-key,key))continue;strncpy(value,item->value,NV_MAX_VAL_LEN-(0xc33+382-0xdb0));
-value[NV_MAX_VAL_LEN-(0xb2+565-0x2e6)]='\0';return RESULT_SUCCESS;}}return
+key,key))continue;strncpy(value,item->value,NV_MAX_VAL_LEN-(0x124d+3545-0x2025))
+;value[NV_MAX_VAL_LEN-(0x181c+268-0x1927)]='\0';return RESULT_SUCCESS;}}return
RESULT_NO_ITEM;}static int nvset(char*file,const char*key,const char*value,int
-saveFlag){int index=(0x1c7f+1589-0x22b4);int ret=(0x1a7+5591-0x177e);int
-key_buf_len=(0x179d+2165-0x2012);int value_buf_len=(0x435+4824-0x170d);T_NV_NODE
-*list=NULL;T_NV_ITEM*item=NULL;T_NV_ITEM*newItem=NULL;if(NULL==key||NULL==value)
-return RESULT_FAIL;key_buf_len=strlen(key)+(0x167d+3527-0x2443);value_buf_len=
-strlen(value)+(0x25d+3937-0x11bd);for(list=nv_list;list;list=list->next){if(
+saveFlag){int index=(0x15ff+1341-0x1b3c);int ret=(0x153a+1644-0x1ba6);int
+key_buf_len=(0x67+8383-0x2126);int value_buf_len=(0x7ad+5162-0x1bd7);T_NV_NODE*
+list=NULL;T_NV_ITEM*item=NULL;T_NV_ITEM*newItem=NULL;if(NULL==key||NULL==value)
+return RESULT_FAIL;key_buf_len=strlen(key)+(0x200b+73-0x2053);value_buf_len=
+strlen(value)+(0x54d+4926-0x188a);for(list=nv_list;list;list=list->next){if(
strcmp(list->nvFile,file))continue;index=hash(key)%NV_HASH_LEN;for(item=list->
nvTable[index];item;item=item->next){if(strcmp(item->key,key))continue;if(
saveFlag)item->saveFlag=saveFlag;if(!strcmp(item->value,value))return
RESULT_SUCCESS;free(item->value);item->value=(char*)malloc(value_buf_len);if(!
item->value)return RESULT_MALLOC_FAIL;strncpy(item->value,value,value_buf_len-
-(0xdf+3010-0xca0));item->value[value_buf_len-(0x14c0+1618-0x1b11)]='\0';return
+(0xd1f+3066-0x1918));item->value[value_buf_len-(0x814+2114-0x1055)]='\0';return
RESULT_SUCCESS;}newItem=(T_NV_ITEM*)malloc(sizeof(T_NV_ITEM));if(!newItem)return
RESULT_MALLOC_FAIL;newItem->key=(char*)malloc(key_buf_len);if(!newItem->key){
free(newItem);return RESULT_MALLOC_FAIL;}newItem->value=(char*)malloc(
value_buf_len);if(!newItem->value){free(newItem->key);free(newItem);return
-RESULT_MALLOC_FAIL;}strncpy(newItem->key,key,key_buf_len-(0x258b+13-0x2597));
-newItem->key[key_buf_len-(0x3ab+5388-0x18b6)]='\0';strncpy(newItem->value,value,
-value_buf_len-(0x130+917-0x4c4));newItem->value[value_buf_len-
-(0xe9c+2115-0x16de)]='\0';newItem->next=NULL;newItem->saveFlag=saveFlag;newItem
-->update_flag=(0x2530+259-0x2633);if(!list->nvTable[index])list->nvTable[index]=
+RESULT_MALLOC_FAIL;}strncpy(newItem->key,key,key_buf_len-(0xa8+6175-0x18c6));
+newItem->key[key_buf_len-(0x7d2+1506-0xdb3)]='\0';strncpy(newItem->value,value,
+value_buf_len-(0xfa0+3677-0x1dfc));newItem->value[value_buf_len-
+(0x8c9+7665-0x26b9)]='\0';newItem->next=NULL;newItem->saveFlag=saveFlag;newItem
+->update_flag=(0x179+2470-0xb1f);if(!list->nvTable[index])list->nvTable[index]=
newItem;else{newItem->next=list->nvTable[index]->next;list->nvTable[index]->next
=newItem;}return RESULT_SUCCESS;}ret=addConfigFile(file,NULL);if(ret==
RESULT_SUCCESS)return nvset(file,key,value,saveFlag);else return ret;}static int
- nvunset(char*file,char*key){int index=(0xe95+1128-0x12fd);T_NV_NODE*list=NULL;
+ nvunset(char*file,char*key){int index=(0x825+7553-0x25a6);T_NV_NODE*list=NULL;
T_NV_ITEM*item=NULL;T_NV_ITEM*prev=NULL;for(list=nv_list;list;list=list->next){
if(strcmp(list->nvFile,file))continue;index=hash(key)%NV_HASH_LEN;for(item=list
->nvTable[index];item;prev=item,item=item->next){if(strcmp(item->key,key))
continue;if(!prev)list->nvTable[index]=item->next;else prev->next=item->next;
free(item->key);free(item->value);free(item);return RESULT_SUCCESS;}}return
-RESULT_NO_ITEM;}static int nvreset(char*file){int ret=(0x2db+5059-0x169e);
+RESULT_NO_ITEM;}static int nvreset(char*file){int ret=(0x5ca+4630-0x17e0);
T_NV_NODE*list=NULL;for(list=nv_list;list;list=list->next){if(strcmp(list->
nvFile,file))continue;ret=nvclear(file);if(ret!=RESULT_SUCCESS)return ret;if(
loadFactroyParam(list)!=RESULT_SUCCESS)return RESULT_FAIL;return nvcommit(file);
-}return RESULT_NO_FILE;}static int nvclear(char*file){int i=(0x33c+2603-0xd67);
+}return RESULT_NO_FILE;}static int nvclear(char*file){int i=(0x821+6218-0x206b);
T_NV_NODE*list=NULL;T_NV_ITEM*cur=NULL;T_NV_ITEM*item=NULL;for(list=nv_list;list
;list=list->next){if(strcmp(list->nvFile,file))continue;for(i=
-(0xdef+2131-0x1642);i<NV_HASH_LEN;i++){for(item=list->nvTable[i];item;){cur=item
-;item=item->next;free(cur->key);free(cur->value);free(cur);}list->nvTable[i]=
-NULL;}return RESULT_SUCCESS;}return RESULT_NO_FILE;}static int nvcommit(char*
-file){int ret=(0x585+2926-0x10f3);char nvMainFile[NV_PATH_LEN]={
-(0x827+4455-0x198e)};char nvBackupFile[NV_PATH_LEN]={(0xd3d+693-0xff2)};sprintf(
-nvMainFile,"\x25\x73\x2f\x25\x73",NV_FS_MAIN_PATH,file);sprintf(nvBackupFile,
+(0x1772+1118-0x1bd0);i<NV_HASH_LEN;i++){for(item=list->nvTable[i];item;){cur=
+item;item=item->next;free(cur->key);free(cur->value);free(cur);}list->nvTable[i]
+=NULL;}return RESULT_SUCCESS;}return RESULT_NO_FILE;}static int nvcommit(char*
+file){int ret=(0x125b+636-0x14d7);char nvMainFile[NV_PATH_LEN]={
+(0x689+7094-0x223f)};char nvBackupFile[NV_PATH_LEN]={(0xff4+613-0x1259)};sprintf
+(nvMainFile,"\x25\x73\x2f\x25\x73",NV_FS_MAIN_PATH,file);sprintf(nvBackupFile,
"\x25\x73\x2f\x25\x73",NV_FS_BACKUP_PATH,file);ret=saveNvFs(file,nvMainFile);if(
ret!=RESULT_SUCCESS)return ret;return restoreNvFs(nvBackupFile,nvMainFile);}
#ifdef __cplusplus
diff --git a/ap/app/zte_comm/nvserver/nvserver_rpc.c b/ap/app/zte_comm/nvserver/nvserver_rpc.c
index f165cdc..eb1efee 100755
--- a/ap/app/zte_comm/nvserver/nvserver_rpc.c
+++ b/ap/app/zte_comm/nvserver/nvserver_rpc.c
@@ -18,6 +18,7 @@
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
+#include <assert.h>
#include <dirent.h>
#include <string.h>
#include <sys/file.h>
@@ -65,6 +66,10 @@
* È«¾Ö±äÁ¿¶¨Òå *
*******************************************************************************/
static int g_rpc_fd = -1;
+static unsigned int g_msgRcvCnt = 0;
+static unsigned int g_msgRcvErrCnt = 0;
+static unsigned int g_msgSndCnt = 0;
+static unsigned int g_msgSndErrCnt = 0;
/*******************************************************************************
* ¾Ö²¿º¯ÊýʵÏÖ *
@@ -100,11 +105,42 @@
try_cnt++;
//sleep(1);
//continue;
- } while (0 != sc_rpc_recv(g_rpc_fd, rpc_data2, timeout)); // µÈ´ýCAPºË´´½¨Í¨µÀ
+ } while (0 != sc_rpc_recv(g_rpc_fd, rpc_data2, timeout)); //µÈ´ýÍê³É
+ if (rpc_data2->msg_type != RPC_MSG_TYPE_REPLY)
+ assert(0);
memcpy(msgsnd, rpc_data2->data, sizeof(T_NV_MSG_RESULT));
}
+static int nv_rpc_wait_ready(int fd)
+{
+ T_sc_rpc_header *rpc_data;
+ unsigned int timeout = 200; // ms
+ int write_flag = 1;
+
+ rpc_data = malloc(sizeof(T_sc_rpc_header));
+ if (rpc_data == NULL)
+ return -1;
+ while(1)
+ {
+ rpc_data->msg_type = RPC_MSG_TYPE_READY;
+ if (write_flag)
+ {
+ if (write(fd, rpc_data, sizeof(T_sc_rpc_header)) != 0)
+ write_flag = 0; // write ok and write sonly once
+ }
+ if (read(fd, rpc_data, sizeof(T_sc_rpc_header)) == 0)
+ {
+ usleep(timeout * 1000);
+ continue;
+ }
+ break; /* read some data mean channel ok */
+ }
+
+ free(rpc_data);
+ return 0;
+}
+
/*******************************************************************************
* È«¾Öº¯ÊýʵÏÖ *
*******************************************************************************/
@@ -125,6 +161,7 @@
struct msqid_ds msgInfo;
T_sc_rpc_header *rpc_data;
T_sc_rpc_header *rpc_data2;
+ long pid_backup; /* app-libnvram pid backup */
prctl(PR_SET_NAME, "nvserver", 0, 0, 0);
@@ -162,24 +199,47 @@
return -3;
}
+ if (nv_rpc_wait_ready(g_rpc_fd) < 0)
+ {
+ assert(0);
+ }
+ sc_rpc_clear(g_rpc_fd);
+ printf("apnv and nv-rpc-daemon are ready both.");
+
// ÏûÏ¢½»»¥
while (1)
{
memset(&rcvBuf, 0, sizeof(rcvBuf));
memset(&sndBuf, 0, sizeof(sndBuf));
+ if (g_msgRcvCnt != g_msgSndCnt)
+ {
+ printf("[nvserver_rpc]Rcv:%u Snd:%u RcvErr:%u SndErr:%u\n", g_msgRcvCnt, g_msgSndCnt, g_msgRcvErrCnt, g_msgSndErrCnt);
+ assert(0);
+ }
if (-1 == msgrcv(msgId, &rcvBuf, sizeof(T_NV_MSG_INFO) - sizeof(long), MSG_TYPE_NV, 0))
{
+ g_msgRcvErrCnt++;
printf("nvserver error: nvserver msgrcv fail, errno = %d!\n", errno);
continue;
}
+ //printf("apnv nvserver_rpc msgrcv pid:%d\n", rcvBuf.pid);
+ pid_backup = rcvBuf.pid;
+ g_msgRcvCnt++; /* msgrcv success count */
analyMsg(&rcvBuf, &sndBuf, rpc_data, rpc_data2);
+ //printf("apnv nvserver_rpc msgsnd pid:%d, backup:%d\n", sndBuf.msgType, pid_backup);
if (-1 == msgsnd(msgId, &sndBuf, sizeof(T_NV_MSG_RESULT) - sizeof(long), 0))
{
+ g_msgSndErrCnt++;
printf("nvserver error: nvserver msgsnd fail, errno = %d!\n", errno);
continue;
}
+ g_msgSndCnt++; /* msgsnd success count */
+ if (sndBuf.msgType != pid_backup)
+ {
+ assert(0);
+ }
}
free(rpc_data);
diff --git a/ap/app/zte_comm/nvserver/nvupdate.c b/ap/app/zte_comm/nvserver/nvupdate.c
index 1311b5f..34b867f 100755
--- a/ap/app/zte_comm/nvserver/nvupdate.c
+++ b/ap/app/zte_comm/nvserver/nvupdate.c
@@ -23,82 +23,81 @@
extern T_NV_NODE*nv_list;
#ifdef FOTA_AB
int get_update_status(void){int ret=dual_AB_get_fota_status_for_nv();if(ret==
-(0x1384+2398-0x1ce1))return(0x1f54+1972-0x2706);else return(0x12db+3847-0x21e2);
-}
+(0x1b20+1519-0x210e))return(0x306+5932-0x1a30);else return(0x1f8f+1256-0x2477);}
#else
-int get_update_status(void){int update_status;FILE*fd=(0x5f+2264-0x937);int ret;
-char*filename=NULL;if(access(FOTA_UPDATE_STATUS_FILE_OLD,R_OK)==
-(0x145b+1369-0x19b4)){filename=FOTA_UPDATE_STATUS_FILE_OLD;}else{filename=
+int get_update_status(void){int update_status;FILE*fd=(0xa5f+1004-0xe4b);int ret
+;char*filename=NULL;if(access(FOTA_UPDATE_STATUS_FILE_OLD,R_OK)==
+(0x20d+3207-0xe94)){filename=FOTA_UPDATE_STATUS_FILE_OLD;}else{filename=
FOTA_UPDATE_STATUS_FILE;}printf(
"get_update_status, read_update_status from %s\n",filename);fd=fopen(filename,
"\x72\x62\x2b");if(fd==NULL){printf(
"\x5b\x6e\x76\x73\x65\x72\x76\x65\x72\x5d\x75\x70\x64\x61\x74\x65\x5f\x73\x74\x61\x74\x75\x73\x20\x6f\x70\x65\x6e\x20\x20\x65\x72\x72\x6f\x72\x3a\x25\x73" "\n"
,strerror(errno));goto error0;}ret=fscanf(fd,"\x25\x64",(int*)&update_status);if
-(ret<(0x689+3651-0x14cc)){printf(
+(ret<(0xa56+5614-0x2044)){printf(
"\x67\x65\x74\x20\x69\x6e\x66\x6f\x20\x66\x72\x6f\x6d\x20\x66\x69\x6c\x65\x20\x65\x72\x72\x6f\x72\x3a\x25\x73" "\n"
,strerror(errno));fclose(fd);goto error0;}printf(
"\x75\x70\x64\x61\x74\x65\x5f\x73\x74\x61\x74\x75\x73\x3d\x25\x64" "\n",
-update_status);fclose(fd);return update_status;error0:return-(0x8f0+3167-0x154e)
-;}
+update_status);fclose(fd);return update_status;error0:return-
+(0x16ed+1906-0x1e5e);}
#endif
int nvupdate(char*nv_file,char*config_file,const char*key,const char*value,int
-saveFlag){int index=(0xeb+3008-0xcab);int key_buf_len=(0x779+3965-0x16f6);int
-value_buf_len=(0x96d+6057-0x2116);T_NV_NODE*list=NULL;T_NV_ITEM*item=NULL;
+saveFlag){int index=(0x217d+308-0x22b1);int key_buf_len=(0x870+5158-0x1c96);int
+value_buf_len=(0x151f+3443-0x2292);T_NV_NODE*list=NULL;T_NV_ITEM*item=NULL;
T_NV_ITEM*newItem=NULL;if(NULL==key||NULL==value)return RESULT_FAIL;printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x6e\x76\x75\x70\x64\x61\x74\x65\x20\x6e\x76\x5f\x66\x69\x6c\x65\x3a\x25\x73\x20\x6b\x65\x79\x3a\x25\x73\x20\x76\x61\x6c\x75\x65\x3a\x25\x73" "\n"
-,nv_file,key,value);key_buf_len=strlen(key)+(0xd92+6511-0x2700);value_buf_len=
-strlen(value)+(0x1a6c+1049-0x1e84);for(list=nv_list;list;list=list->next){if(
+,nv_file,key,value);key_buf_len=strlen(key)+(0x1395+382-0x1512);value_buf_len=
+strlen(value)+(0x11ca+3310-0x1eb7);for(list=nv_list;list;list=list->next){if(
strcmp(list->nvFile,nv_file))continue;index=hash(key)%NV_HASH_LEN;for(item=list
->nvTable[index];item;item=item->next){if(strcmp(item->key,key))continue;if(
saveFlag)item->saveFlag=saveFlag;if(!strcmp(item->value,value)){item->
-update_flag=(0x362+838-0x6a7);printf(
+update_flag=(0xa11+4766-0x1cae);printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x6e\x76\x75\x70\x64\x61\x74\x65\x20\x73\x61\x6d\x65\x73\x6b\x69\x70\x3a\x69\x74\x65\x6d\x2d\x3e\x6b\x65\x79\x3a\x25\x73\x20\x69\x74\x65\x6d\x2d\x3e\x76\x61\x6c\x75\x65\x3a\x25\x73\x20\x76\x61\x6c\x75\x65\x3a\x25\x73\x20\x63\x6f\x6e\x66\x69\x67\x5f\x66\x69\x6c\x65\x3a\x25\x73" "\n"
,item->key,item->value,value,config_file);return RESULT_SUCCESS;}if(strstr(
-config_file,"\x75\x73\x65\x72")){if((0x1adf+887-0x1e55)==item->update_flag){
+config_file,"\x75\x73\x65\x72")){if((0x366+6518-0x1cdb)==item->update_flag){
printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x6e\x76\x75\x70\x64\x61\x74\x65\x20\x73\x65\x63\x6f\x6e\x64\x20\x63\x68\x61\x6e\x67\x65\x3a\x69\x74\x65\x6d\x2d\x3e\x6b\x65\x79\x3a\x25\x73\x20\x69\x74\x65\x6d\x2d\x3e\x76\x61\x6c\x75\x65\x3a\x25\x73\x20\x76\x61\x6c\x75\x65\x3a\x25\x73\x20\x63\x6f\x6e\x66\x69\x67\x5f\x66\x69\x6c\x65\x3a\x25\x73" "\n"
,item->key,item->value,value,config_file);}else{item->update_flag=
-(0x1280+1768-0x1967);printf(
+(0x1f23+1956-0x26c6);printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x6e\x76\x75\x70\x64\x61\x74\x65\x20\x75\x73\x65\x72\x73\x6b\x69\x70\x3a\x69\x74\x65\x6d\x2d\x3e\x6b\x65\x79\x3a\x25\x73\x20\x69\x74\x65\x6d\x2d\x3e\x76\x61\x6c\x75\x65\x31\x3a\x25\x73\x20\x76\x61\x6c\x75\x65\x3a\x25\x73\x20\x63\x6f\x6e\x66\x69\x67\x5f\x66\x69\x6c\x65\x3a\x25\x73" "\n"
,item->key,item->value,value,config_file);return RESULT_SUCCESS;}}printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x6b\x65\x79\x3d\x25\x73\x20\x63\x68\x61\x6e\x67\x65\x20\x76\x61\x6c\x75\x65\x3a\x25\x73\x20\x74\x6f\x20\x76\x61\x6c\x75\x65\x3d\x25\x73\x20" "\n"
,item->key,item->value,value);free(item->value);item->value=(char*)malloc(
value_buf_len);if(!item->value)return RESULT_MALLOC_FAIL;strncpy(item->value,
-value,value_buf_len-(0x50b+821-0x83f));item->value[value_buf_len-
-(0x15dd+3361-0x22fd)]='\0';item->update_flag=(0x465+7676-0x2260);return
+value,value_buf_len-(0x2f0+7223-0x1f26));item->value[value_buf_len-
+(0xced+6218-0x2536)]='\0';item->update_flag=(0xd9+8465-0x21e9);return
RESULT_SUCCESS;}newItem=(T_NV_ITEM*)malloc(sizeof(T_NV_ITEM));if(!newItem){
printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x52\x45\x53\x55\x4c\x54\x5f\x4d\x41\x4c\x4c\x4f\x43\x5f\x46\x41\x49\x4c\x31\x20" "\n"
);return RESULT_MALLOC_FAIL;}newItem->key=(char*)malloc(strlen(key)+
-(0x10c+8803-0x236e));if(!newItem->key){free(newItem);printf(
+(0xbb3+3338-0x18bc));if(!newItem->key){free(newItem);printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x52\x45\x53\x55\x4c\x54\x5f\x4d\x41\x4c\x4c\x4f\x43\x5f\x46\x41\x49\x4c\x32" "\n"
);return RESULT_MALLOC_FAIL;}newItem->value=(char*)malloc(value_buf_len);if(!
newItem->value){free(newItem->key);free(newItem);printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x52\x45\x53\x55\x4c\x54\x5f\x4d\x41\x4c\x4c\x4f\x43\x5f\x46\x41\x49\x4c\x33\x20" "\n"
);return RESULT_MALLOC_FAIL;}strncpy(newItem->key,key,key_buf_len-
-(0xebf+1478-0x1484));newItem->key[key_buf_len-(0x1eb7+225-0x1f97)]='\0';strncpy(
-newItem->value,value,value_buf_len-(0x9ca+1274-0xec3));newItem->value[
-value_buf_len-(0x13d+4777-0x13e5)]='\0';newItem->next=NULL;newItem->saveFlag=
-saveFlag;newItem->update_flag=(0x1a25+2722-0x24c6);printf(
+(0x990+5357-0x1e7c));newItem->key[key_buf_len-(0x665+5789-0x1d01)]='\0';strncpy(
+newItem->value,value,value_buf_len-(0x1819+248-0x1910));newItem->value[
+value_buf_len-(0x1249+3460-0x1fcc)]='\0';newItem->next=NULL;newItem->saveFlag=
+saveFlag;newItem->update_flag=(0x456+5565-0x1a12);printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x61\x64\x64\x20\x6b\x65\x79\x3d\x25\x73\x2c\x20\x76\x61\x6c\x75\x65\x3d\x25\x73\x20" "\n"
,newItem->key,newItem->value);if(!list->nvTable[index])list->nvTable[index]=
newItem;else{newItem->next=list->nvTable[index]->next;list->nvTable[index]->next
=newItem;}return RESULT_SUCCESS;}return RESULT_FAIL;}int reloadFactroyParam(
T_NV_NODE*list){char*val=NULL;FILE*fp=NULL;T_NV_CONFIG*config=NULL;char buf[
-NV_MAX_ITEM_LEN]={(0xc30+6083-0x23f3)};printf(
+NV_MAX_ITEM_LEN]={(0x1b5f+1247-0x203e)};printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x72\x65\x6c\x6f\x61\x64\x46\x61\x63\x74\x72\x6f\x79\x50\x61\x72\x61\x6d\x20\x6e\x76\x46\x69\x6c\x65\x3a\x25\x73" "\n"
,list->nvFile);for(config=list->fileList;config;config=config->next){printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x72\x65\x6c\x6f\x61\x64\x46\x61\x63\x74\x72\x6f\x79\x50\x61\x72\x61\x6d\x20\x63\x6f\x6e\x66\x69\x67\x46\x69\x6c\x65\x20\x73\x74\x61\x72\x74\x3a\x25\x73\x21" "\n"
,config->configFile);fp=fopen(config->configFile,"\x72\x6f");if(!fp){printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x6f\x70\x65\x6e\x20\x25\x73\x20\x66\x69\x6c\x65\x20\x66\x61\x69\x6c\x20\x65\x72\x72\x6e\x6f\x20\x3d\x20\x25\x64\x21" "\n"
,config->configFile,errno);return RESULT_FILE_OPEN_FAIL;}while(fgets(buf,
-NV_MAX_ITEM_LEN,fp)){if(buf[(0x8a1+6770-0x2313)]=='\n'||buf[(0x3ca+5804-0x1a76)]
-==((char)(0xd60+736-0x101d)))continue;val=strchr(buf,
-((char)(0x1979+1893-0x20a1)));if(!val){printf(
+NV_MAX_ITEM_LEN,fp)){if(buf[(0x1d54+38-0x1d7a)]=='\n'||buf[(0xe01+639-0x1080)]==
+((char)(0x263+1910-0x9b6)))continue;val=strchr(buf,((char)(0x543+1228-0x9d2)));
+if(!val){printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x65\x72\x72\x6f\x72\x3a\x25\x73\x20\x66\x69\x6c\x65\x20\x66\x6f\x72\x6d\x61\x74\x20\x65\x72\x72\x6f\x72\x3a\x73\x74\x72\x69\x6e\x67\x20\x3d\x20\x25\x73" "\n"
-,config->configFile,buf);continue;}buf[strlen(buf)-(0x8ca+1543-0xed0)]='\0';*val
-++='\0';nvupdate(list->nvFile,config->configFile,buf,val,(0x9d4+653-0xc60));}
-printf(
+,config->configFile,buf);continue;}buf[strlen(buf)-(0x16b+4876-0x1476)]='\0';*
+val++='\0';nvupdate(list->nvFile,config->configFile,buf,val,(0x75a+7588-0x24fd))
+;}printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x72\x65\x6c\x6f\x61\x64\x46\x61\x63\x74\x72\x6f\x79\x50\x61\x72\x61\x6d\x20\x63\x6f\x6e\x66\x69\x67\x46\x69\x6c\x65\x20\x65\x6e\x64\x3a\x25\x73\x21" "\n"
,config->configFile);fclose(fp);}return RESULT_SUCCESS;}void dump_list(T_NV_ITEM
*list){if(list==NULL){printf(
@@ -106,11 +105,11 @@
list->next;while(p!=NULL){printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x64\x75\x6d\x70\x20\x6b\x65\x79\x3d\x25\x73\x2c\x20\x76\x61\x6c\x75\x65\x3d\x25\x73\x2c\x20\x70\x3d\x30\x78\x25\x78" "\n"
,p->key,p->value,((unsigned int)p));p=p->next;}}int delete_not_needed(T_NV_NODE*
-list){int index=(0x1051+2140-0x18ad);T_NV_ITEM*item=NULL;T_NV_ITEM head={
-(0x16f9+1283-0x1bfc)};T_NV_ITEM*prev=&head;printf(
+list){int index=(0x197+7483-0x1ed2);T_NV_ITEM*item=NULL;T_NV_ITEM head={
+(0x21c1+57-0x21fa)};T_NV_ITEM*prev=&head;printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x64\x65\x6c\x65\x74\x65\x5f\x6e\x6f\x74\x5f\x6e\x65\x65\x64\x65\x64\x20\x65\x6e\x74\x65\x72\x20\x2a\x2a\x2a" "\n"
-);for(index=(0xc70+2727-0x1717);index<NV_HASH_LEN;index++){head.next=list->
-nvTable[index];prev=&head;for(item=prev->next;item;){if((0xda8+5426-0x22d9)==
+);for(index=(0x1d1c+2424-0x2694);index<NV_HASH_LEN;index++){head.next=list->
+nvTable[index];prev=&head;for(item=prev->next;item;){if((0x1b62+698-0x1e1b)==
item->update_flag){prev=item;item=item->next;}else{printf(
"\x6e\x76\x73\x65\x72\x76\x65\x72\x20\x64\x65\x6c\x65\x74\x65\x20\x6b\x65\x79\x3d\x25\x73\x2c\x20\x76\x61\x6c\x75\x65\x3d\x25\x73\x20" "\n"
,item->key,item->value);prev->next=item->next;free(item->key);free(item->value);
diff --git a/ap/app/zte_comm/nvserver/sc_rpc.h b/ap/app/zte_comm/nvserver/sc_rpc.h
index 58dc960..e49be97 100755
--- a/ap/app/zte_comm/nvserver/sc_rpc.h
+++ b/ap/app/zte_comm/nvserver/sc_rpc.h
@@ -17,7 +17,8 @@
enum
{
RPC_MSG_TYPE_REQUEST = 0xAA,
- RPC_MSG_TYPE_REPLY = 0xBB
+ RPC_MSG_TYPE_REPLY = 0xBB,
+ RPC_MSG_TYPE_READY = 0x55
};
enum