serverwnd.cpp.rej

eMule0.44b的原代码

***************
*** 32,37 ****
  #include "Sockets.h"
  #include "MuleStatusBarCtrl.h"
  #include "HelpIDs.h"
  
  #ifdef _DEBUG
  #undef THIS_FILE
--- 37,43 ----
  #include "Sockets.h"
  #include "MuleStatusBarCtrl.h"
  #include "HelpIDs.h"
+ #include "TaskbarNotifier.h"		//VeryCD版
  
  #ifdef _DEBUG
  #undef THIS_FILE
***************
*** 608,613 ****
  	m_MyInfo.SetSelectionCharFormat(m_cfBold);
  	m_MyInfo << _T("eD2K ") << GetResString(IDS_NETWORK) << _T("\r\n");
  	m_MyInfo.SetSelectionCharFormat(m_cfDef);
  
  	m_MyInfo << GetResString(IDS_STATUS) << _T(":\t");
  	if (theApp.serverconnect->IsConnected())
--- 617,624 ----
  	m_MyInfo.SetSelectionCharFormat(m_cfBold);
  	m_MyInfo << _T("eD2K ") << GetResString(IDS_NETWORK) << _T("\r\n");
  	m_MyInfo.SetSelectionCharFormat(m_cfDef);
+ 	m_MyInfo << GetResString(IDS_MYUSERHASH)<< ":\t"; //VeryCD版，在此显示UserHash
+ 	m_MyInfo << EncodeBase16((const unsigned char*)thePrefs.GetUserHash(), 16) << "\r\n";
  
  	m_MyInfo << GetResString(IDS_STATUS) << _T(":\t");
  	if (theApp.serverconnect->IsConnected())
***************
*** 661,691 ****
  	///////////////////////////////////////////////////////////////////////////
  	// Kademlia
  	///////////////////////////////////////////////////////////////////////////
- 	m_MyInfo.SetSelectionCharFormat(m_cfBold);
- 	m_MyInfo << GetResString(IDS_KADEMLIA) << _T(" ") << GetResString(IDS_NETWORK) << _T("\r\n");
- 	m_MyInfo.SetSelectionCharFormat(m_cfDef);
  	
- 	m_MyInfo << GetResString(IDS_STATUS) << _T(":\t");
- 	if(Kademlia::CKademlia::isConnected()){
- 		if(Kademlia::CKademlia::isFirewalled())
- 			m_MyInfo << GetResString(IDS_FIREWALLED);
  		else
- 			m_MyInfo << GetResString(IDS_KADOPEN);
  		m_MyInfo << _T("\r\n");
  
- 		CString IP;
- 		Kademlia::CMiscUtils::ipAddressToString(Kademlia::CKademlia::getPrefs()->getIPAddress(),&IP);
- 		buffer.Format(_T("%s:%i"), IP, thePrefs.GetUDPPort());
- 		m_MyInfo << GetResString(IDS_IP) << _T(":") << GetResString(IDS_PORT) << _T("\t") << buffer << _T("\r\n");
  
- 		buffer.Format(_T("%u"),Kademlia::CKademlia::getPrefs()->getIPAddress());
- 		m_MyInfo << GetResString(IDS_ID) << _T("\t") << buffer << _T("\r\n");
  	}
- 	else if (Kademlia::CKademlia::isRunning())
- 		m_MyInfo << GetResString(IDS_CONNECTING) << _T("\r\n");
- 	else
- 		m_MyInfo << GetResString(IDS_DISCONNECTED) << _T("\r\n");
- 	m_MyInfo << _T("\r\n");
  
  	///////////////////////////////////////////////////////////////////////////
  	// Web Interface
--- 672,732 ----
  	///////////////////////////////////////////////////////////////////////////
  	// Kademlia
  	///////////////////////////////////////////////////////////////////////////
+ 	if(thePrefs.networkkademlia){		//VeryCD
+ 		m_MyInfo.SetSelectionCharFormat(m_cfBold);
+ 		m_MyInfo << GetResString(IDS_KADEMLIA) << _T(" ") << GetResString(IDS_NETWORK) << _T("\r\n");
+ 		m_MyInfo.SetSelectionCharFormat(m_cfDef);
+ 		
+ 		m_MyInfo << GetResString(IDS_STATUS) << _T(":\t");
+ 		if(Kademlia::CKademlia::isConnected()){
+ 			if(Kademlia::CKademlia::isFirewalled())
+ 				m_MyInfo << GetResString(IDS_FIREWALLED);
+ 			else
+ 				m_MyInfo << GetResString(IDS_KADOPEN);
+ 			m_MyInfo << _T("\r\n");
  	
+ 			CString IP;
+ 			Kademlia::CMiscUtils::ipAddressToString(Kademlia::CKademlia::getPrefs()->getIPAddress(),&IP);
+ 			buffer.Format(_T("%s:%i"), IP, thePrefs.GetUDPPort());
+ 			m_MyInfo << GetResString(IDS_IP) << _T(":") << GetResString(IDS_PORT) << _T("\t") << buffer << _T("\r\n");
+ 	
+ 			buffer.Format(_T("%u"),Kademlia::CKademlia::getPrefs()->getIPAddress());
+ 			m_MyInfo << GetResString(IDS_ID) << _T("\t") << buffer << _T("\r\n");
+ 		}
+ 		else if (Kademlia::CKademlia::isRunning())
+ 			m_MyInfo << GetResString(IDS_CONNECTING) << _T("\r\n");
  		else
+ 			m_MyInfo << GetResString(IDS_DISCONNECTED) << _T("\r\n");
  		m_MyInfo << _T("\r\n");
+ 	}
+ 	if(thePrefs.networkkademlia2){
+ 		m_MyInfo.SetSelectionCharFormat(m_cfBold);
+ 		m_MyInfo << GetResString(IDS_VKAD) << _T(" ") << GetResString(IDS_NETWORK) << _T("\r\n");
+ 		m_MyInfo.SetSelectionCharFormat(m_cfDef);
+ 		
+ 		m_MyInfo << GetResString(IDS_STATUS) << _T(":\t");
+ 		if(Kademlia2::CKademlia::isConnected()){
+ 			if(Kademlia2::CKademlia::isFirewalled())
+ 				m_MyInfo << GetResString(IDS_FIREWALLED);
+ 			else
+ 				m_MyInfo << GetResString(IDS_KADOPEN);
+ 			m_MyInfo << _T("\r\n");
  
+ 			CString IP;
+ 			Kademlia2::CMiscUtils::ipAddressToString(Kademlia2::CKademlia::getPrefs()->getIPAddress(),&IP);
+ 			buffer.Format(_T("%s:%i"), IP, thePrefs.GetUDPPort());
+ 			m_MyInfo << GetResString(IDS_IP) << _T(":") << GetResString(IDS_PORT) << _T("\t") << buffer << _T("\r\n");
+   
+ 			buffer.Format(_T("%u"),Kademlia2::CKademlia::getPrefs()->getIPAddress());
+ 			m_MyInfo << GetResString(IDS_ID) << _T("\t") << buffer << _T("\r\n");
+ 		}
+ 		else if (Kademlia2::CKademlia::isRunning())
+ 			m_MyInfo << GetResString(IDS_CONNECTING) << _T("\r\n");
+ 		else
+ 			m_MyInfo << GetResString(IDS_DISCONNECTED) << _T("\r\n");
  
+ 		m_MyInfo << _T("\r\n");
  	}
  
  	///////////////////////////////////////////////////////////////////////////
  	// Web Interface