From ff2cb82f3c6d0e14d5c5db393ea2cba138df9a13 Mon Sep 17 00:00:00 2001 From: eru Date: Wed, 9 Mar 2011 23:16:54 +0900 Subject: [PATCH] =?utf8?q?=E9=9D=9E=E3=83=AA=E3=83=AC=E3=83=BC=E4=B8=AD?= =?utf8?q?=E3=81=AE=E3=83=81=E3=83=A3=E3=83=B3=E3=83=8D=E3=83=AB=E6=83=85?= =?utf8?q?=E5=A0=B1=E3=82=92=E4=B8=80=E6=8B=AC=E5=89=8A=E9=99=A4=E3=81=A7?= =?utf8?q?=E3=81=8D=E3=82=8B=E6=A9=9F=E8=83=BD=E3=82=92=E8=BF=BD=E5=8A=A0?= =?utf8?q?=20S=5FIDLE=20||=20S=5FNOTFOUND=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- core/common/version2.h | 6 +- ui/win32/simple/Simple.vcproj | 6 +- ui/win32/simple/gui.cpp | 28 +++++++ ‚ê‚Ç‚ß.txt | 167 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 202 insertions(+), 5 deletions(-) create mode 100644 ‚ê‚Ç‚ß.txt diff --git a/core/common/version2.h b/core/common/version2.h index e5a1cfd..d87d713 100644 --- a/core/common/version2.h +++ b/core/common/version2.h @@ -44,9 +44,9 @@ extern int version_ex; // VERSION_EX #if 1 /* for VP extend version */ //#define VERSION_EX 1 static const char *PCP_CLIENT_VERSION_EX_PREFIX = "IM"; // 2bytes only -static const int PCP_CLIENT_VERSION_EX_NUMBER = 43; -static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0043)"; -static const char *PCX_VERSTRING_EX = "v0.1218(IM0043)"; +static const int PCP_CLIENT_VERSION_EX_NUMBER = 44; +static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0044)"; +static const char *PCX_VERSTRING_EX = "v0.1218(IM0044)"; static const char *PCP_CLIENT_DIST_URL = "http://pecaim.net/"; static const char *PCP_CLIENT_VERSION_URL = "version.pecaim.net"; diff --git a/ui/win32/simple/Simple.vcproj b/ui/win32/simple/Simple.vcproj index ef97372..cab34d3 100644 --- a/ui/win32/simple/Simple.vcproj +++ b/ui/win32/simple/Simple.vcproj @@ -1327,7 +1327,7 @@ OutputFile="Release/PeerCast.exe" LinkIncremental="1" SuppressStartupBanner="true" - AdditionalLibraryDirectories=""C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Release"" + AdditionalLibraryDirectories="../../../core\win32\lib\Release" GenerateDebugInformation="true" ProgramDatabaseFile=".\Release/PeerCast.pdb" StripPrivateSymbols="PeerCast-dist.pdb" @@ -1362,6 +1362,7 @@ Name="VCPostBuildEventTool" Description="Copy exe to pimp" CommandLine="copy release\peercast.exe ..\pimp\ " + ExcludedFromBuild="true" /> autoServe = false; break; + case 1107: // ”ñƒŠƒŒ[’†‚̃`ƒƒƒ“ƒlƒ‹î•ñ‚ð‘S‚č폜 + { + LOG_DEBUG("Start cleaning up unused channels"); + while (cd) + { + if (cd->getStatus() == Channel::S_NOTFOUND + || cd->getStatus() == Channel::S_IDLE) + { + Channel *c = chanMgr->findChannelByChannelID(cd->getChannelId()); + + if (c && !c->bumped) + { + c->thread.active = false; + c->thread.finish = true; + } + } + + cd = cd->getNextData(); + } + LOG_DEBUG("Finish a cleanup of unused channels"); + } + break; } } diff --git a/‚ê‚Ç‚ß.txt b/‚ê‚Ç‚ß.txt new file mode 100644 index 0000000..3ec6883 --- /dev/null +++ b/‚ê‚Ç‚ß.txt @@ -0,0 +1,167 @@ +PeerCast IM0044 (released on 20110309 by ‚¦‚é[) +based on PeerCast IM7651 by Trill, Original: (c) 2005-2007 giles/peercast.org + + += ŠT—v + IM7651‚Ɉȉº‚Ì‹@”\C³‚ðŽ{‚µ‚½•¨B + + - ’¼‰º‚ðŽæ‚Á‚Ä‚¢‚éƒ`ƒƒƒ“ƒlƒ‹‚ÌBumpŽž‚ÉŠm”FƒƒbƒZ[ƒW‚ð•\Ž¦B + + - ‹N“®Žž‚ÉŽ©“®‚ÅGUI‚ðŠJ‚­‹@”\(ƒIƒvƒVƒ‡ƒ“) + + - GUI•\Ž¦Žž‚ÉŽ©“®‚ōőO–Ê‚Æ‚·‚é‹@”\(ƒIƒvƒVƒ‡ƒ“) + + - ƒ`ƒƒƒ“ƒlƒ‹–ˆ‚ɃŠƒŒ[”‚̏ãŒÀ‚ðÝ’è‚Å‚«‚é‹@”\B + + ƒ`ƒƒƒ“ƒlƒ‹î•ñƒ_ƒCƒAƒƒO‚æ‚è•ÏX‚Å‚«‚Ü‚·B + + 0‚ɐݒ肵‚½ê‡‚É‚ÍŠù’è’l‚ª—˜—p‚³‚ê‚Ü‚·B + + index.txt‚ɂ‚¢‚Ă͐ݒè‰æ–ʂŌ•ʐݒ肪‰Â”\‚È‚Ì‚Å + ƒ`ƒƒƒ“ƒlƒ‹î•ñ‚©‚ç‚͕ύX‚Å‚«‚Ü‚¹‚ñB + + - ƒgƒ‰ƒtƒBƒbƒNƒ‚ƒjƒ^ + + PeerCast‚̍ċN“®‚ŃŠƒZƒbƒgB + + - ƒGƒ‰[—Ž‚¿Žž‚̃ƒOƒ_ƒ“ƒv‹@”\ + + ‹­§I—¹‚µ‚½ÛA‚Ò‚ ‚©‚·‚̃Cƒ“ƒXƒg[ƒ‹ƒfƒBƒŒƒNƒgƒŠ‚É + dump.htmlAdump.dmp‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹‚ª¶¬‚³‚ê‚Ü‚·B + ‚»‚̃ƒO‚ð“n‚µ‚ĖႦ‚é‚ÆŠì‚Ñ‚Ü‚·‚ªAŽ–‘O‚É4Ží—ނ̃ƒO‘S‚Ä‚ð + ‹L˜^‚·‚é—l‚ɐݒè‚ð‚¨Šè‚¢‚µ‚Ü‚·B + + += ”’ˆÓ + - 1. “®ì‚ɂ‚¢‚Ä + •s‹ï‡‚È‚Ç‚É‚æ‚éÓ”C‚Í•‰‚¢‚©‚Ë‚Ü‚·BAt your own riskB + ‚Ü‚½“®ìŠm”F‚ÍXP SP3/Win7‚Ì‚Ý‚ÅŽÀŽ{‚µ‚Ä‚¨‚èA‚»‚Ì‘¼‚̊‹«‚É‚¨‚¯‚é“®ì + ‚ɂ‚¢‚Ă͈êØ•ÛØ‚µ‚Ü‚¹‚ñB + + - 2. “¯«‚ÌDLL‚ɂ‚¢‚Ä + + 1Bdbghelp.dll (6.9.3.113) + ‚±‚ÌDLL‚ÍDebugging Tools for Windows(6.9.3.113)‚ÉŠÜ‚Ü‚ê‚éÄ”Еz‰Â”\ + ƒRƒ“ƒ|[ƒlƒ“ƒg‚Å‚ ‚èA‚»‚ÌŒ —˜‚ÍMicrosoft‚É‹A‘®‚µ‚Ü‚·B + ‚Ü‚½Ä”Еz‚Í‚±‚̃vƒƒOƒ‰ƒ€‚Æ‹¤‚ɍs‚¤ê‡‚Ì‚Ý‹–‰Â‚³‚ê‚Ü‚·B + + += Šù’m‚̃oƒO + - Ž‹’®’†‚̃`ƒƒƒ“ƒlƒ‹‚ðØ’f‚µ‚½ê‡A‹­§I—¹‚·‚éê‡‚ª‚ ‚è‚Ü‚·B + ƒ`ƒƒƒ“ƒlƒ‹‚̐ؒf‚̓ŠƒŒ[‚ª’âŽ~‚µ‚½Œã‚ɍs‚¤‚悤‚É‚µ‚Ä‚­‚¾‚³‚¢B + + += ‰ü’ù—š—ð + - IM0044 (110309) + + GUI‚̉EƒNƒŠƒbƒNƒƒjƒ…[‚©‚烊ƒŒ[‚µ‚Ä‚¢‚È‚¢ƒ`ƒƒƒ“ƒlƒ‹î•ñ‚ð + ˆêŠ‡íœ‚Å‚«‚é‚悤‚É‚È‚è‚Ü‚µ‚½B + + - IM0043 (110129) + + WebGUI‚̃ŒƒXƒ|ƒ“ƒX‚ª’ቺ‚µ‚Ä‚¢‚½•s‹ï‡‚ðC³B + + ¡‰ñ‚©‚çx86”ŃRƒA‚ðSSE2ƒIƒvƒVƒ‡ƒ“•t‚«‚݂̂ɕύXB + SSE2”ñ‘ΉžCPU‚Å“®ì‚µ‚È‚¢ê‡‚̓\[ƒX‚©‚çƒRƒ“ƒpƒCƒ‹‚µ‚Ä‚­‚¾‚³‚¢B + + - IM0042 (101120) + + ƒ`ƒƒƒ“ƒlƒ‹Ø’f’¼Œã‚É“¯‚¶ƒ`ƒƒƒ“ƒlƒ‹‚ðŠJ‚­‚Æ‹­§I—¹‚·‚éê‡‚ª + ‚ ‚Á‚½‚Ì‚ðC³B + + - IM0041 (101023) + + Android OS‚©‚ç‚̍ж‚ɑΉžB + ƒ`ƒƒƒ“ƒlƒ‹URLihttp://host:ip/pls/ƒnƒbƒVƒ…’l?tip=hogej‚ð + http://host:ip/stream/ƒnƒbƒVƒ…’l.wmv?tip=hoge + ‚Ə‘‚«Š·‚¦AAndroid OSã‚̃uƒ‰ƒEƒU‚©‚çŠJ‚­‚±‚Ƃōж‚Å‚«‚Ü‚·B + ‚½‚¾‚µAWMV9 AP“™‚É‚æ‚é”zM‚ÍAndroid OS‘¤‚̃fƒR[ƒ_‚ª + ‘Ήž‚µ‚Ä‚¢‚È‚¢‚½‚ߍж‚Å‚«‚Ü‚¹‚ñB + + VP”Å‚ÌGUI‚ð’ljÁB + + x86”ŃRƒA‚ðSSE2‚̃IƒvƒVƒ‡ƒ“‚ðŽw’肵‚ăRƒ“ƒpƒCƒ‹‚·‚é‚悤‚ɕύXB + SSE2”ñ‘Ήž‚ÌCPU‚ðŽg‚Á‚Ä‚¢‚éê‡‚Íx86_SSE_disabledƒtƒHƒ‹ƒ_‚Ì + ƒoƒCƒiƒŠ‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢B + + - IM0040 (090930) + + ÄÚ‘±’†‚̃`ƒƒƒ“ƒlƒ‹‚ðGUI‚©‚çØ’f•s”\‚É‚µ‚½B + + o—Í‚·‚éXML‚ªˆê•”ƒ‰ƒCƒuƒ‰ƒŠEƒ\ƒtƒgƒEƒFƒA‚Ɏ󗝂³‚ê‚È‚©‚Á‚½‚Ì‚ðC³B + + ƒo[ƒWƒ‡ƒ“î•ñ‚̉ü₂ɑΉžB + + - IM0039 (090928) + + GUI‚©‚çCOUT‚ðØ’f‚Å‚«‚é‚悤‚É‚µ‚½B + + ƒpƒbƒ`‚ðƒ}[ƒWB + + - IM0038 (090705) + + ‹­§I—¹‚·‚éƒoƒO‚ðC³B + + - IM0037 (090531) + + ‚È‚ñ‚©‚æ‚­•ª‚©‚ñ‚È‚¢C³B + + - IM0036 (090528) + + ƒo[ƒWƒ‡ƒ“ƒAƒbƒv’Ê’m‹@”\‚ð’ljÁB + + - IM0035 (090523) + + ƒfƒoƒbƒO—p‚̃R[ƒh‚𔲂«–Y‚ê‚Ä‚½B + + - IM0034 (090523) + + index_xp.txt‚ªŒ´ˆö‚Å‘¼‚̃ŠƒŒ[‚ª‹l‚܂錻Û‚ɑ΂µ‚Ä”ñí‚É“K“–‚ȑ΍ôB + Œø‰Ê•s–¾‚ȏãC‚±‚ꂪ‚³‚ç‚È‚é–â‘è‚𐶂މ”\«—L‚èB + + - IM0033 (090310) + + VistaŠÂ‹«‚ÅWindows Defender‚ªlocalhost‚̃GƒCƒŠƒAƒX‚ðÁ‹Ž‚·‚éƒoƒO‚ɑΉžB + + - IM0032 (090129) + + x64‚ÉŽb’è‘ΉžB + + - IM0031 (080914) + + —áŠOˆ—‹@\‚ðC³B + + - IM0030 (080914) + + ƒGƒ‰[—Ž‚¿‚·‚é‰Â”\«‚ª‚ ‚Á‚½‚Ì‚ð1ƒJŠC³B + + - IM0029 (080909) + + —áŠOˆ—‹@\‚ª•sŠ®‘S‚¾‚Á‚½‚Ì‚ðC³B + + - IM0028-3 (080907) + + GUI‚ŃŠƒ‚[ƒgƒzƒXƒg‚ª•\Ž¦‚³‚ê‚È‚¢Ž–‚ª‚ ‚é‚Ì‚ðC³B + + - IM0028-2 (080904) + + ƒ\[ƒXƒAƒhƒŒƒX‚ªClass D‚̒ʐM‚ðŽÕ’fB + + - IM0028 (080818) + + ƒƒOƒ_ƒ“ƒv‹@”\‚ð’ljÁB + + ƒ}ƒCƒi[ƒrƒ‹ƒh”ԍ†‚𑝂₷‚Ì‚à‚¢‚¢‰ÁŒ¸–Ê“|‚­‚³‚­‚È‚Á‚Ä‚«‚½‚̂сƒWƒƒ[ƒAƒbƒvB + + - IM0027-5-2 (080628) + + ƒgƒ‰ƒtƒBƒbƒNƒ‚ƒjƒ^‚ª1^32‚Å0‚É–ß‚Á‚Ä‚¢‚½‚Ì‚ðC³B + + - IM0027-5 (080628) + + ƒgƒ‰ƒtƒBƒbƒNƒ‚ƒjƒ^‚ð’ljÁB + + - IM0027-4-2 (080512) + + ƒ`ƒƒƒ“ƒlƒ‹‚ðŠJ‚¢‚½Û‚̃ƒCƒ“ƒEƒCƒ“ƒhƒE•\Ž¦‚ð—}Ž~B + + - IM0027-4 (080508) + + CVE-2008-2040‚ðC³B + + - IM0027-3 (080122) + + ƒoƒOC³—p‚̃pƒbƒ`(VPdiff20080120)‚ðƒ}[ƒWB + + - IM0027-2 (080106) + (’) PP”Å‚ÌGUI‚Í“‹Ú‚µ‚Ä‚¢‚È‚¢‚Ì‚ÅPP”Å‚Ì‹@”\‚ÍŽg‚¦‚Ü‚¹‚ñB + + VP0027-1‚ðƒ}[ƒWB + + - IM0027 (071230) + (’) –¢ŒöŠJ”Å + + ƒ`ƒƒƒ“ƒlƒ‹–ˆ‚ɃŠƒŒ[”ãŒÀ‚ðÝ’è‚Å‚«‚é‹@”\‚ð’ljÁB + + - IM0026-2 (071226) + (’) “®ì‚»‚Ì‚à‚̂ɏC³‚͉Á‚í‚Á‚Ä‚¢‚Ü‚¹‚ñB‚ ‚­‚Ü‚Å•\–Ê“I‚ȏC³‚Ì‚Ý‚Å‚·B + + ÄÚ‘±ŽžAGUI‚Ì•\Ž¦‚ªˆêŽž“I‚ɃGƒ‰[‚Æ‚È‚é‚Ì‚ðC³B + + ‚½‚Ü‚ÉGUI‚Ì•\Ž¦(‰º—¬ƒŠƒŒ[)‚ªƒoƒO‚é‚Ì‚ð(‘½•ª)C³B + + - IM0026 (071223) + + ƒo[ƒWƒ‡ƒ“•\‹L‚̕ύXB + + “à•”ƒf[ƒ^‚̃ƒbƒN‚É–â‘肪‚ ‚Á‚½‚Ì‚ðC³B + + VPdiff20071223(¶–½ƒLƒƒƒXƒg‘΍ôƒR[ƒh/ƒc[ƒ‹ƒXƒŒ24-517)‚ðƒ}[ƒWB + + ƒ}[ƒW‚É‚æ‚é•ÏX“_B + E‰º—¬î•ñ‚Ì‘—M‚ÉŠÈ’P‚ȑш搧ŒÀ‚ð•t‰ÁB + E‰º—¬î•ñ“à‚Ìuphost‚ÅŽ¦‚³‚ê‚éƒzƒXƒg‚ª‰º—¬‚É‘¶Ý‚µ‚È‚¢ê‡A‚»‚̉º—¬î•ñ‚ÍŽÌ‚Ä‚éB + E‰º—¬î•ñ‚𑗐M‚·‚é‚Æ‚«A’¼‰º‚̃zƒXƒgî•ñ‚ª•K‚¸‘—M‚³‚ê‚é‚悤‚ɏC³B + E‘å‚«‚·‚¬‚郊ƒXƒi[”AƒŠƒŒ[”‚𐧌ÀB + Eƒ`ƒƒƒ“ƒlƒ‹—v‹Žž‚ÉŽ©ƒzƒXƒg‚̃ŠƒXƒ“ƒ|[ƒg‚ð’Ê’mB + EŽ‡ƒzƒXƒg‚ÌŽ©“®Ø’f‚ðs‚¤ƒR[ƒh‚ðC³B + Eindex.txt‚ªƒI[ƒgBump‚³‚ê‚é‚Ü‚Å‚ÌŽžŠÔ‚ð‰„’·B + + - IM7650 + + ‰”ŁBŠô‚‚©ƒo[ƒWƒ‡ƒ“ˆá‚¢‚ª‚ ‚邯‚NJ̐S‚̃o[ƒWƒ‡ƒ“•\‹L‚͈ꏏ‚È‚Ì‚Å‹æ•Ê‚Å‚«‚È‚¢B + + VP26‚܂ł̕ύX“à—e(GUIœ‚­)‚ðƒ}[ƒWB -- 2.11.0