From 9b7ce05eb4b8213f1ba0b9a1c51dff223fcfc689 Mon Sep 17 00:00:00 2001 From: pandx Date: Wed, 23 Oct 2024 09:22:06 +0800 Subject: [PATCH] adjust file include. --- common/common_func.cpp | 198 +++++++++++++-------------- dbaccess/sql_db.cpp | 2 +- jsonparse/mqtt_cmd_parse.cpp | 2 +- jsonparse/web_cmd_parse.cpp | 2 +- jsonparse/web_cmd_parse2.cpp | 2 +- jsonparse/web_cmd_parse3.cpp | 2 +- localserver/mqtt_cmd.cpp | 2 +- {minilzo-2.10 => minilzo}/COPYING | 0 {minilzo-2.10 => minilzo}/README.LZO | 0 {minilzo-2.10 => minilzo}/lzoconf.h | 0 {minilzo-2.10 => minilzo}/lzodefs.h | 0 {minilzo-2.10 => minilzo}/minilzo.c | 0 {minilzo-2.10 => minilzo}/minilzo.h | 0 mqttclient/mqtt_client.cpp | 7 +- mqttclient/mqtt_client.h | 2 +- platform/platform_init.cpp | 9 +- threadfunc/check_thread.cpp | 11 +- threadfunc/thread_func.cpp | 13 +- threadfunc/thread_func.hpp | 14 +- uart/uart.cpp | 2 +- uart/uart.hpp | 8 +- utility/calculation.hpp | 7 +- utility/md5.h | 4 +- utility/search_dev.cpp | 5 +- utility/secure.hpp | 6 +- utility/udp_scan.cpp | 6 +- wifi/subdir.mk | 31 ----- {dial5G => wifi_5g}/dial.cpp | 3 +- {dial5G => wifi_5g}/dial.h | 2 +- {dial5G => wifi_5g}/subdir.mk | 0 {wifi => wifi_5g}/wpa_client.cpp | 0 {wifi => wifi_5g}/wpa_client.h | 0 32 files changed, 152 insertions(+), 188 deletions(-) rename {minilzo-2.10 => minilzo}/COPYING (100%) rename {minilzo-2.10 => minilzo}/README.LZO (100%) rename {minilzo-2.10 => minilzo}/lzoconf.h (100%) rename {minilzo-2.10 => minilzo}/lzodefs.h (100%) rename {minilzo-2.10 => minilzo}/minilzo.c (100%) rename {minilzo-2.10 => minilzo}/minilzo.h (100%) delete mode 100644 wifi/subdir.mk rename {dial5G => wifi_5g}/dial.cpp (99%) rename {dial5G => wifi_5g}/dial.h (96%) rename {dial5G => wifi_5g}/subdir.mk (100%) rename {wifi => wifi_5g}/wpa_client.cpp (100%) rename {wifi => wifi_5g}/wpa_client.h (100%) diff --git a/common/common_func.cpp b/common/common_func.cpp index 6e36a3c..72fcec2 100644 --- a/common/common_func.cpp +++ b/common/common_func.cpp @@ -43,7 +43,7 @@ string GetLocalTimeWithMs(void) { char buffer[80] = {0}; struct tm nowTime; - localtime_r(&curTime.tv_sec, &nowTime); //闁硅泛锕ょ欢閬嶅礆閹殿喗鐣遍柛濠勫帶閻°劑宕楅妷銈咁槻闁哄啳娉涢崹搴ㄦ煀瀹ュ洦鐣遍柛鎰噹閻°劍绋夐銊х缂佹崘娉曢埢鑲┾偓鐟邦槸閸欙拷 + localtime_r(&curTime.tv_sec, &nowTime); //闂佺娉涢敃銈囨闁秴绀嗛柟娈垮枟閻ｉ亶鏌涙繝鍕付闁宦板姂瀹曟濡烽妶鍜佹Щ闂佸搫鍟冲▔娑㈠垂鎼淬劍鐓€鐎广儱娲﹂悾閬嶆煕閹邦剚鍣归柣掳鍔嶇粙澶愵敇閵娧咁槷缂備焦宕樺▔鏇㈠煝閼测斁鍋撻悷閭︽Ц闁告瑱鎷� strftime(buffer, sizeof(buffer), "%Y%m%d%H%M%S", &nowTime); char currentTime[84] = {0}; @@ -139,19 +139,19 @@ std::string convertEncoding(const std::string &input, const char *fromEncoding, void InitGpio(unsigned int gpioN, unsigned int inout) { int fd = 0; char tmp[100] = {0}; - //闁瑰灚鎸哥槐鎱籶io閻犱焦鍎抽ˇ顒勫棘閸ワ附顐� + //闂佺懓鐏氶幐鍝ユ閹辩倍io闁荤姳鐒﹂崕鎶剿囬鍕闁搞儻闄勯锟� fd = open("/sys/class/gpio/export", O_WRONLY); if (-1 == fd) { printf("[%s]:[%d] open gpio export file error\r\n", __FUNCTION__, __LINE__); } - //闁汇垹鐤囬鐞痯io + //闂佹眹鍨归悿鍥敋閻炵棷io sprintf(tmp, "%d", gpioN); if (write(fd, tmp, strlen(tmp)) < 0) { printf("write file operation error %s\r\n", tmp); } close(fd); sleep(1); -//闂佹澘绉堕悿鍞僷io闁哄倻鎳撻幃锟� +//闂備焦婢樼粔鍫曟偪閸炲兎io闂佸搫鍊婚幊鎾诲箖閿燂拷 #ifdef G2UL_GATEWAY char tmp2[100] = {0}; if (gpioN == 507) @@ -253,14 +253,14 @@ int gpio_set(unsigned int gpioN, char x) { #endif // printf("%s\r\n",tmp); // print_info("set GPIO = %s\n",tmp); - //闁瑰灚鎸哥槐鎱籶io value闁哄倸娲ｅ▎锟� + //闂佺懓鐏氶幐鍝ユ閹辩倍io value闂佸搫鍊稿ú锝呪枎閿燂拷 fd = open(tmp, O_WRONLY); if (-1 == fd) { print_red("[%s]:[%d][%s] open gpio export file error\r\n", __FUNCTION__, __LINE__, tmp); close(fd); return (-1); // exit(1); } - //閻犱礁澧介悿鍡涙偨闂堟盯鎸� + //闁荤姳绀佹晶浠嬫偪閸℃稒鍋ㄩ梻鍫熺洴閹革拷 if (x) { if (-1 == write(fd, "1", sizeof("1"))) { print_red("[%s]:[%d] %d write operation value error\r\n", __FUNCTION__, __LINE__, gpioN); @@ -320,13 +320,13 @@ int gpio_read(unsigned int gpioN) { #else if IMX6UL_GATEWAY sprintf(tmp, "/sys/class/gpio/gpio%d/value", gpioN); #endif - //闁瑰灚鎸哥槐鎱籶io value闁哄倸娲ｅ▎锟� + //闂佺懓鐏氶幐鍝ユ閹辩倍io value闂佸搫鍊稿ú锝呪枎閿燂拷 fd = open(tmp, O_RDONLY); if (-1 == fd) { print_red("[%s]:[%d] %d open gpio export file error\r\n", __FUNCTION__, __LINE__, gpioN); return (-1); // exit(1); } - //閻犲洩顕цぐ锟� value闁哄倸娲ｅ▎锟� + //闁荤姴娲╅褑銇愰敓锟� value闂佸搫鍊稿ú锝呪枎閿燂拷 if (-1 == read(fd, &value, sizeof(value))) { print_red("[%s]:[%d] %d read gpiovalue is fail\r\n", __FUNCTION__, __LINE__, gpioN); close(fd); @@ -339,7 +339,7 @@ int gpio_read(unsigned int gpioN) { int CheckFileVersion(int argc, char **argv) { std::string strVersion = GlobalConfig::Version; - int optionchar; /*闂侇偄顦甸妴宥団偓娑欘殣閹凤拷??*/ + int optionchar; /*闂備緡鍋勯ˇ鐢稿Υ瀹ュ洠鍋撳☉娆樻闁瑰嚖鎷�??*/ if (argc >= 2) { if (strcmp(argv[1], "--debugmode") == 0) { GlobalConfig::RUN_MODE = 1; @@ -541,14 +541,14 @@ std::string GetRTC(char *timestamp, int &millisecond) { printf("RTC date/time is %d-%d-%d, %02d:%02d:%02d\n", rtc_tm.tm_year + 1900, rtc_tm.tm_mon + 1, rtc_tm.tm_mday, rtc_tm.tm_hour, rtc_tm.tm_min, rtc_tm.tm_sec); sprintf(rtcTime, "%d-%d-%d, %02d:%02d:%02d", rtc_tm.tm_year + 1900, rtc_tm.tm_mon + 1, rtc_tm.tm_mday, rtc_tm.tm_hour, rtc_tm.tm_min, rtc_tm.tm_sec); - // 閻忓繐鏁僼c_time缂備焦鎸婚悗顖涙媴閹捐绁柟璇℃線鐠愮劎ime_t闁哄啫鐖煎Λ鍧楀箣閿燂拷 + // 闁诲繐绻愰弫鍍糲_time缂傚倷鐒﹂幐濠氭倵椤栨稒濯撮柟鎹愵潐缁侇噣鏌熺拠鈩冪窔閻犳劗鍔巌me_t闂佸搫鍟悥鐓幬涢崸妤€绠ｉ柨鐕傛嫹 tm.tm_year = rtc_tm.tm_year; tm.tm_mon = rtc_tm.tm_mon; tm.tm_mday = rtc_tm.tm_mday; tm.tm_hour = rtc_tm.tm_hour; tm.tm_min = rtc_tm.tm_min; tm.tm_sec = rtc_tm.tm_sec; - tm.tm_isdst = -1; // 濞戞挸绉虫繛鍥偨閵娿儺妲惧ù鐘€栧锟� + tm.tm_isdst = -1; // 婵炴垶鎸哥粔铏箾閸ヮ剚鍋ㄩ柕濞垮労濡叉儳霉閻橆喖鈧牕顪冮敓锟� rtc_timestamp = mktime(&tm); @@ -755,8 +755,8 @@ void ImportConfig(std::string filename) { } } int UpdataDataNodeConfig(std::string filename) { - vector vecDataNode; //濠㈠湱澧楀Σ鎴炵▔閳ь剚绋夐鍕憻缂佹缂氱憰鍡涘触閹达箑娅� - //濞寸姰鍎撮浼村礂閵夛附鐓欑€殿喖绻戞晶锕€顕ｉ埀顒勫棘閸ワ附顐� + vector vecDataNode; //婵犮垹婀辨晶妤€危閹寸偟鈻旈柍褜鍓氱粙澶愵敂閸曨厽鎲荤紓浣诡殣缂傛氨鎲伴崱娑樿Е闁硅揪绠戝▍锟� + //婵炲濮伴崕鎾敋娴兼潙绀傞柕澶涢檮閻撴瑧鈧鍠栫换鎴炴櫠閿曗偓椤曪綁鍩€椤掑嫬妫橀柛銉檮椤愶拷 ifstream csv_data(filename, ios::in); int iRet = 0; if (!csv_data.is_open()) { @@ -765,16 +765,16 @@ int UpdataDataNodeConfig(std::string filename) { } else { string line; - vector words; //濠㈠湱澧楀Σ鎴炵▔閳ь剚绋夐鍕憻缂佹缂氱憰鍡涘触閹达箑娅� + vector words; //婵犮垹婀辨晶妤€危閹寸偟鈻旈柍褜鍓氱粙澶愵敂閸曨厽鎲荤紓浣诡殣缂傛氨鎲伴崱娑樿Е闁硅揪绠戝▍锟� string word; DataNodeInfo dataNode; - // ------------閻犲洩顕цぐ鍥极閻楀牆绁�----------------- - // 閻犲洩顕цぐ鍥冀閸ヮ剦鏆悶娑虫嫹 + // ------------闁荤姴娲╅褑銇愰崶顒€鏋侀柣妤€鐗嗙粊锟�----------------- + // 闁荤姴娲╅褑銇愰崶顒€鍐€闁搞儺鍓﹂弳顖炴偠濞戣櫕瀚� getline(csv_data, line); istringstream sin; - // 闁圭ǹ顦抽、鎴犳嫚鐠囨彃绲块柡浣哄瀹擄拷 + // 闂佸湱枪椤︽娊銆侀幋鐘冲珰閻犲洦褰冪徊鍧楁煛娴ｅ搫顣肩€规搫鎷� while (getline(csv_data, line)) { words.clear(); sin.clear(); @@ -1099,7 +1099,7 @@ extern void ZoneConfig(std::string zoneid) { std::string GetFileContent(std::string filename, int line) { std::string strFileContent(""); std::ifstream ifileOut(filename.c_str()); - if (ifileOut.is_open()) { //闁哄倸娲ｅ▎銏ゅ箥閹惧磭纾� + if (ifileOut.is_open()) { //闂佸搫鍊稿ú锝呪枎閵忋倕绠ラ柟鎯х－绾撅拷 int i = 1; while (!ifileOut.eof()) { if (line == 0) { @@ -1123,7 +1123,7 @@ std::string GetFileContent(std::string filename, int line) { return strFileContent; } -// BOOST闁烩偓鍔嶉婊堝礆濞嗘帇鈧啯娼忛幆褏纭€濡ょ姴鐭侀惁濉眕闁革附婢樺鍐触閸喓銆� +// BOOST闂佺儵鍋撻崝宥夘敆濠婂牆绀嗘繛鍡樺竾閳ь剙鍟蹇涘箚瑜忕涵鈧俊銈囧Т閻線鎯佹繅鐪曢梺闈╅檮濠㈡ê顭囬崘顔艰Е闁割偆鍠撻妴锟� bool CheckIP(const char *ip) { boost::xpressive::cregex reg_ip = boost::xpressive::cregex::compile("(25[0-4]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[1-9])[.](25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])[.](25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])[.](25[0-4]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[1-9])"); @@ -1133,20 +1133,20 @@ bool CheckIP(const char *ip) { bool IsValidMask(std::string mask) { int iRet = -1; - // 閻忓繐鎹凱闁革附婢樺鍐偨閹典讲鍋撳⿰鍛化闁告帒妫楀畷鍕交濞戞ê鐓戦柍銉︾箚濞村棝骞戦姀鈥崇亣 闁炽儲绮堢花鈺傛交濞戞ê鐓戦柡浣哥摠閺嗙喖鍨鹃敓锟� + // 闁诲繐绻愰幑鍑遍梺闈╅檮濠㈡ê顭囬崘顔藉仺闁瑰吀璁查崑鎾斥堪閸涱厺鍖栭梺鍛婂笒濡鐣烽崟顒佷氦婵炴垶锚閻撴垿鏌嶉妷锔剧畾婵炴潙妫濋獮鎴﹀閳ュ磭浜� 闂佺偨鍎茬划鍫㈣姳閳哄倹浜ゆ繛鎴灻悡鎴︽煛娴ｅ摜鎽犻柡鍡欏枛閸ㄩ箖鏁撻敓锟� struct in_addr s; iRet = inet_pton(AF_INET, mask.c_str(), &s); - // 閺夌儐鍓氬畷鏌ュ箣閹邦剙顫犻弶鈺傛煥濞诧拷1闁挎稑鐭侀鈺呭及鎼淬垺笑闁哄牆顦伴弲銉╂儍閸戭毝闁革附婢樺锟� + // 闁哄鍎愰崜姘暦閺屻儱绠ｉ柟閭﹀墮椤娀寮堕埡鍌涚叆婵炶鎷�1闂佹寧绋戦惌渚€顢氶埡鍛強閹兼番鍨虹瑧闂佸搫鐗嗛ˇ浼村疾閵夆晜鍎嶉柛鎴瘽闂侀潻闄勫妯侯焽閿燂拷 if (iRet == 1) { - // 濞寸姴娴风紞澶岀磼濠婂啰鎽熼柤鍝勫€块妴搴㈡償韫囨碍绁柟璇℃線鐠愮喐绋夌紒妯荤皻閻庢稒顨夋俊顓熴亜閸濆嫮纰� + // 婵炲濮村ù椋庣礊婢跺瞼纾兼繝濠傚暟閹界喖鏌ら崫鍕偓鍧楀Υ鎼淬垺鍎熼煫鍥ㄧ缁侇噣鏌熺拠鈩冪窔閻犳劗鍠愮粙澶岀磼濡崵鐨婚柣搴㈢⊕椤ㄥ淇婇鐔翠簻闁告繂瀚喊锟� unsigned int addr = ntohl(s.s_addr); - // 閺夌儐鍓氬畷鍙夌▔鏉炴壆鐧岄弶鈺傜☉閸╂鈧稒顨堥浣圭▔閿燂拷 + // 闁哄鍎愰崜姘暦閸欏鈻旈弶鐐村閻у矂寮堕埡鍌溾槈闁糕晜顨堥埀顒佺⊕椤ㄥ牓顢栨担鍦枖闁跨噦鎷� std::bitset<32> b((int)addr); std::string strMask = b.to_string(); - // 闁哄被鍎叉竟妯荤瀹€鍐闁告帟娉涢悺褏绮敂鑳洬濞戞搩鍘惧▓锟�"01"闁挎稑鑻々褔寮稿⿰鈧粭澶屸偓娑櫭﹢顏堟晬瀹€鍐惧殯闁哄嫬瀛╁Σ鎼佸嫉婢跺娅忛柣銊ュ閻℃瑧绱旈幋鐐茶礋闁活噯鎷� + // 闂佸搫琚崕鍙夌珶濡崵顩茬€光偓閸愵亞顔掗梺鍛婂笩濞夋盯鎮鸿缁參鏁傞懗顖ｆ船婵炴垶鎼╅崢鎯р枔閿燂拷"01"闂佹寧绋戦懟顖炪€呰瀵ǹ饪伴埀顒傜箔婢跺备鍋撳☉娅亜锕㈤鍫熸櫖鐎光偓閸愭儳娈梺鍝勫鐎涒晛危閹间礁瀚夊璺侯儐濞呭繘鏌ｉ妸銉ヮ仼闁烩剝鐟х槐鏃堝箣閻愯尪绀嬮梺娲诲櫙閹凤拷 return (strMask.find("01") == std::string::npos); } @@ -1283,22 +1283,22 @@ std::string GetSysStatus() { return strJson; } -// 閻忓繐妫楀畷鐔哥▔閿燂拷16閺夆晜绋戦崺妤冣偓娑欘殘椤戜焦娼浣稿簥濞戞挸鎼顔芥償閺冨倹鐣遍悗娑欘殙婵☆參宕愰敓锟� +// 闁诲繐绻愬Λ妤€鐣烽悢鍝モ枖闁跨噦鎷�16闁哄鏅滅粙鎴﹀春濡ゅ啠鍋撳☉娆樻畼妞ゆ垳鐒﹀顏堫敆娴ｇǹ绨ユ繛鎴炴尭閹碱偊顢氶鑺ュ劅闁哄啫鍊归悾閬嶆倵濞戞瑯娈欏┑鈽嗗弮瀹曟劙鏁撻敓锟� unsigned char hexCharToByte(char c) { if (c >= '0' && c <= '9') return c - '0'; if (c >= 'A' && c <= 'F') return c - 'A' + 10; if (c >= 'a' && c <= 'f') return c - 'a' + 10; - return 0; // 閻庣敻鈧稓鑹鹃柡鍐У閺呫儵鎯冮崟顐ゆ憻缂佹璁ｇ槐婵囨交閺傛寧绀€0 + return 0; // 闁诲海鏁婚埀顒佺〒閼归箖鏌￠崘顏勑ｉ柡鍛劦閹啴宕熼銈嗘喕缂備焦顨愮拋锝囨濠靛洦浜ら柡鍌涘缁€鈧�0 } -// 閻忓骏鎷�16閺夆晜绋戦崺妤冣偓娑欘殘椤戜焦绋夐懠鑸电ギ闁硅婢€鐠愮喓鈧稒顨夋俊顓㈠极閹殿喚鐭� +// 闁诲繐楠忛幏锟�16闁哄鏅滅粙鎴﹀春濡ゅ啠鍋撳☉娆樻畼妞ゆ垳鐒︾粙澶愭嚑閼哥數銈梺纭咁嚃濠⑩偓閻犳劗鍠撻埀顒佺⊕椤ㄥ淇婇銏犳瀬闁规鍠氶惌锟� int hexStringToBytes(const char *hexStr, unsigned char *bytes, size_t bytesSize) { size_t hexLen = strlen(hexStr); if (hexLen % 2 != 0) { - return -1; // Hex閻庢稒顨堥浣圭▔閺屻儲姣愰幖杈剧畱缁ㄨ尙鎷犻妷锔叫﹂柛瀣煐閺嗭拷 + return -1; // Hex闁诲孩绋掗〃鍫ヮ敄娴ｅ湱鈻旈柡灞诲劜濮ｆ劙骞栨潏鍓х暠缂併劏灏欓幏鐘诲Ψ閿斿彨锕傛煕鐎ｎ厼鐓愰柡鍡嫹 } if (bytesSize < hexLen / 2) { - return -1; // 閻庢稒顨夋俊顓㈠极閹殿喚鐭嬮柣銊ュ閵囧洨浜歌箛搴ｇ憹閻℃帒鍘栨禍鎺斺偓鐟版贡閹惧吋娼浣稿簥闁告艾娴峰▓鎴犫偓娑欘殙婵★拷 + return -1; // 闁诲孩绋掗〃澶嬩繆椤撱垹鏋侀柟娈垮枤閻鏌ｉ妸銉ヮ仼闁靛洤娲ㄦ禍姝岀疀鎼达絿鎲归柣鈩冨笒閸樻牗绂嶉幒鏂哄亾閻熺増璐￠柟鎯у悑濞碱亪顢楁担绋跨哎闂佸憡鑹惧ù宄扳枔閹寸姭鍋撳☉娆樻畽濠碘槄鎷� } for (size_t i = 0; i < hexLen; i += 2) { @@ -1307,7 +1307,7 @@ int hexStringToBytes(const char *hexStr, unsigned char *bytes, size_t bytesSize) bytes[i / 2] = (highNibble << 4) | lowNibble; } - return 0; // 闁瑰瓨鍔曟慨锟� + return 0; // 闂佺懓鐡ㄩ崝鏇熸叏閿燂拷 } void stringToHex(const char *str, char *hexStr) { @@ -1324,13 +1324,13 @@ void hexToAscii(const char *hexStr, char *asciiStr) { int i, j = 0; for (i = 0; i < len; i += 2) { - // 閻犲洩顕цぐ鍥ㄧ▔閵堝嫰鍤嬮悗娑欘殘椤戜線鐛捄铏规闁稿繑鍎煎ù鍡涘箲椤叀绀嬮柡浣哥摠閺嗭拷 + // 闁荤姴娲╅褑銇愰崶銊р枖闁靛牆瀚伴崵瀣倵濞戞瑯娈樻い鎴滅窔閻涱喚鎹勯搹瑙勵啈闂佺ǹ绻戦崕鐓幟归崱娑樼妞ゎ偒鍙€缁€瀣煛娴ｅ摜鎽犻柡鍡嫹 int byte; sscanf(&hexStr[i], "%2x", &byte); - // 閻忓繐妫欓弳锝夊极閹峰本绁柟璇℃線鐠愮喓鈧數鎳撶花鏌ユ儍閸戞┎CII閻庢稒顨堥锟� + // 闁诲繐绻愬Λ娆撳汲閿濆鏋侀柟宄版湰缁侇噣鏌熺拠鈩冪窔閻犳劗鍠撻埀顒傛暩閹虫挾鑺遍弻銉﹀剭闁告垶鈹嶤II闁诲孩绋掗〃鍫ヮ敄閿燂拷 asciiStr[j++] = (char)byte; } - // 婵烇綀顕ф慨鐐碘偓娑欘殘椤戜焦绋夐懠顒傛尝闁哄鍠撻锟� + // 濠电儑缍€椤曆勬叏閻愮鍋撳☉娆樻畼妞ゆ垳鐒︾粙澶愭嚑椤掑倹灏濋梺鍝勵槺閸犳捇顢栭敓锟� asciiStr[j] = '\0'; } @@ -1377,7 +1377,7 @@ void swap(char *data) { int OpenWatchDog() { int fd = -1; InitGpio(GlobalConfig::GPIO_G.hardWatchDog, 1); - gpio_set(GlobalConfig::GPIO_G.hardWatchDog, 1); //濡ゅ倹顭囬弫鎼佺嵁閾忣偅绠掗柡渚婃嫹 + gpio_set(GlobalConfig::GPIO_G.hardWatchDog, 1); //婵°倕鍊归…鍥极閹间胶宓侀柧蹇ｅ亝缁犳帡鏌℃笟濠冨 if (0 > (fd = open("/dev/watchdog", O_WRONLY))) { print_info("Failed:Open /dev/watchdog"); } @@ -1438,7 +1438,7 @@ string GetOneContent(const char *szData, int nRow, const char *szSeparate) { int set_opt(int fd, int nSpeed, int nBits, char nEvent, int nStop) { struct termios newtio, oldtio; - if (tcgetattr(fd, &oldtio) != 0) { //婵☆偀鍋撴繛鏉戭儎鐟曞棝宕ｉ敐鍡樞﹂柛姘剧畱瑜版煡鎮介敓锟� + if (tcgetattr(fd, &oldtio) != 0) { //濠碘槅鍋€閸嬫挻绻涢弶鎴剮閻熸洖妫濆畷锝夋晲閸℃锕傛煕濮樺墽鐣辩憸鐗堢叀閹粙鏁撻敓锟� perror("SetupSerial 1"); return -1; } @@ -1446,13 +1446,13 @@ int set_opt(int fd, int nSpeed, int nBits, char nEvent, int nStop) { newtio.c_cflag |= CLOCAL | CREAD; newtio.c_cflag &= ~CSIZE; - switch (nBits) //閻犱礁澧介悿鍡涘极閻楀牆绁﹀ù锝忔嫹 + switch (nBits) //闁荤姳绀佹晶浠嬫偪閸℃稑鏋侀柣妤€鐗嗙粊锕€霉閿濆繑瀚� { case 7: newtio.c_cflag |= CS7; break; case 8: newtio.c_cflag |= CS8; break; } - switch (nEvent) //閻犱礁澧介悿鍡椢涢埀顒侇殽鐏炶偐绉� + switch (nEvent) //闁荤姳绀佹晶浠嬫偪閸℃あ娑㈠焵椤掍緡娈介悘鐐跺亹缁夛拷 { case 'O': newtio.c_cflag |= PARENB; @@ -1467,7 +1467,7 @@ int set_opt(int fd, int nSpeed, int nBits, char nEvent, int nStop) { case 'N': newtio.c_cflag &= ~PARENB; break; } - switch (nSpeed) //閻犱礁澧介悿鍡椻枖閵忋垹顥楅柣婊愭嫹 + switch (nSpeed) //闁荤姳绀佹晶浠嬫偪閸℃せ鏋栭柕蹇嬪灩椤ユ鏌ｅ⿰鎰 { case 2400: cfsetispeed(&newtio, B2400); @@ -1494,14 +1494,14 @@ int set_opt(int fd, int nSpeed, int nBits, char nEvent, int nStop) { cfsetospeed(&newtio, B9600); break; } - if (nStop == 1) //閻犱礁澧介悿鍡涘磻濠婂嫷鍓惧ù锝忔嫹 + if (nStop == 1) //闁荤姳绀佹晶浠嬫偪閸℃稑纾绘繝濠傚閸撴儳霉閿濆繑瀚� newtio.c_cflag &= ~CSTOPB; else if (nStop == 2) newtio.c_cflag |= CSTOPB; newtio.c_cc[VTIME] = 0; newtio.c_cc[VMIN] = 0; tcflush(fd, TCIFLUSH); - if ((tcsetattr(fd, TCSANOW, &newtio)) != 0) //閻犱礁澧介悿鍡樼▔閹绘帒缍撻柛娆忓€归弳锟� + if ((tcsetattr(fd, TCSANOW, &newtio)) != 0) //闁荤姳绀佹晶浠嬫偪閸℃鈻旈柟缁樺笒缂嶆捇鏌涘▎蹇撯偓褰掑汲閿燂拷 { perror("com set error"); return -1; @@ -1522,11 +1522,11 @@ int getcsq() { } set_opt(fd, 115200, 8, 'N', 1); - // write(fd,"AT+QENG=\"servingcell\"\r\n",27);//鐎殿喒鍋撻柛姘煎灠閻ｇ偓鎷呴敓锟� + // write(fd,"AT+QENG=\"servingcell\"\r\n",27);//閻庢鍠掗崑鎾绘煕濮樼厧鐏犻柣锝囧亾閹峰懘鏁撻敓锟� write(fd, "AT+CSQ", 6); sleep(1); unsigned char rbuf[128] = {0x00}; - int len = read(fd, rbuf, sizeof(rbuf)); // 闁革负鍔嬬憰鍡涘矗閿濆牜鍤㈤柛蹇嬪劚閻⊙呯箔閿旇儻顩� + int len = read(fd, rbuf, sizeof(rbuf)); // 闂侀潻璐熼崝瀣啺閸℃稑鐭楅柨婵嗙墱閸ゃ垽鏌涜箛瀣姎闁烩姍鍛當闁挎棁鍎婚々锟� print_info("rbuf = %s,len = %d\n", rbuf, len); sleep(1); @@ -1716,16 +1716,16 @@ int writeIntValue(const char *section, char *key, int val, const char *file) { int getDiskInfo(char *diskTotal, char *diskFree) { DISK diskInfo; - /* 1.闁兼儳鍢茶ぐ锟�/home/濞戞挸顑夊浼存儍閸曨兘鍋撶拠宸晣闂佽鎷� */ + /* 1.闂佸吋鍎抽崲鑼躲亹閿燂拷/home/婵炴垶鎸搁澶婎焽娴煎瓨鍎嶉柛鏇ㄥ厴閸嬫挾鎷犲顔兼櫍闂備浇顕滈幏锟� */ statfs("/", &diskInfo); - unsigned long long blocksize = diskInfo.f_bsize; //婵絽绻嬮柌娓俵ock闂佹彃鑻€垫﹢宕ラ銈嗙暠閻庢稒顨夋俊顓㈠极閿燂拷 - unsigned long long totalsize = blocksize * diskInfo.f_blocks; //闁诡剝宕靛▓鎴犫偓娑欘殙婵☆參寮敮顔剧f_blocks濞戞挾顕猯ock闁汇劌瀚弳鐔兼儎閿燂拷 + unsigned long long blocksize = diskInfo.f_bsize; //濠殿噯绲界换瀣煂濞撲康ock闂備焦褰冮懟顖溾偓鍨耿瀹曘儵顢曢妶鍡欐殸闁诲孩绋掗〃澶嬩繆椤撱垹鏋侀柨鐕傛嫹 + unsigned long long totalsize = blocksize * diskInfo.f_blocks; //闂佽鍓濆畷闈涒枔閹寸姭鍋撳☉娆樻畽濠碘槅鍙冨顐ゆ暜椤斿墽顦甪_blocks婵炴垶鎸鹃鐚痮ck闂佹眹鍔岀€氼參寮抽悢鍏煎剮闁跨噦鎷� //printf("Total_size=%llu B =%llu KB =%llu MB = %llu GB\n",\ totalsize,totalsize>>10,totalsize>>20, totalsize>>30); - /* 2.闁兼儳鍢茶ぐ鍥ㄧ▔閳ь剚绋夌€ｎ亜鈷栧ù锝嗙懅閳规牠姊婚弶鎴炲闁告瑯鍨抽弫銈囩矚濞差亝锛熼柣銊ュ閵囧洨浜搁敓锟� */ - unsigned long long freeDisk = diskInfo.f_bfree * blocksize; //闁告挴鏅欑紞鎴犵矚濞差亝锛熼柣銊ュ閵囧洨浜搁敓锟� - unsigned long long availableDisk = diskInfo.f_bavail * blocksize; //闁告瑯鍨抽弫銈囩矚濞差亝锛熷鍫嗗啰姣� + /* 2.闂佸吋鍎抽崲鑼躲亹閸ャ劎鈻旈柍褜鍓氱粙澶屸偓锝庝簻閳锋牕霉閿濆棛鎳呴柍瑙勭墵濮婂寮堕幋鐐差伅闂佸憡鐟崹鎶藉极閵堝洨鐭氭繛宸簼閿涚喖鏌ｉ妸銉ヮ仼闁靛洤娲ㄦ禍鎼佹晸閿燂拷 */ + unsigned long long freeDisk = diskInfo.f_bfree * blocksize; //闂佸憡鎸撮弲娆戠礊閹寸姷鐭氭繛宸簼閿涚喖鏌ｉ妸銉ヮ仼闁靛洤娲ㄦ禍鎼佹晸閿燂拷 + unsigned long long availableDisk = diskInfo.f_bavail * blocksize; //闂佸憡鐟崹鎶藉极閵堝洨鐭氭繛宸簼閿涚喎顭块崼鍡楀暟濮ｏ拷 //printf("Disk_free=%llu MB =%llu GB Disk_available=%llu MB = %llu GB\n",\ freeDisk>>20,freeDisk>>30,availableDisk>>20, availableDisk>>30); sprintf(diskTotal, "%llu", totalsize >> 20); @@ -1739,8 +1739,8 @@ bool NetIsOk() { struct protoent *protocol; int i, recv_status; -#ifdef _USE_DNS //濠碘€冲€归悘澶屸偓瑙勭煯缁犵喓鎷犻妷銉ф殲闁挎稑鑻崹顖炲矗椤栨瑤绨板ù锝堟硶閺併倝宕洪悢閿嬪€抽弶鈺傜椤㈡垿宕氶妶鍡樼劷缂傚啯鍨圭划鑸垫交閻愭潙澶嶉柨娑樺缁躲儲淇婇崐鍍縲.baidu.com - /* 閻犱礁澧介悿鍡涙儎椤旂偓鐣遍柛锔芥緲濞煎啯绌遍埄鍐х礀 */ +#ifdef _USE_DNS //婵犵鈧啿鈧綊鎮樻径灞稿亾鐟欏嫮鐓紒鐘靛枔閹风娀濡烽妷褎娈查梺鎸庣☉閼活垶宕归鐐茬煑妞ゆ牗鐟ょ花鏉棵归敐鍫熺《闁轰降鍊濆畷娲偄闁垮鈧娊寮堕埡鍌滎灱妞ゃ垺鍨垮畷姘跺Χ閸℃鍔风紓鍌氬暞閸ㄥ湱鍒掗懜鍨氦闁绘劖娼欐径宥夋煥濞戞ê顨欑紒韬插劜娣囧﹪宕愰崓绺�.baidu.com + /* 闁荤姳绀佹晶浠嬫偪閸℃稒鍎庢い鏃傚亾閻ｉ亶鏌涢敂鑺ョ凡婵炵厧鍟粚閬嶅焺閸愌呯 */ char hostname[32]; sprintf(hostname, "%s", "www.baidu.com") bzero(&dest_addr, sizeof(dest_addr)); dest_addr.sin_family = AF_INET; @@ -1751,11 +1751,11 @@ bool NetIsOk() { } bcopy((char *)host->h_addr, (char *)&dest_addr.sin_addr, host->h_length); -#else //濠碘€冲€归悘澶嬬▔瀹ュ嫬鈻忛柣鈧妼閻撴瑩宕ュ蹇曠闁告帗鐟ヨぐ褔鎳楅悾灞炬殢ip闁革附婢樺鍐儎鐎涙ê澶嶉柛娆愬灴閳ь兛宸ヽmp闁告牕鎷戠槐锟� +#else //婵犵鈧啿鈧綊鎮樻径瀣枖鐎广儱瀚埢蹇涙煟閳ь剙濡奸柣鎾寸懇瀹曘儱顓艰箛鏇狀槷闂佸憡甯楅悷銉ㄣ亹瑜旈幊妤呮偩鐏炵偓娈p闂侀潻闄勫妯侯焽閸愵喗鍎庨悗娑櫭径宥夋煕濞嗘劕鐏撮柍褜鍏涘銉絤p闂佸憡鐗曢幏鎴犳閿燂拷 dest_addr.sin_addr.s_addr = inet_addr(GlobalConfig::ServerIP.c_str()); #endif - if ((sockfd = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP)) < 0) { /* 闁告帗绋戠紓鎾诲储閻斿娼桰CMP濠靛倹顨嗙敮瀵糕偓娑虫嫹 */ + if ((sockfd = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP)) < 0) { /* 闂佸憡甯楃粙鎴犵磽閹捐鍌ㄩ柣鏂款殠濞兼“CMP婵犻潧鍊归〃鍡欐暜鐎电硶鍋撳☉铏 */ LOG_ERROR("[NetStatus] error : socket %d\n", sockfd); return false; } @@ -1807,11 +1807,11 @@ int pack(int pkt_no, char *sendpacket) { struct icmp *icmp; struct timeval *tval; icmp = (struct icmp *)sendpacket; - icmp->icmp_type = ICMP_ECHO; //閻犱礁澧介悿鍡欑尵鐠囪尙鈧攱绋夌弧鎵朚P閻犲洭鏀遍惇浼村箮閵夛附鐎� + icmp->icmp_type = ICMP_ECHO; //闁荤姳绀佹晶浠嬫偪閸℃瑧灏甸悹鍥皺閳ь剟鏀辩粙澶屽姬閹垫湚P闁荤姴娲弨閬嶆儑娴兼潙绠柕澶涢檮閻庯拷 icmp->icmp_code = 0; icmp->icmp_cksum = 0; icmp->icmp_seq = pkt_no; - icmp->icmp_id = pid; //閻犱礁澧介悿鍡氥亹閹惧啿顤呴弶鈺傜〒閳荤硰D濞戞挾鐦–MP闁哄秴娲ㄩ妵姘辩箔閿燂拷 + icmp->icmp_id = pid; //闁荤姳绀佹晶浠嬫偪閸℃哎浜归柟鎯у暱椤ゅ懘寮堕埡鍌溿€掗柍鑽ょ“D婵炴垶鎸鹃惁鈥揗P闂佸搫绉村ú銊╁Φ濮樿京绠旈柨鐕傛嫹 packsize = ICMP_HEADSIZE + sizeof(struct timeval); tval = (struct timeval *)icmp->icmp_data; gettimeofday(tval, NULL); @@ -1824,12 +1824,12 @@ unsigned short cal_chksum(unsigned short *addr, int len) { int sum = 0; unsigned short *w = addr; unsigned short answer = 0; - while (nleft > 1) //闁硅泛顨扖MP闁硅翰鍎遍妵鏃€绂嶅畝鍐闁告帟鍩栭弳鐔煎箲椤旇绨�2閻庢稒顨夋俊顓熺▔閸濆嫬绀嬪ù锝呯Ф閻ゎ噣宕濋悩鐑樺闯闁哄鎷� + while (nleft > 1) //闂佺娉涢〃鎵朚P闂佺缈伴崕閬嶅Φ閺冣偓缁傚秴鐣濋崘顏嗩啋闂佸憡甯熼崺鏍汲閻旂厧绠叉い鏃囶唺缁拷2闁诲孩绋掗〃澶嬩繆椤撶喓鈻旈柛婵嗗缁€瀣归敐鍛ら柣銈庡櫍瀹曟繈鎮╅悜妯洪棷闂佸搫顧€閹凤拷 { sum += *w++; nleft -= 2; } - if (nleft == 1) //闁兼椿妾笴MP闁硅翰鍎遍妵鏃€绋夐崫鍕垫疄闁轰線顣﹂柌婊呪偓娑欘殙婵★拷,濞村吋鑹炬晶鎸庣▔鐎ｎ偅浠橀柛姘凹缁斿鈧稒顨夋俊锟�.闁硅泛锕ュ〒鍫曞触鎼存繄顏卞☉鎿冧簻閻⊙囨嚍閸屾繍娼掑☉鎾规〃缁斿瓨绋夐敓锟�2閻庢稒顨夋俊顓㈠极閻楀牆绁﹂柣銊ュ閻濐喚鈧稒顨夋俊锟�,閺夆晜鐟ら柌锟�2閻庢稒顨夋俊顓㈠极閻楀牆绁﹂柣銊ュ缂嶅棛鈧稒顨夋俊顓熺▔閿燂拷0,缂備綀鍛暰缂侀硸鍨版慨锟� + if (nleft == 1) //闂佸吋妞垮绗碝P闂佺缈伴崕閬嶅Φ閺冣偓缁嬪宕崟鍨杽闂佽桨绶氶。锕傛煂濠婂應鍋撳☉娆樻畽濠碘槄鎷�,婵炴潙鍚嬮懝鐐櫠閹稿海鈻旈悗锝庡亝娴犳﹢鏌涘顒傚嚬缂佹柨顕埀顒佺⊕椤ㄥ淇婇敓锟�.闂佺娉涢敃銉ャ€掗崼鏇炶Е閹煎瓨绻勯鍗炩槈閹垮啩绨婚柣鈯欏洦鍤嶉柛灞剧箥濞兼帒鈽夐幘瑙勩€冪紒鏂跨摠缁嬪鏁撻敓锟�2闁诲孩绋掗〃澶嬩繆椤撱垹鏋侀柣妤€鐗嗙粊锕傛煟閵娿儱顏柣婵愬枤閳ь剚绋掗〃澶嬩繆閿燂拷,闁哄鏅滈悷銈夋煂閿燂拷2闁诲孩绋掗〃澶嬩繆椤撱垹鏋侀柣妤€鐗嗙粊锕傛煟閵娿儱顏х紓宥呮閳ь剚绋掗〃澶嬩繆椤撶喓鈻旈柨鐕傛嫹0,缂傚倷缍€閸涱垱鏆扮紓渚€纭搁崹鐗堟叏閿燂拷 { *(unsigned char *)(&answer) = *(unsigned char *)w; sum += answer; @@ -1872,9 +1872,9 @@ int unpack(int cur_seq, char *buf, int len) { struct ip *ip; struct icmp *icmp; ip = (struct ip *)buf; - iphdrlen = ip->ip_hl << 2; //婵€涘牚p闁硅翰鍎遍妵鏃堟⒐閸喖顔�,闁告鐗玴闁硅翰鍎遍妵鏃堟儍閸曨垱姣愰幖杈鹃檮閻栵綀绠涘鍓ь啋4 - icmp = (struct icmp *)(buf + iphdrlen); //閻℃帒锕ㄧ换鍍玴闁硅翰鍎遍妵锟�,闁圭ǹ娲ら幃娣欳MP闁硅翰鍎遍妵锟� - len -= iphdrlen; // ICMP闁硅翰鍎遍妵鏃堝矗婵傚舶MP闁轰胶澧楀畵渚€骞庨妷褎鐣遍柟顒€顭烽弳杈ㄦ償閿燂拷 + iphdrlen = ip->ip_hl << 2; //濠殿噣鈧稑鐗歱闂佺缈伴崕閬嶅Φ閺冨牊鈷愰柛顭戝枛椤旓拷,闂佸憡顨堥悧鐜撮梺纭呯堪閸庨亶濡甸弮鍫熷剭闁告洦鍨卞В鎰板箹鏉堥箖妾柣鏍电秬缁犳稑顪冮崜褜鍟�4 + icmp = (struct icmp *)(buf + iphdrlen); //闁烩剝甯掗敃銊ф崲閸嶇幋闂佺缈伴崕閬嶅Φ閿燂拷,闂佸湱枪濞层倝骞冨ǎ娆矼P闂佺缈伴崕閬嶅Φ閿燂拷 + len -= iphdrlen; // ICMP闂佺缈伴崕閬嶅Φ閺冨牆鐭楀┑鍌氳埗MP闂佽桨鑳舵晶妤€鐣垫笟鈧獮搴ㄥΨ瑜庨悾閬嶆煙椤掆偓椤兘寮虫潏銊﹀劅闁跨噦鎷� if (len < 8) return -1; if ((icmp->icmp_type == ICMP_ECHOREPLY) && (icmp->icmp_id == pid) && (icmp->icmp_seq == cur_seq)) return 0; @@ -1902,28 +1902,28 @@ void _CloseSocket() { int socketHeart(const char *pSendData) { print_info("socketHeart\n"); - int sockfd; // Socket闁哄倸娲ｅ▎銏ゅ箵韫囨艾鐗氱紒妤嬫嫹 - struct sockaddr_in serverAddr {}; // Server闁革附婢樺鍐磼閹惧鈧垱鎷呴敓锟� + int sockfd; // Socket闂佸搫鍊稿ú锝呪枎閵忋倕绠甸煫鍥ㄨ壘閻楁氨绱掑Δ瀣 + struct sockaddr_in serverAddr {}; // Server闂侀潻闄勫妯侯焽閸愵亞纾奸柟鎯ь嚟閳ь剦鍨遍幏鍛存晸閿燂拷 - // 闁告帗绋戠紓鎻漮cket + // 闂佸憡甯楃粙鎴犵磽閹绘籍cket if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) == -1) { std::cerr << "Failed to create socket." << std::endl; return 1; } - // 閻犱礁澧介悿鍝爀rver闁革附婢樺鍐╃┍閳╁啩绱� + // 闁荤姳绀佹晶浠嬫偪閸濈垁rver闂侀潻闄勫妯侯焽閸愨晝鈹嶉柍鈺佸暕缁憋拷 serverAddr.sin_family = AF_INET; - serverAddr.sin_port = htons(18393); // TCP濮掓稒枪椤撹崵绮╅姘稉闁告瑨娓圭拹锟�80 + serverAddr.sin_port = htons(18393); // TCP婵帗绋掓灙妞ゆ捁宕电划鈺咁敍濮橆剛绋夐梺鍛婄懆濞撳湱鎷归敓锟�80 inet_pton(AF_INET, /*GlobalConfig::ServerIP.c_str()*/ "192.168.1.147", &serverAddr.sin_addr); - // 閺夆晝鍋炵敮鎾礆閻ф紴rver + // 闁哄鏅濋崑鐐垫暜閹绢喖绀嗛柣褎绱磖ver if (connect(sockfd, reinterpret_cast(&serverAddr), sizeof(serverAddr)) == -1) { std::cerr << "Failed to connect to the server." << std::endl; close(sockfd); return 1; } - // 闁告瑦鍨块埀顑跨缁哄墽鎹勯搹顐ｆ闁硅鍠栫€碉拷 + // 闂佸憡鐟﹂崹鍧楀焵椤戣法顦︾紒鍝勫⒔閹瑰嫰鎼归锝嗩啀闂佺顕栭崰鏍偓纰夋嫹 const char heartbeat[] = "Heartbeat"; ssize_t bytesSent = send(sockfd, pSendData, strlen(pSendData), MSG_NOSIGNAL); if (bytesSent == -1) { @@ -1936,14 +1936,14 @@ int socketHeart(const char *pSendData) { return 1; } - // 闁稿繑濞婂Λ纰╫cket閺夆晝鍋炵敮锟� + // 闂佺ǹ绻戞繛濠偽涚喊鈺玞ket闁哄鏅濋崑鐐垫暜閿燂拷 close(sockfd); return 0; } -// Ping闁告垼濮ら弳鐔兼晬鐎圭彻meout濞戞捇缂氱粔鎾籍閼稿灚顦ч梻鍌濇彧缁辨繈宕￠弴姘辩Т闁哄嫮妫硈,10000 婵綆鍋嗛～锟�=10 缂佸鎷� -//闁瑰瓨鍔曟慨娑㈡晬濮樺磭绠查柛銉嫹0闁挎稑鑻妵鎴犳嫻閵夘垳绐楅弶鈺傛煥濞诧拷1闁硅揪鎷�-1 +// Ping闂佸憡鍨兼慨銈夊汲閻斿吋鏅悗鍦交meout婵炴垶鎹囩紓姘辩矓閹绢喖绫嶉柤绋跨仛椤ρ囨⒒閸屾繃褰х紒杈ㄧ箞瀹曪繝寮村杈┬㈤梺鍝勫濡,10000 濠殿噯缍嗛崑鍡涳綖閿燂拷=10 缂備礁顧€閹凤拷 +//闂佺懓鐡ㄩ崝鏇熸叏濞戙垺鏅慨妯虹－缁犳煡鏌涢妷顖涘0闂佹寧绋戦懟顖炲Φ閹寸姵瀚婚柕澶樺灣缁愭寮堕埡鍌涚叆婵炶鎷�1闂佺鎻幏锟�-1 int Ping(const char *ips, int timeout) { struct timeval *tval; int maxfds = 0; @@ -1952,14 +1952,14 @@ int Ping(const char *ips, int timeout) { int iRet = 0; struct sockaddr_in addr; struct sockaddr_in from; - // 閻犱焦鍎抽悾缍濞ｅ洠鍓濇导锟� + // 闁荤姳鐒﹂崕鎶芥偩缂嶎晼婵烇絽娲犻崜婵囧閿燂拷 bzero(&addr, sizeof(addr)); addr.sin_family = AF_INET; addr.sin_addr.s_addr = inet_addr(ips); int sockfd; - // 闁告瑦鐗曠欢鐪榦cket 闁靛棴鎷� 濠碘€冲€归悘澶娾柦閳ュ啿顫udo 閺夆晜鐟╅崳閿嬪濮橆厼袚闂佸尅鎷� + // 闂佸憡鐟﹂悧鏇犳閻Ζcket 闂侀潧妫撮幏锟� 婵犵鈧啿鈧綊鎮樻径濞炬煢闁炽儱鍟块～顤箄do 闁哄鏅滈悷鈺呭闯闁垮顕辨慨姗嗗幖琚氶梻浣稿皡閹凤拷 sockfd = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP); if (sockfd < 0) { print_error("ip:%s,socket error\n", ips); @@ -1967,7 +1967,7 @@ int Ping(const char *ips, int timeout) { } struct timeval timeo; - // 閻犱焦鍎抽悾缍痠meOut闁哄啫鐖煎Λ锟� + // 闁荤姳鐒﹂崕鎶芥偩缂嶇棤meOut闂佸搫鍟悥鐓幬涢敓锟� timeo.tv_sec = timeout / 1000; timeo.tv_usec = timeout % 1000; @@ -1979,25 +1979,25 @@ int Ping(const char *ips, int timeout) { char sendpacket[2048]; char recvpacket[2048]; - // 閻犱焦鍎抽悾缍猧ng闁告牭鎷� + // 闁荤姳鐒﹂崕鎶芥偩缂嶇導ng闂佸憡鐗幏锟� memset(sendpacket, 0, sizeof(sendpacket)); pid_t pid; - // 闁告瑦鐗曠欢鐩D闁挎稑濂旂紞鏃€绋夌弧娓媙g闁汇劌鍤猠quence ID + // 闂佸憡鐟﹂悧鏇犳閻╊棷D闂佹寧绋戞總鏃傜礊閺冣偓缁嬪寮у〒濯檊闂佹眹鍔岄崵鐚爍uence ID pid = getpid(); struct ip *iph; struct icmp *icmp; icmp = (struct icmp *)sendpacket; - icmp->icmp_type = ICMP_ECHO; //闁搞儳鍋炲Ο澶屾嫚闁垮婀� + icmp->icmp_type = ICMP_ECHO; //闂佹悶鍎抽崑鐐参熸径灞惧珰闂佸灝顑囧﹢锟� icmp->icmp_code = 0; icmp->icmp_cksum = 0; icmp->icmp_seq = 0; icmp->icmp_id = pid; tval = (struct timeval *)icmp->icmp_data; gettimeofday(tval, NULL); - icmp->icmp_cksum = cal_chksum((unsigned short *)icmp, sizeof(struct icmp)); //闁哄稄绻濋悰锟� + icmp->icmp_cksum = cal_chksum((unsigned short *)icmp, sizeof(struct icmp)); //闂佸搫绋勭换婵嬫偘閿燂拷 int n = sendto(sockfd, (char *)&sendpacket, sizeof(struct icmp), 0, (struct sockaddr *)&addr, sizeof(addr)); if (n < 1) { @@ -2006,11 +2006,11 @@ int Ping(const char *ips, int timeout) { return -1; } - // 闁规亽鍎辫ぐ锟� - // 闁汇垹褰夌花顒勫矗椤栨繂鍘撮柟鎭掑劚瑜板牓宕氶弶鍨緭濞寸姵婀ng闁汇劌瀚花鑼驳閺冣偓缁夌兘骞侀銈囩闁圭鍋撳ù鐘劥缁绘牠鏌屽畝鍐炬矗闁烩偓鍔岄幆濠囨偝閿燂拷 + // 闂佽浜介崕杈亹閿燂拷 + // 闂佹眹鍨硅ぐ澶岃姳椤掑嫬鐭楁い鏍ㄧ箓閸樻挳鏌熼幁鎺戝姎鐟滄澘鐗撳畷姘跺级閸喖绶繛瀵稿У濠€顣弉g闂佹眹鍔岀€氼剛鑺遍懠顒傞┏闁哄啠鍋撶紒澶屽厴楠炰線顢涢妶鍥╊槷闂佸湱顣介崑鎾趁归悩顔煎姤缂佺粯鐗犻弻灞界暆閸愮偓鐭楅梺鐑╁亾閸斿矂骞嗘繝鍥ㄥ仢闁跨噦鎷� int cnt = 0; while (1) { - // 閻犱焦鍎抽悾缍痠meOut闁哄啫鐖煎Λ鍧楁晬瀹€鍐婵炲棌鍓濇晶鐘诲及椤栨粍鍩傛慨婵撶秬閹癸絾鎷呭⿰鍛殢闁活煉鎷� + // 闁荤姳鐒﹂崕鎶芥偩缂嶇棤meOut闂佸搫鍟悥鐓幬涢崸妤佹櫖鐎光偓閸愵亞顔愬┑鐐叉閸撴繃鏅堕悩璇插強妞ゆ牗绮嶉崺鍌涙叏濠垫挾绉柟鐧哥稻閹峰懎饪伴崨顔芥闂佹椿鐓夐幏锟� FD_ZERO(&readfds); FD_SET(sockfd, &readfds); maxfds = sockfd + 1; @@ -2022,7 +2022,7 @@ int Ping(const char *ips, int timeout) { break; } - // 闁规亽鍎辫ぐ锟� + // 闂佽浜介崕杈亹閿燂拷 memset(recvpacket, 0, sizeof(recvpacket)); int fromlen = sizeof(from); n = recvfrom(sockfd, recvpacket, sizeof(recvpacket), 0, (struct sockaddr *)&from, (socklen_t *)&fromlen); @@ -2034,7 +2034,7 @@ int Ping(const char *ips, int timeout) { } char *from_ip = (char *)inet_ntoa(from.sin_addr); - // 闁告帇鍊栭弻鍥及椤栨碍鍎婇柡鍕靛灥閸ゆ粌顔忛惄顦弉g闁汇劌瀚ú鏍ㄥ緞閿燂拷 + // 闂佸憡甯囬崐鏍蓟閸ヮ剙鍙婃い鏍ㄧ閸庡﹪鏌￠崟闈涚仴闁搞倖绮岄蹇涙儎椤﹀級g闂佹眹鍔岀€氼剙煤閺嶃劌绶為柨鐕傛嫹 if (strcmp(from_ip, ips) != 0) { print_info("NowPingip:%s Fromip:%s NowPingip is not same to Fromip,so ping wrong!\n", ips, from_ip); close(sockfd); @@ -2047,14 +2047,14 @@ int Ping(const char *ips, int timeout) { icmp = (struct icmp *)(recvpacket + (iph->ip_hl << 2)); print_info("ip:%s,icmp->icmp_type:%d,icmp->icmp_id:%d\n", ips, icmp->icmp_type, icmp->icmp_id); - // 闁告帇鍊栭弻鍢漣ng闁搞儳鍋涢ˇ鏌ュ礌閸涱垱鐣遍柣妯垮煐閳ь剨鎷� - if (icmp->icmp_type == ICMP_ECHOREPLY && icmp->icmp_id == pid) // ICMP_ECHOREPLY闁搞儳鍋炲Ο澶嬫償閺冨倻鎽� + // 闂佸憡甯囬崐鏍蓟閸㈡迹ng闂佹悶鍎抽崑娑⑺囬弻銉ョ闁告侗鍨遍悾閬嶆煟濡灝鐓愰柍褜鍓ㄩ幏锟� + if (icmp->icmp_type == ICMP_ECHOREPLY && icmp->icmp_id == pid) // ICMP_ECHOREPLY闂佹悶鍎抽崑鐐参熸径瀣劅闁哄啫鍊婚幗锟� { - // 婵繐绲介悥鍓佷焊闁秮鍋撻埀顒勫礄閸濆嫭鍎曢柣婊愭嫹 + // 濠殿喗绻愮徊浠嬫偉閸撲椒鐒婇梺顒€绉崑鎾诲焵椤掑嫬绀勯柛婵嗗閸庢洟鏌ｅ⿰鎰 print_info("icmp succecss ............. \n"); break; } else if (cnt < 3) { - // 闁告熬绠戦崹顖滅磼瑜忛悽鑽ょ驳閿燂拷 + // 闂佸憡鐔粻鎴﹀垂椤栨粎纾肩憸蹇涙偨閼姐倗椹抽柨鐕傛嫹 cnt++; continue; } else { @@ -2085,41 +2085,41 @@ int get_netlink_status(const char *if_name) { return edata.data; } -// 閻忓繐妫涙晶妤呭嫉椤掆偓瑜拌法鈧稒顨堥浣圭▔閸欏顎曢柛鎺戞鐠愮喖寮€涙ɑ娈剁紓浣稿閸ㄦ岸鎯冮崟顐ｅ€婚梺璇ф嫹 +// 闁诲繐绻愬Λ娑欐櫠濡ゅ懎瀚夋い鎺嗗亾鐟滄媽娉曢埀顒佺⊕椤ㄥ牓顢栨担鍦枖闁告瑥顦鏇㈡煕閹烘垶顥欓悹鎰枛瀵偆鈧稒蓱濞堝墎绱撴担绋款仾闁搞劍宀搁幆鍐礋椤愶絽鈧姊虹拠褎瀚� std::vector splitVersion(const std::string &version) { std::vector parts; std::stringstream ss(version); std::string part; - // 闁烩偓鍔庨崑锝嗘媴濠娾偓鐠愮喖宕氶崱娑欘吘缂佹璁ｇ槐婵嬪礆閸℃顥忛柣妤€鐗婂﹢浼村矗閿燂拷 + // 闂佺儵鍋撻崝搴ㄥ磻閿濆棙濯存繝濞惧亾閻犳劗鍠栧畷姘跺幢濞戞瑯鍚樼紓浣诡殣鐠侊絿妲愬┑瀣闁糕剝顨呴ˉ蹇涙煟濡も偓閻楀﹤锕㈡导鏉戠煑闁跨噦鎷� while (std::getline(ss, part, '.')) { - parts.push_back(std::stoi(part)); // 閻忓繐妫楅崹搴ㄥ礈閹绘帗鍊甸柣銊ュ閸庢挳宕氶崱姘ギ闁硅婢€鐠愮喖寮€涙ɑ娈� + parts.push_back(std::stoi(part)); // 闁诲繐绻愬Λ妤呭垂鎼淬劌绀堥柟缁樺笚閸婄敻鏌ｉ妸銉ヮ伃闁稿孩鎸冲畷姘跺幢濮橆厾銈梺纭咁嚃濠⑩偓閻犳劗鍠栧顐も偓娑櫳戝▓锟� } return parts; } -// 婵絾妫佺欢婵囩▔閵堝嫰鍤嬮柣妤€鐗婂﹢浼村矗閿燂拷 +// 濠殿噯绲惧Λ浣烘濠靛洨鈻旈柕鍫濆閸ゅ鏌ｅΔ鈧悧濠傦耿娴兼潙鐭楅柨鐕傛嫹 int compareVersions(const std::string &version1, const std::string &version2) { std::vector v1 = splitVersion(version1); std::vector v2 = splitVersion(version2); - // 闁瑰灚鍎抽崺宀勫嫉閳ь剟姊圭捄銊︾暠闁绘鐗婂﹢浼村矗閻戣棄鍔ラ柛鎺戞閺嗚鲸鎯旈敓锟� + // 闂佺懓鐏氶崕鎶藉春瀹€鍕珘闁逞屽墴濮婂湱鎹勯妸锔炬殸闂佺粯顨呴悧濠傦耿娴兼潙鐭楅柣鎴ｆ閸斻儵鏌涢幒鎴烆棦闁哄棜椴搁幆鏃堟晸閿燂拷 size_t maxLength = std::max(v1.size(), v2.size()); for (size_t i = 0; i < maxLength; ++i) { - int num1 = i < v1.size() ? v1[i] : 0; // 濠碘€冲€归悘澶愬蓟閹版澘鍔ラ柛鎺戞缁楀鈧稒锚濠€顏堟晬瀹€鍐炬綊濞戞搫鎷�0 + int num1 = i < v1.size() ? v1[i] : 0; // 婵犵鈧啿鈧綊鎮樻径鎰摕闁圭増婢橀崝銉╂煕閹烘垶顥欑紒妤€顦遍埀顒佺⊕閿氭繝鈧鍫熸櫖鐎光偓閸愮偓缍婃繛鎴炴惈閹凤拷0 int num2 = i < v2.size() ? v2[i] : 0; - if (num1 > num2) return 1; // version1 濠㈠爢鍌滆壘 version2 - if (num1 < num2) return -1; // version1 閻忓繐绻嬬花锟� version2 + if (num1 > num2) return 1; // version1 婵犮垹鐖㈤崒婊嗗 version2 + if (num1 < num2) return -1; // version1 闁诲繐绻愮换瀣姳閿燂拷 version2 } - return 0; // 闁绘鐗婂﹢浼村矗妞嬪孩绁查柛姘炬嫹 + return 0; // 闂佺粯顨呴悧濠傦耿娴兼潙鐭楀瀣缁佹煡鏌涘鐐 } void Binary_Bit(unsigned char *p_data, unsigned char position, int flag) { - //濞存粌鐭佺换姗€宕氶懜鐢靛帣濞达絽绉堕悿鍡涙⒖閼搁潧鐏楅柤鏉挎噸缁旓拷 position濞戞捁妗ㄧ紞鍛村极閿燂拷(濞寸媴鎷�0 鐎殿喒鍋撳┑顕嗘嫹) + //婵炲瓨绮岄惌浣烘崲濮椻偓瀹曟岸鎳滈悽闈涘福婵炶揪绲界粔鍫曟偪閸℃稒鈷栭柤鎼佹涧閻忔鏌ら弶鎸庡櫢缂佹棑鎷� position婵炴垶鎹佸銊х礊閸涙潙鏋侀柨鐕傛嫹(婵炲濯撮幏锟�0 閻庢鍠掗崑鎾斥攽椤曞棙瀚�) if (flag) { *p_data |= 0x01 << (position); } else { @@ -2127,11 +2127,11 @@ void Binary_Bit(unsigned char *p_data, unsigned char position, int flag) { } } -static const char *JSON_FIELD_CMD = "cmd"; //闁告绻楅锟�: 闁告稒鍨濋幎銈団偓娑欘殕椤旓拷 -static const char *JSON_FIELD_NAME = "dataWatchName"; //闁告绻楅锟�: 缂備礁鐗忛顒勫触瀹ュ泦锟� +static const char *JSON_FIELD_CMD = "cmd"; //闂佸憡顨呯换妤咁敊閿燂拷: 闂佸憡绋掗崹婵嬪箮閵堝洠鍋撳☉娆樻畷妞ゆ棑鎷� +static const char *JSON_FIELD_NAME = "dataWatchName"; //闂佸憡顨呯换妤咁敊閿燂拷: 缂傚倷绀侀悧蹇涱敂椤掑嫬瑙︾€广儱娉﹂敓锟� static const char *JSON_FIELD_dataNodeGatewayNo = "dataNodeGatewayNo"; -static const char *JSON_FIELD_ASSETID = "dataWatchAssetId"; //闁告绻楅锟�: 閻犙冨妤犲洨绱撻弽褍濞� 閻庢稒顨嗛锟� -static const char *JSON_FIELD_ADDEDBY = "dataWatchAddedBy"; //闁告绻楅锟�: 婵烇綀顕ф慨鐐寸閿燂拷 閻庢稒顨嗛锟� +static const char *JSON_FIELD_ASSETID = "dataWatchAssetId"; //闂佸憡顨呯换妤咁敊閿燂拷: 闁荤姍鍐仹濡ょ姴娲ㄧ槐鎾诲冀瑜嶆繛锟� 闁诲孩绋掗〃鍡涱敊閿燂拷 +static const char *JSON_FIELD_ADDEDBY = "dataWatchAddedBy"; //闂佸憡顨呯换妤咁敊閿燂拷: 濠电儑缍€椤曆勬叏閻愬顩查柨鐕傛嫹 闁诲孩绋掗〃鍡涱敊閿燂拷 static const char *JSON_FIELD_DEVICETYPE = "deviceType"; static const char *JSON_FIELD_ADDEDDATE = "dataWatchAddedDate"; static const char *JSON_FIELD_IPADDRESS = "dataWatchIpAddress"; diff --git a/dbaccess/sql_db.cpp b/dbaccess/sql_db.cpp index 0106f51..eff5409 100644 --- a/dbaccess/sql_db.cpp +++ b/dbaccess/sql_db.cpp @@ -1,7 +1,7 @@ #include "sql_db.hpp" #include #include "common/global.hpp" -#include "calculation/calculation.hpp" +#include "utility/calculation.hpp" bool SqlSwitch() { if (access("./sql", 0) >= 0) { diff --git a/jsonparse/mqtt_cmd_parse.cpp b/jsonparse/mqtt_cmd_parse.cpp index 2b12be2..98e0309 100644 --- a/jsonparse/mqtt_cmd_parse.cpp +++ b/jsonparse/mqtt_cmd_parse.cpp @@ -1,7 +1,7 @@ #include "communication_cmd.hpp" #include "dbaccess/sql_db.hpp" #include "platform/platform_init.hpp" -#include "MD5/md5.h" +#include "utility/md5.h" std::string JsonData::JsonCmd_20(Param_20 ¶m) { Json::Value jsonVal; diff --git a/jsonparse/web_cmd_parse.cpp b/jsonparse/web_cmd_parse.cpp index 9cb9f2a..d2fcbfc 100644 --- a/jsonparse/web_cmd_parse.cpp +++ b/jsonparse/web_cmd_parse.cpp @@ -1,7 +1,7 @@ #include "communication_cmd.hpp" #include "dbaccess/sql_db.hpp" #include "platform/platform_init.hpp" -#include "MD5/md5.h" +#include "utility/md5.h" std::string JsonData::JsonCmd_Cgi_01(Param_01 ¶m) { Json::Value jsonVal; diff --git a/jsonparse/web_cmd_parse2.cpp b/jsonparse/web_cmd_parse2.cpp index 4e7d2d6..4eeafee 100644 --- a/jsonparse/web_cmd_parse2.cpp +++ b/jsonparse/web_cmd_parse2.cpp @@ -1,7 +1,7 @@ #include "communication_cmd.hpp" #include "dbaccess/sql_db.hpp" #include "platform/platform_init.hpp" -#include "MD5/md5.h" +#include "utility/md5.h" std::string JsonData::JsonCmd_Cgi_26(Param_26 ¶m) { diff --git a/jsonparse/web_cmd_parse3.cpp b/jsonparse/web_cmd_parse3.cpp index c77bcfc..e6a5359 100644 --- a/jsonparse/web_cmd_parse3.cpp +++ b/jsonparse/web_cmd_parse3.cpp @@ -1,7 +1,7 @@ #include "communication_cmd.hpp" #include "dbaccess/sql_db.hpp" #include "platform/platform_init.hpp" -#include "MD5/md5.h" +#include "utility/md5.h" std::string JsonData::JsonCmd_Cgi_default() { Json::Value jsonVal; diff --git a/localserver/mqtt_cmd.cpp b/localserver/mqtt_cmd.cpp index 3d336b2..1d5de08 100644 --- a/localserver/mqtt_cmd.cpp +++ b/localserver/mqtt_cmd.cpp @@ -1,6 +1,6 @@ #include "local_server.hpp" #include -#include "secure/secure.hpp" +#include "utility/secure.hpp" #include "jsonparse/communication_cmd.hpp" LocalServer::LocalServer() {} diff --git a/minilzo-2.10/COPYING b/minilzo/COPYING similarity index 100% rename from minilzo-2.10/COPYING rename to minilzo/COPYING diff --git a/minilzo-2.10/README.LZO b/minilzo/README.LZO similarity index 100% rename from minilzo-2.10/README.LZO rename to minilzo/README.LZO diff --git a/minilzo-2.10/lzoconf.h b/minilzo/lzoconf.h similarity index 100% rename from minilzo-2.10/lzoconf.h rename to minilzo/lzoconf.h diff --git a/minilzo-2.10/lzodefs.h b/minilzo/lzodefs.h similarity index 100% rename from minilzo-2.10/lzodefs.h rename to minilzo/lzodefs.h diff --git a/minilzo-2.10/minilzo.c b/minilzo/minilzo.c similarity index 100% rename from minilzo-2.10/minilzo.c rename to minilzo/minilzo.c diff --git a/minilzo-2.10/minilzo.h b/minilzo/minilzo.h similarity index 100% rename from minilzo-2.10/minilzo.h rename to minilzo/minilzo.h diff --git a/mqttclient/mqtt_client.cpp b/mqttclient/mqtt_client.cpp index dbfa991..93fc855 100644 --- a/mqttclient/mqtt_client.cpp +++ b/mqttclient/mqtt_client.cpp @@ -1,3 +1,4 @@ +#include "mqtt_client.h" #include #include #include @@ -12,9 +13,9 @@ #include #include #include -#include "SH_MqttClient.h" -#include "../common/SH_global.h" -#include "../secure/SH_Secure.hpp" + +#include "common/global.hpp" +#include "utility/secure.hpp" static char res_topic[100]; static char req_topic[100]; diff --git a/mqttclient/mqtt_client.h b/mqttclient/mqtt_client.h index d53deff..0e01ffb 100644 --- a/mqttclient/mqtt_client.h +++ b/mqttclient/mqtt_client.h @@ -1,7 +1,7 @@ #ifndef MQTTCLIENT_H #define MQTTCLIENT_H -#include "../common/SH_CommonFunc.hpp" +#include "common/common_func.hpp" #ifdef __cplusplus extern "C" { #endif diff --git a/platform/platform_init.cpp b/platform/platform_init.cpp index 6f91eee..9d3b453 100644 --- a/platform/platform_init.cpp +++ b/platform/platform_init.cpp @@ -1,8 +1,9 @@ +#include "platform_init.hpp" #include -#include "SH_PlatformInit.hpp" -#include "../common/SH_global.h" -#include "../dbaccess/SH_SqlDB.hpp" -#include "../API_log/SH_log.h" + +#include "common/global.hpp" +#include "dbaccess/sql_db.hpp" + /*********************全局变量声明***********************/ int GlobalConfig::RUN_MODE = 0; diff --git a/threadfunc/check_thread.cpp b/threadfunc/check_thread.cpp index 6eba506..c6443b0 100644 --- a/threadfunc/check_thread.cpp +++ b/threadfunc/check_thread.cpp @@ -1,20 +1,17 @@ #include "thread_func.hpp" -#include #include #include #include #include #include #include -#include "../uart/uart.hpp" -#include "../common/common_func.hpp" -#include "../wifi/wpa_client.h" #include +#include +#include "uart/uart.hpp" +#include "common/common_func.hpp" +#include "wifi_5g/wpa_client.h" -namespace { -LocalServer *cidwServer = LocalServer::instance(); -} void CheckThread() { print_info("ENTER CHECK THREAD \n"); diff --git a/threadfunc/thread_func.cpp b/threadfunc/thread_func.cpp index 1c25000..8b40261 100644 --- a/threadfunc/thread_func.cpp +++ b/threadfunc/thread_func.cpp @@ -6,17 +6,14 @@ #include #include #include +#include #include -#include "../uart/uart.hpp" -#include "../common/common_func.hpp" -#include "../dial5G/Dial.h" -#include "../wifi/wpa_client.h" -#include +#include "uart/uart.hpp" +#include "common/common_func.hpp" +#include "wifi_5g/dial.h" +#include "wifi_5g/wpa_client.h" -namespace { -LocalServer *cidwServer = LocalServer::instance(); -} static std::string serverPort; static std::string uptime; diff --git a/threadfunc/thread_func.hpp b/threadfunc/thread_func.hpp index 27efac6..c619fc3 100644 --- a/threadfunc/thread_func.hpp +++ b/threadfunc/thread_func.hpp @@ -7,13 +7,13 @@ #include #include #include -#include "../common/SH_global.h" -#include "../common/SH_CommonFunc.hpp" -#include "../mqttclient/SH_MqttClient.h" -#include "../localserver/SH_LocalServer.hpp" -#include "../searchdev/SH_SearchDev.hpp" -#include "../tcpcgi/TcpCgi.hpp" -#include "../udpqt/SH_UdpQt.hpp" +#include "common/global.hpp" +#include "common/common_func.hpp" +#include "mqttclient/mqtt_client.h" +#include "localserver/local_server.hpp" +#include "utility/search_dev.hpp" +#include "utility/tcp_cgi.hpp" +#include "utility/udp_qt.hpp" /*********************************** *************线程处理函数*********** diff --git a/uart/uart.cpp b/uart/uart.cpp index 24b951c..ce74838 100644 --- a/uart/uart.cpp +++ b/uart/uart.cpp @@ -12,7 +12,7 @@ #include #include #include -#include "../serial/serial.h" +#include "utility/serial.h" char g_UartRecvBuf[GENERAL_BUF_SIZE]; int offSize = 0; diff --git a/uart/uart.hpp b/uart/uart.hpp index 8db2335..d75b2a2 100644 --- a/uart/uart.hpp +++ b/uart/uart.hpp @@ -4,10 +4,10 @@ #include #include #include -#include "../common/SH_CommonFunc.hpp" -#include "../common/SH_global.h" -#include "../dbaccess/SH_SqlDB.hpp" -#include "../calculation/Calculation.hpp" +#include "common/common_func.hpp" +#include "common/global.hpp" +#include "dbaccess/sql_db.hpp" +#include "utility/calculation.hpp" typedef void (*pTestRecvCallBack)(int Status); diff --git a/utility/calculation.hpp b/utility/calculation.hpp index 21da982..6e5f6ac 100644 --- a/utility/calculation.hpp +++ b/utility/calculation.hpp @@ -1,13 +1,14 @@ #ifndef CALCULATION_HPP_ #define CALCULATION_HPP_ -#include + #include -#include +#include #include #include #include -#include +#include +#include typedef struct { float real, imag; diff --git a/utility/md5.h b/utility/md5.h index f63ab34..1bd9f6d 100644 --- a/utility/md5.h +++ b/utility/md5.h @@ -1,5 +1,5 @@ -#ifndef MD5_H -#define MD5_H +#ifndef MD5_H_ +#define MD5_H_ #define _CRT_SECURE_NO_WARNINGS #include diff --git a/utility/search_dev.cpp b/utility/search_dev.cpp index 40761f2..4adf479 100644 --- a/utility/search_dev.cpp +++ b/utility/search_dev.cpp @@ -1,9 +1,10 @@ +#include "search_dev.hpp" #include #include #include #include #include -#include "SH_SearchDev.hpp" + static const char* MULTICAST_HOST_NAME1 = "224.0.0.1"; //组播接收平台搜索信号地址 static const int MULTICAST_PORT_RECV1 = 7301; //组播接收端口 @@ -14,8 +15,6 @@ SearchDev::SearchDev(boost::asio::io_service& ioservice) : mSockRecv_1(ioservice SearchDev::~SearchDev() { Stop(); } void SearchDev::Init() { - // GwRouteInit(); - //设置组播接收地址1 try { mSockRecv_1.open(mListenEP1.protocol()); mSockRecv_1.set_option(ip::udp::socket::reuse_address(true)); diff --git a/utility/secure.hpp b/utility/secure.hpp index 2c5cb17..eb5fb48 100644 --- a/utility/secure.hpp +++ b/utility/secure.hpp @@ -1,5 +1,5 @@ -#ifndef _WL_SECUREAPI_H_ -#define _WL_SECUREAPI_H_ +#ifndef SECURE_HPP_ +#define SECURE_HPP_ #include #include @@ -52,4 +52,4 @@ private: typedef boost::container::dtl::singleton_default secure; -#endif \ No newline at end of file +#endif // SECURE_HPP_ \ No newline at end of file diff --git a/utility/udp_scan.cpp b/utility/udp_scan.cpp index 955aee7..0de3c8e 100644 --- a/utility/udp_scan.cpp +++ b/utility/udp_scan.cpp @@ -1,10 +1,8 @@ #include "udp_scan.hpp" #include #include -#include "../common/SH_CommonFunc.hpp" -#include "../common/SH_global.h" -#include "../API_log/SH_log.h" - +#include "common/common_func.hpp" +#include "common/global.hpp" UdpSys::UdpSys(): diff --git a/wifi/subdir.mk b/wifi/subdir.mk deleted file mode 100644 index b2c1285..0000000 --- a/wifi/subdir.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -# Add inputs and outputs from these tool invocations to the build variables -CPP_SRCS += \ -../wifi/wpa_client.cpp - -CPP_DEPS += \ -./wifi/wpa_client.d - -OBJS += \ -./wifi/wpa_client.o - - -# Each subdirectory must supply rules for building sources it contributes -wifi/%.o: ../wifi/%.cpp wifi/subdir.mk - @echo 'Building file: $<' - @echo 'Invoking: Cross G++ Compiler' - arm-linux-gnueabihf-g++ -std=c++0x -I/home/chaos/WorkSpace/Tools/GatewayThirdParty/boost/include -I/home/chaos/WorkSpace/Tools/GatewayThirdParty/curl/include -I/home/chaos/WorkSpace/Tools/GatewayThirdParty/fftw/include -I/home/chaos/WorkSpace/Tools/GatewayThirdParty/jsoncpp/include -I/home/chaos/WorkSpace/Tools/GatewayThirdParty/sqlite/include -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" -o "$@" "$<" - @echo 'Finished building: $<' - @echo ' ' - - -clean: clean-wifi - -clean-wifi: - -$(RM) ./wifi/wpa_client.d ./wifi/wpa_client.o - -.PHONY: clean-wifi - diff --git a/dial5G/dial.cpp b/wifi_5g/dial.cpp similarity index 99% rename from dial5G/dial.cpp rename to wifi_5g/dial.cpp index 0f9ab43..95ac87c 100644 --- a/dial5G/dial.cpp +++ b/wifi_5g/dial.cpp @@ -1,3 +1,4 @@ +#include "dial.h" #include // #include // #include @@ -6,7 +7,7 @@ // #include #include #include "common/common_func.hpp" -#include "dial.h" + Dial::Dial() { m_fd = 0; diff --git a/dial5G/dial.h b/wifi_5g/dial.h similarity index 96% rename from dial5G/dial.h rename to wifi_5g/dial.h index 056381a..cf7f466 100644 --- a/dial5G/dial.h +++ b/wifi_5g/dial.h @@ -2,7 +2,7 @@ #define DIAL5G_DIAL_H_ #include -#include "../common/global.hpp" +#include "common/global.hpp" class Dial { public: diff --git a/dial5G/subdir.mk b/wifi_5g/subdir.mk similarity index 100% rename from dial5G/subdir.mk rename to wifi_5g/subdir.mk diff --git a/wifi/wpa_client.cpp b/wifi_5g/wpa_client.cpp similarity index 100% rename from wifi/wpa_client.cpp rename to wifi_5g/wpa_client.cpp diff --git a/wifi/wpa_client.h b/wifi_5g/wpa_client.h similarity index 100% rename from wifi/wpa_client.h rename to wifi_5g/wpa_client.h