From o2on-svn ＠ lists.sourceforge.jp Sat Oct 4 17:51:04 2008 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sat, 04 Oct 2008 17:51:04 +0900 Subject: [o2on-svn] =?utf-8?b?WzEyNF0gRklYOiAgIzEyNjYzIElQ5aSJ5pu05pmC44Gr?= =?utf-8?b?5qSc5Ye644Gn44GN44Gq44GEIOS/ruato+OBjOS4jeWNgeWIhuOBoOOBow==?= =?utf-8?b?44Gf44Gu44Gn6L+95Yqg5L+u5q2j44CC?= Message-ID: <1223110264.912200.31558.nullmailer@users.sourceforge.jp> Revision: 124 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=o2on&view=rev&rev=124 Author: osa_p Date: 2008-10-04 17:51:04 +0900 (Sat, 04 Oct 2008) Log Message: ----------- FIX: #12663 IP紊?????罎???с???? 篆???????????????ц申??信罩ｃ? Ticket Links: :----------- http://sourceforge.jp/projects/o2on/tracker/detail/12663 Modified Paths: -------------- trunk/o2on/src.o2on/main.cpp Modified: trunk/o2on/src.o2on/main.cpp =================================================================== --- trunk/o2on/src.o2on/main.cpp 2008-09-27 05:35:23 UTC (rev 123) +++ trunk/o2on/src.o2on/main.cpp 2008-10-04 08:51:04 UTC (rev 124) @@ -82,7 +82,7 @@ static HWND hwndMain; static HWND hwndProgressDlg; static HWND hwndUPnPDlg; -static HANDLE ThreadHandle; +static HANDLE ThreadHandle = NULL; static UINT TaskbarRestartMsg; static int CurrentProperyPage; static bool VisibleOptionDialog; @@ -2737,13 +2737,15 @@ } } else { - // Port0?????????????????????AIP???????????????? - // GetGlobalIP???????AP2P????????????P2P????? - // ???????????????????? + // ??????O??Port0?????????????????????A + // IP???????????????? + // ????????????????????? static time_t LastRestartP2P = 0; - if ((Profile->IsPort0() == false) && + if ((ThreadHandle == NULL) && + (Profile->IsPort0() == false) && (Job_GetGlobalIP->IsActive() == false) && (time(NULL) - LastRestartP2P > (10*60) )) { + // GetGlobalIP???????AP2P????????????P2P????? LastRestartP2P = time(NULL); Profile->SetIP(0); From o2on-svn ＠ lists.sourceforge.jp Tue Oct 14 21:51:27 2008 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Tue, 14 Oct 2008 21:51:27 +0900 Subject: [o2on-svn] =?utf-8?b?WzEyNV0gRklYOiAgIzEzNDc5IOeuoeeQhueUu+mdog==?= =?utf-8?b?44GMU2FmYXJp5pyq5a++5b+c?= Message-ID: <1223988687.941559.23951.nullmailer@users.sourceforge.jp> Revision: 125 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=o2on&view=rev&rev=125 Author: electrolysis Date: 2008-10-14 21:51:27 +0900 (Tue, 14 Oct 2008) Log Message: ----------- FIX: #13479 管理画面がSafari未対応 とりあえずの対応です Ticket Links: :----------- http://sourceforge.jp/projects/o2on/tracker/detail/13479 Modified Paths: -------------- trunk/o2on/admin/o2on.js Modified: trunk/o2on/admin/o2on.js =================================================================== --- trunk/o2on/admin/o2on.js 2008-10-04 08:51:04 UTC (rev 124) +++ trunk/o2on/admin/o2on.js 2008-10-14 12:51:27 UTC (rev 125) @@ -142,10 +142,22 @@ xml = document.implementation.createDocument("", "", null); xsl = document.implementation.createDocument("", "", null); } - xml.async = false; - xsl.async = false; - xml.load(xmlurl); - xsl.load(xslurl); + if ("load" in xml) { + xml.async = false; + xsl.async = false; + xml.load(xmlurl); + xsl.load(xslurl); + } + else { + var xhr = new XMLHttpRequest(); + xhr.open("GET", xmlurl, false); + xhr.send(null); + xml = xhr.responseXML; + var xhr2 = new XMLHttpRequest(); + xhr2.open("GET", xslurl, false); + xhr2.send(null); + xsl = xhr2.responseXML; + } if (document.all && navigator.userAgent.indexOf("Opera") == -1) { node.innerHTML = xml.transformNode(xsl); From o2on-svn ＠ lists.sourceforge.jp Sun Nov 2 02:05:52 2008 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sun, 02 Nov 2008 02:05:52 +0900 Subject: [o2on-svn] =?utf-8?b?WzEyNl0gIOeuoeeQhueUu+mdouOAgURC44GL44KJ44Gu?= =?utf-8?b?44OH44O844K/5Y+W5b6X44KS5LiA5bqm44Gr6KGM44GG44KI44GG44Gr5aSJ?= =?utf-8?b?5pu0?= Message-ID: <1225559152.453443.1414.nullmailer@users.sourceforge.jp> Revision: 126 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=o2on&view=rev&rev=126 Author: laxmi Date: 2008-11-02 02:05:52 +0900 (Sun, 02 Nov 2008) Log Message: ----------- 膊∞??脂???B???????若???????綺??茵??????????http://pc11.2ch.net/test/read.cgi/tech/1212302014/520 Modified Paths: -------------- trunk/o2on/src.o2on/O2DatDB.cpp trunk/o2on/src.o2on/O2DatDB.h trunk/o2on/src.o2on/O2ReportMaker.cpp Modified: trunk/o2on/src.o2on/O2DatDB.cpp =================================================================== --- trunk/o2on/src.o2on/O2DatDB.cpp 2008-10-14 12:51:27 UTC (rev 125) +++ trunk/o2on/src.o2on/O2DatDB.cpp 2008-11-01 17:05:52 UTC (rev 126) @@ -799,54 +799,6 @@ uint64 O2DatDB:: -select_datcount(void) -{ -#if TRACE_SQL_EXEC_TIME - stopwatch sw("select datcount"); -#endif - - sqlite3 *db = NULL; - sqlite3_stmt *stmt = NULL; - - int err = sqlite3_open16(dbfilename.c_str(), &db); - if (err != SQLITE_OK) - goto error; - - sqlite3_busy_timeout(db, 5000); - - wchar_t *sql = L"select count(*) from dat;"; - - err = sqlite3_prepare16_v2(db, sql, wcslen(sql)*2, &stmt, NULL); - if (err != SQLITE_OK) - goto error; - - err = sqlite3_step(stmt); - if (err != SQLITE_ROW && err != SQLITE_DONE) - goto error; - - uint64 count = sqlite3_column_int64(stmt,0); - - sqlite3_finalize(stmt); - stmt = NULL; - - err = sqlite3_close(db); - if (err != SQLITE_OK) - goto error; - - return (count); - -error: - log(db); - if (stmt) sqlite3_finalize(stmt); - if (db) sqlite3_close(db); - return (0); -} - - - - -uint64 -O2DatDB:: select_datcount(wstrnummap &out) { #if TRACE_SQL_EXEC_TIME @@ -904,7 +856,7 @@ select_totaldisksize(void) { #if TRACE_SQL_EXEC_TIME - stopwatch sw("select totakdisksize"); + stopwatch sw("select totaldisksize"); #endif sqlite3 *db = NULL; @@ -946,12 +898,12 @@ -uint64 +void O2DatDB:: -select_publishcount(time_t publish_tt) +select_report(time_t publish_tt, uint64 &count, uint64 &disksize, uint64 &publish) { #if TRACE_SQL_EXEC_TIME - stopwatch sw("select datcount by lastpublish"); + stopwatch sw("select report"); #endif sqlite3 *db = NULL; @@ -960,9 +912,13 @@ int err = sqlite3_open16(dbfilename.c_str(), &db); if (err != SQLITE_OK) goto error; + sqlite3_busy_timeout(db, 5000); - wchar_t *sql = L"select count(*) from dat where lastpublish > ?;"; + wchar_t *sql = L"select count(*)," + L"sum(disksize)," + L"sum(case when lastpublish > ? then 1 else 0 end)" + L"from dat;"; err = sqlite3_prepare16_v2(db, sql, wcslen(sql)*2, &stmt, NULL); if (err != SQLITE_OK) @@ -970,12 +926,14 @@ if (!bind(db, stmt, 1, time(NULL)-publish_tt)) goto error; - + err = sqlite3_step(stmt); if (err != SQLITE_ROW && err != SQLITE_DONE) goto error; - uint64 count = sqlite3_column_int64(stmt,0); + count = sqlite3_column_int64(stmt,0); + disksize = sqlite3_column_int64(stmt,1); + publish = sqlite3_column_int64(stmt,2); sqlite3_finalize(stmt); stmt = NULL; @@ -984,13 +942,13 @@ if (err != SQLITE_OK) goto error; - return (count); + return; error: log(db); if (stmt) sqlite3_finalize(stmt); if (db) sqlite3_close(db); - return (0); + return; } Modified: trunk/o2on/src.o2on/O2DatDB.h =================================================================== --- trunk/o2on/src.o2on/O2DatDB.h 2008-10-14 12:51:27 UTC (rev 125) +++ trunk/o2on/src.o2on/O2DatDB.h 2008-11-01 17:05:52 UTC (rev 126) @@ -95,10 +95,9 @@ bool select(O2DatRecList &out, const wchar_t *domain, const wchar_t *bbsname); bool select(O2DatRec &out, const wchar_t *domain, const wchar_t *bbsname, const wchar_t *datname); bool select(O2DatRecList &out, time_t publish_tt, size_t limit); - uint64 select_datcount(void); uint64 select_datcount(wstrnummap &out); uint64 select_totaldisksize(void); - uint64 select_publishcount(time_t publish_tt); + void select_report(time_t publish_tt, uint64 &count, uint64 &disksize, uint64 &publish); void insert(O2DatRecList &in, bool to_rebuild); Modified: trunk/o2on/src.o2on/O2ReportMaker.cpp =================================================================== --- trunk/o2on/src.o2on/O2ReportMaker.cpp 2008-10-14 12:51:27 UTC (rev 125) +++ trunk/o2on/src.o2on/O2ReportMaker.cpp 2008-11-01 17:05:52 UTC (rev 126) @@ -176,10 +176,11 @@ (total_uptime == 0 ? 0 : (double)(accum_total_u+accum_total_d)/total_uptime*8)); //dat????? - uint64 datnum = DatDB->select_datcount(); - uint64 datsize = DatDB->select_totaldisksize(); - uint64 pubnum = DatDB->select_publishcount(PUBLISH_ORIGINAL_TT); - + uint64 datnum = 0; + uint64 datsize = 0; + uint64 pubnum = 0; + DatDB->select_report(PUBLISH_ORIGINAL_TT, datnum, datsize, pubnum); + //publish? wchar_t publishper[32]; if (datnum == 0) From o2on-svn ＠ lists.sourceforge.jp Sun Nov 2 16:51:26 2008 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sun, 02 Nov 2008 16:51:26 +0900 Subject: [o2on-svn] =?utf-8?b?WzEyN10gRklYOiAgYmJzbmFtZeOBq+Wkp+aWh+Wtlw==?= =?utf-8?b?44GM5ZCr44G+44KM44KL5p2/44GMYmJzbWVudeOBi+OCieODlOODg+OCrw==?= =?utf-8?b?44Ki44OD44OX44GV44KM44Gq44GE?= Message-ID: <1225612286.106057.12196.nullmailer@users.sourceforge.jp> Revision: 127 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=o2on&view=rev&rev=127 Author: electrolysis Date: 2008-11-02 16:51:25 +0900 (Sun, 02 Nov 2008) Log Message: ----------- FIX: bbsnameに大文字が含まれる板がbbsmenuからピックアップされない http://pc11.2ch.net/test/read.cgi/tech/1212302014/691-696 Modified Paths: -------------- trunk/o2on/src.o2on/O2Boards.cpp Modified: trunk/o2on/src.o2on/O2Boards.cpp =================================================================== --- trunk/o2on/src.o2on/O2Boards.cpp 2008-11-01 17:05:52 UTC (rev 126) +++ trunk/o2on/src.o2on/O2Boards.cpp 2008-11-02 07:51:25 UTC (rev 127) @@ -173,7 +173,7 @@ std::getline(ss, line); wstring pattern; - pattern = L"^([^<]+)"; + pattern = L"^([^<]+)"; boost::wregex regex(pattern); boost::wsmatch m; From o2on-svn ＠ lists.sourceforge.jp Tue Nov 18 22:34:56 2008 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Tue, 18 Nov 2008 22:34:56 +0900 Subject: [o2on-svn] =?utf-8?b?WzEyOF0gcmVjLiBsYXN0cHVibGlzaOOBruWApOOCkk8y?= =?utf-8?b?RGF0REIgOjp1cGRhdGUoTzJEYXRSZWNMaXN0ICZpbikg44Gn44Gv5L2/55So?= =?utf-8?b?44GX44Gm44GE44Gq44GE44Gu44Gn5YmK6Zmk?= Message-ID: <1227015296.607062.12922.nullmailer@users.sourceforge.jp> Revision: 128 http://svn.sourceforge.jp/view?root=o2on&view=rev&rev=128 Author: laxmi Date: 2008-11-18 22:34:56 +0900 (Tue, 18 Nov 2008) Log Message: ----------- rec.lastpublish?????2DatDB::update(O2DatRecList &in)?с?篏睡???????????у??? Modified Paths: -------------- trunk/o2on/src.o2on/O2Client.cpp trunk/o2on/src.o2on/O2DatDB.cpp Modified: trunk/o2on/src.o2on/O2Client.cpp =================================================================== --- trunk/o2on/src.o2on/O2Client.cpp 2008-11-02 07:51:25 UTC (rev 127) +++ trunk/o2on/src.o2on/O2Client.cpp 2008-11-18 13:34:56 UTC (rev 128) @@ -693,6 +693,11 @@ +// --------------------------------------------------------------------------- +// ????????connect +// +// --------------------------------------------------------------------------- + int O2Client:: connect2(SOCKET s, const struct sockaddr *name, int namelen, int timeout) Modified: trunk/o2on/src.o2on/O2DatDB.cpp =================================================================== --- trunk/o2on/src.o2on/O2DatDB.cpp 2008-11-02 07:51:25 UTC (rev 127) +++ trunk/o2on/src.o2on/O2DatDB.cpp 2008-11-18 13:34:56 UTC (rev 128) @@ -1246,11 +1246,11 @@ O2DatDB:: AddUpdateQueue(const hashT &hash) { + //note:????B???????R????????? UpdateQueueLock.Lock(); { O2DatRec rec; rec.hash = hash; - rec.lastpublish = time(NULL); rec.userdata = 1; UpdateQueue.push_back(rec); } From o2on-svn ＠ lists.sourceforge.jp Tue Nov 18 22:45:38 2008 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Tue, 18 Nov 2008 22:45:38 +0900 Subject: [o2on-svn] =?utf-8?b?WzEyOV0gQ0hHIDogIOWQjOS4gOODj+ODg+OCt+ODpQ==?= =?utf-8?b?44Gr5a++44GX44Gm6KSH5pWw5Lu244Gu77yk77yi5pu05pawIChsYXN0cHVi?= =?utf-8?b?bGlzaCkg44KS6KGM44Gj44Gm44GE44Gf44Gf44KB5LiA5Zue44Gg44GR6KGM?= =?utf-8?b?44GG44KI44GG44Gr5aSJ5pu0?= Message-ID: <1227015938.426751.21814.nullmailer@users.sourceforge.jp> Revision: 129 http://svn.sourceforge.jp/view?root=o2on&view=rev&rev=129 Author: laxmi Date: 2008-11-18 22:45:38 +0900 (Tue, 18 Nov 2008) Log Message: ----------- CHG : ????????ャ?絲障?????遺散??爾鐚∽???lastpublish)????ｃ???????筝?????茵?????????? Modified Paths: -------------- trunk/o2on/src.o2on/O2Job_PublishOriginal.h Modified: trunk/o2on/src.o2on/O2Job_PublishOriginal.h =================================================================== --- trunk/o2on/src.o2on/O2Job_PublishOriginal.h 2008-11-18 13:34:56 UTC (rev 128) +++ trunk/o2on/src.o2on/O2Job_PublishOriginal.h 2008-11-18 13:45:38 UTC (rev 129) @@ -40,7 +40,7 @@ typedef std::map O2NodeKeyMap; typedef O2NodeKeyMap::iterator O2NodeKeyMapIt; - + typedef hashListT::iterator hashListTIt; public: O2Job_PublishOriginal(const wchar_t *name , time_t interval @@ -82,14 +82,19 @@ //stopwatch sw("[[ PublishOriginal ]]"); O2KeyList keylist; O2KeyListIt kit; - + + hashListT hashlist; + hashListTIt hit; // ?Ldat????publish if (DatIO->GetLocalFileKeys(keylist, PUBLISH_ORIGINAL_TT, PUBLISHNUM_PER_THREAD) > 0) { - Publish(keylist, "dat"); - for (kit = keylist.begin(); kit != keylist.end(); kit++) { - DatDB->AddUpdateQueue(kit->hash); //lastpublish?? + Publish(keylist, "dat", hashlist); + //Publish?????????????????????????????????B + hashlist.sort(); + hashlist.unique(); + for (hit = hashlist.begin(); hit != hashlist.end(); hit++) { + DatDB->AddUpdateQueue(*hit); //lastpublish?? } - keylist.clear(); + hashlist.clear(); } // ?????L??publish @@ -99,15 +104,14 @@ kit->ip = Profile->GetIP(); kit->port = Profile->GetP2PPort(); } - Publish(keylist, "saku"); - for (kit = keylist.begin(); kit != keylist.end(); kit++) { - SakuDB->SetDate(kit->hash, time(NULL)); //date?? + Publish(keylist, "saku", hashlist); + for (hit = hashlist.begin(); hit != hashlist.end(); hit++) { + SakuDB->SetDate(*hit, time(NULL)); //date?? } - keylist.clear(); + hashlist.clear(); } } - - void Publish(O2KeyList &keylist, const char *category) + void Publish(O2KeyList &keylist, const char *category, hashListT &hashlist) { O2NodeKeyMap nkmap; @@ -165,7 +169,7 @@ if (CheckResponse(&ss, header, NodeDB, node)) { O2KeyListIt kit; for (kit = nkit->second.begin(); kit != nkit->second.end() && IsActive(); kit++) { - keylist.push_back(*kit); + hashlist.push_back(kit->hash); } } From o2on-svn ＠ lists.sourceforge.jp Tue Nov 25 02:17:41 2008 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Tue, 25 Nov 2008 02:17:41 +0900 Subject: [o2on-svn] =?utf-8?b?WzEzMF0gRklYIDog44Kv44Kp44O844K/44K144Kk44K6?= =?utf-8?b?44Gu5Yi26ZmQ5YCk44GMMTbmoYHjgpLotoXjgYjjgZ/mmYLjgIFPMlByb2Zp?= =?utf-8?q?le=23ExportToXML=E3=81=A7buffer_overflow?= Message-ID: <1227547061.074171.31155.nullmailer@users.sourceforge.jp> Revision: 130 http://svn.sourceforge.jp/view?root=o2on&view=rev&rev=130 Author: laxmi Date: 2008-11-25 02:17:40 +0900 (Tue, 25 Nov 2008) Log Message: ----------- FIX :クォータサイズの制限値が16桁を超えた時、O2Profile#ExportToXMLでbuffer overflow 参考情報　uint64の最大桁は20桁 Modified Paths: -------------- trunk/o2on/src.o2on/O2Profile.cpp Modified: trunk/o2on/src.o2on/O2Profile.cpp =================================================================== --- trunk/o2on/src.o2on/O2Profile.cpp 2008-11-18 13:45:38 UTC (rev 129) +++ trunk/o2on/src.o2on/O2Profile.cpp 2008-11-24 17:17:40 UTC (rev 130) @@ -1150,7 +1150,7 @@ ExportToXML(const O2ProfileSelectCondition cond, string &out) { wstring tmpstr; - wchar_t tmp[16]; + wchar_t tmp[32]; wstring xml; xml += L""EOL; - swprintf_s(tmp, 16, L"%I64u", QuarterSize); + swprintf_s(tmp, 32, L"%I64u", QuarterSize); xml += L" "; xml += tmp; xml += L""EOL; From o2on-svn ＠ lists.sourceforge.jp Sun Nov 30 01:15:38 2008 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sun, 30 Nov 2008 01:15:38 +0900 Subject: [o2on-svn] =?utf-8?b?WzEzMV0gIHByaW50ZuOBruabuOW8j+ioreWumuOBpyVJ?= =?utf-8?b?NjTjgpLkvb/nlKjjgZfjgabjgYTjgovpg6jliIbjgatSZXYxMzDjga7jg5E=?= =?utf-8?b?44OD44OB44KS5bCO5YWl?= Message-ID: <1227975338.151144.11090.nullmailer@users.sourceforge.jp> Revision: 131 http://svn.sourceforge.jp/view?root=o2on&view=rev&rev=131 Author: laxmi Date: 2008-11-30 01:15:37 +0900 (Sun, 30 Nov 2008) Log Message: ----------- printfの書式設定で%I64を使用している部分にRev130のパッチを導入 Revision Links: -------------- http://svn.sourceforge.jp/view?root=o2on&view=rev&rev=130 Modified Paths: -------------- trunk/o2on/src.o2on/O2DatPath.h trunk/o2on/src.o2on/O2KeyDB.cpp trunk/o2on/src.o2on/dataconv.cpp Modified: trunk/o2on/src.o2on/O2DatPath.h =================================================================== --- trunk/o2on/src.o2on/O2DatPath.h 2008-11-24 17:17:40 UTC (rev 130) +++ trunk/o2on/src.o2on/O2DatPath.h 2008-11-29 16:15:37 UTC (rev 131) @@ -250,8 +250,8 @@ void geturl(string &url) const { - char datstr[16]; - sprintf_s(datstr, 16, "%I64u", _strtoui64(datnameA.c_str(), NULL, 10)); + char datstr[32]; + sprintf_s(datstr, 32, "%I64u", _strtoui64(datnameA.c_str(), NULL, 10)); url = "http://"; url += hostnameA; url += "/test/read.cgi/"; @@ -263,8 +263,8 @@ void geturl(wstring &url) const { - wchar_t datstr[16]; - swprintf_s(datstr, 16, L"%I64u", _wcstoui64(datnameW.c_str(), NULL, 10)); + wchar_t datstr[32]; + swprintf_s(datstr, 32, L"%I64u", _wcstoui64(datnameW.c_str(), NULL, 10)); url = L"http://"; url += hostnameW; url += L"/test/read.cgi/"; @@ -276,8 +276,8 @@ void get_o2_dat_path(string &path) { - char datstr[16]; - sprintf_s(datstr, 16, "%I64u", _strtoui64(datnameA.c_str(), NULL, 10)); + char datstr[32]; + sprintf_s(datstr, 32, "%I64u", _strtoui64(datnameA.c_str(), NULL, 10)); path += domainA; path += "/"; path += bbsnameA; @@ -287,8 +287,8 @@ void get_o2_dat_path(wstring &path) { - wchar_t datstr[16]; - swprintf_s(datstr, 16, L"%I64u", _wcstoui64(datnameW.c_str(), NULL, 10)); + wchar_t datstr[32]; + swprintf_s(datstr, 32, L"%I64u", _wcstoui64(datnameW.c_str(), NULL, 10)); path += domainW; path += L"/"; path += bbsnameW; Modified: trunk/o2on/src.o2on/O2KeyDB.cpp =================================================================== --- trunk/o2on/src.o2on/O2KeyDB.cpp 2008-11-24 17:17:40 UTC (rev 130) +++ trunk/o2on/src.o2on/O2KeyDB.cpp 2008-11-29 16:15:37 UTC (rev 131) @@ -588,7 +588,7 @@ MakeKeyElement(const O2Key &key, O2KeySelectCondition &cond, wstring &xml) { wstring tmpstr; - wchar_t tmp[16]; + wchar_t tmp[32]; xml += L""EOL; @@ -622,7 +622,7 @@ if (cond.mask & KEY_XMLELM_SIZE) { xml += L" "; - swprintf_s(tmp, 16, L"%I64u", key.size); + swprintf_s(tmp, 32, L"%I64u", key.size); xml += tmp; xml += L""EOL; } Modified: trunk/o2on/src.o2on/dataconv.cpp =================================================================== --- trunk/o2on/src.o2on/dataconv.cpp 2008-11-24 17:17:40 UTC (rev 130) +++ trunk/o2on/src.o2on/dataconv.cpp 2008-11-29 16:15:37 UTC (rev 131) @@ -925,7 +925,7 @@ void xml_AddElement(wstring &xml, const wchar_t *tag, const wchar_t *attr, __int64 val) { wstring s; - wchar_t tmp[16]; + wchar_t tmp[32]; xml += L'<'; xml += tag; @@ -934,7 +934,7 @@ xml += attr; } xml += L'>'; - swprintf_s(tmp, 16, L"%I64d", val); + swprintf_s(tmp, 32, L"%I64d", val); xml += tmp; xml += L"'; - swprintf_s(tmp, 16, L"%I64u", val); + swprintf_s(tmp, 32, L"%I64u", val); xml += tmp; xml += L" Revision: 132 http://svn.sourceforge.jp/view?root=o2on&view=rev&rev=132 Author: laxmi Date: 2008-12-01 01:34:08 +0900 (Mon, 01 Dec 2008) Log Message: ----------- FIX : o2on???絽悟?篋????riend.xml???絎鴻?Node.xml???絎鴻?筝?????????? Modified Paths: -------------- trunk/o2on/src.o2on/O2Server_HTTP_Admin.h Modified: trunk/o2on/src.o2on/O2Server_HTTP_Admin.h =================================================================== --- trunk/o2on/src.o2on/O2Server_HTTP_Admin.h 2008-11-29 16:15:37 UTC (rev 131) +++ trunk/o2on/src.o2on/O2Server_HTTP_Admin.h 2008-11-30 16:34:08 UTC (rev 132) @@ -1426,7 +1426,7 @@ else { NodeDB->SetXMLMessage(L"??????????", L"succeeded"); } - NodeDB->Save(Profile->GetFriendFilePath()); + FriendDB->Save(Profile->GetFriendFilePath()); } } else if (act == "delete") { @@ -1438,7 +1438,7 @@ FriendDB->Delete(hash); } } - NodeDB->Save(Profile->GetFriendFilePath()); + FriendDB->Save(Profile->GetFriendFilePath()); } } }