o2on svn commit
o2on-****@lists*****
2008年 10月 4日 (土) 17:51:04 JST
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‚Å‚Í‚È‚¢‚Ì‚É‚T•ªˆÈ“à‚ÉŽóMo—ˆ‚Ä‚¢‚È‚¯‚ê‚ÎAIPƒAƒhƒŒƒX‚ª•Ï‚í‚Á‚½‰Â”\«‚ª‚ ‚éB
- // GetGlobalIP‚ðÄ“x—§‚¿ã‚°AP2P‚ªŽ~‚Ü‚Á‚Ä‚¢‚é‚Í‚¸‚È‚Ì‚ÅP2P‚àÄ‹N“®B
- // ‚½‚¾‚µ‚P‚O•ªˆÈ“à‚ÉÄ‹N“®‚µ‚Ä‚¢‚ê‚ÎA–³Ž‹
+ // I—¹ˆ—’†ˆÈŠO‚ÅAPort0‚Å‚Í‚È‚¢‚Ì‚É‚T•ªˆÈ“à‚ÉŽóMo—ˆ‚Ä‚¢‚È‚¯‚ê‚ÎA
+ // IPƒAƒhƒŒƒX‚ª•Ï‚í‚Á‚½‰Â”\«‚ª‚ ‚éB
+ // ‚½‚¾‚µA‚P‚O•ªˆÈ“à‚ÉÄ‹N“®‚µ‚Ä‚¢‚ê‚ÎA–³Ž‹
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‚ðÄ“x—§‚¿ã‚°AP2P‚ªŽ~‚Ü‚Á‚Ä‚¢‚é‚Í‚¸‚È‚Ì‚ÅP2P‚àÄ‹N“®B
LastRestartP2P = time(NULL);
Profile->SetIP(0);