o2on svn commit
o2on-****@lists*****
2008年 9月 27日 (土) 14:35:24 JST
Revision: 123
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=o2on&view=rev&rev=123
Author: osa_p
Date: 2008-09-27 14:35:23 +0900 (Sat, 27 Sep 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-24 14:05:59 UTC (rev 122)
+++ trunk/o2on/src.o2on/main.cpp 2008-09-27 05:35:23 UTC (rev 123)
@@ -2728,6 +2728,7 @@
ChangeTrayIcon(UINT id)
{
if (time(NULL) - Server_P2P->GetLastAcceptTime() < (5*60)) {
+ // ‚T•ªˆÈ“à‚ÉŽóMo—ˆ‚Ä‚¢‚ê‚ÎAƒgƒŒƒCƒAƒCƒRƒ“‚Ì O ‚ðƒOƒŒ[‚©‚çƒOƒŠ[ƒ“‚É‚·‚éB
switch (id) {
case IDI_A: id = IDI_B; break;
case IDI_A_IN: id = IDI_B_IN; break;
@@ -2735,7 +2736,25 @@
case IDI_A_INOUT: id = IDI_B_INOUT; break;
}
}
+ else {
+ // Port0‚Å‚Í‚È‚¢‚Ì‚É‚T•ªˆÈ“à‚ÉŽóMo—ˆ‚Ä‚¢‚È‚¯‚ê‚ÎAIPƒAƒhƒŒƒX‚ª•Ï‚í‚Á‚½‰Â”\«‚ª‚ ‚éB
+ // GetGlobalIP‚ðÄ“x—§‚¿ã‚°AP2P‚ªŽ~‚Ü‚Á‚Ä‚¢‚é‚Í‚¸‚È‚Ì‚ÅP2P‚àÄ‹N“®B
+ // ‚½‚¾‚µ‚P‚O•ªˆÈ“à‚ÉÄ‹N“®‚µ‚Ä‚¢‚ê‚ÎA–³Ž‹
+ static time_t LastRestartP2P = 0;
+ if ((Profile->IsPort0() == false) &&
+ (Job_GetGlobalIP->IsActive() == false) &&
+ (time(NULL) - LastRestartP2P > (10*60) )) {
+ LastRestartP2P = time(NULL);
+ Profile->SetIP(0);
+ Job_GetGlobalIP->SetActive(true);
+
+ StopP2P(false);
+ StartP2P(true);
+
+ }
+ }
+
HICON icon = (HICON)LoadImage(
instance,
MAKEINTRESOURCE(id), IMAGE_ICON,