bug fixes

Author: smasherprog

RemoteDesktopServer_Library/BaseServer.cpp

@@ -111,7 +111,7 @@ void RemoteDesktop::BaseServer::_ConnectWrapper(unsigned short port, std::wstrin
 }
 void RemoteDesktop::BaseServer::_HandleDisconnects_DesktopSwitches(){
 	if (!_DesktopMonitor->Is_InputDesktopSelected()) _DesktopMonitor->Switch_to_Desktop(DesktopMonitor::Desktops::INPUT);
-	
+
 	//handle client disconnects here
 	if (!_DisconectClientList.empty()){
 		std::lock_guard<std::mutex> lock(_DisconectClientLock);
@@ -203,7 +203,7 @@ bool RemoteDesktop::BaseServer::_Listen(unsigned short port){
 	SocketArray.push_back(std::make_shared<SocketHandler>(listensocket, false));
 
 	WSANETWORKEVENTS NetworkEvents;
-
+	int counter = 0;
 	while (Running && !EventArray.empty()) {
 
 		auto Index = WSAWaitForMultipleEvents(EventArray.size(), EventArray.data(), FALSE, 1000, FALSE);
@@ -232,14 +232,17 @@ bool RemoteDesktop::BaseServer::_Listen(unsigned short port){
 				_OnDisconnectHandler(SocketArray[Index].get());
 			}
 		}
-		_HandleDisconnects_DesktopSwitches();
-		if (Index == WSA_WAIT_TIMEOUT)
-		{//this will check every timeout... which is good
-			std::lock_guard<std::mutex> lo(_SocketArrayLock);
-			for (auto& c : SocketArray) {
-				c->CheckState();
-			}
+		if (counter++ > 5 || Index == WSA_WAIT_TIMEOUT){
+			DEBUG_MSG("Checking Timeouts!");
+			_HandleDisconnects_DesktopSwitches();
+	
+				std::lock_guard<std::mutex> lo(_SocketArrayLock);
+				for (auto& c : SocketArray) {
+					c->CheckState();
+				}
+			
 		}
+
 	}
 
 	DEBUG_MSG("_Listen Exiting");

RemoteDesktopServer_Library/MainServer.cpp

@@ -8,7 +8,9 @@
 
 void RemoteDesktop::Startup(LPWSTR* argv, int argc, bool startasproxy){
 
-
+#if !_DEBUG
+	if (RemoteDesktop::TryToElevate(argv, argc)) return;//if the app was able to elevate, shut this instance down
+#endif
 	if ((argc > 1) && ((*argv[1] == L'-' || (*argv[1] == L'/'))))
 	{
 		if (_wcsicmp(L"uninstall", argv[1] + 1) == 0) UninstallService(Service_Name());
@@ -25,30 +27,28 @@ void RemoteDesktop::Startup(LPWSTR* argv, int argc, bool startasproxy){
 		else if (_wcsicmp(L"run", argv[1] + 1) == 0)
 		{
 			auto _Server = std::make_unique<RemoteDesktop::RD_Server>();
-			
 			if (startasproxy) _Server->Listen(DefaultPort(), DefaultGateway(), startasproxy);
 			else _Server->Listen(DefaultPort());
 		}
 	}
 	else
 	{
-
-		auto msg = std::to_wstring(DefaultPort()) + L"   " + std::wstring(DefaultGateway()) + L"   " + std::wstring(DefaultProxyGetSessionURL());
+		
 		auto ret = IDYES;
 		if (startasproxy){
 			ret = MessageBox(
 				NULL,
-				msg.c_str(),
+				DisclaimerMessage(),
 				(LPCWSTR)L"Disclaimer",
 				MB_ICONQUESTION | MB_YESNO
 				);
 		}
-
 		//try to install the service if launched normally. If the service cannot be installed it is because its already installed, or the progrm was not launched with correct permissions.
 		//in which case, try to launch the program normally.
 		if (ret == IDYES){
 			//the below line was added so that in cases where UAC is required to access the network, it will activate the pop up as early as possible
 			RemoteDesktop::PrimeNetwork(DefaultPort());
+
 			if (!InstallService(
 				Service_Name(),               // Name of service
 				Service_Display_Name(),       // Name to display

RemoteDesktopServer_Library/RD_Server.cpp

@@ -244,8 +244,11 @@ void RemoteDesktop::RD_Server::_Handle_ConnectionInfo(Packet_Header* header, con
 	memcpy(&h, data, header->PayloadLen);
 	h.UserName[UNAMELEN] = 0;
 	sh->UserName = std::wstring(h.UserName);
-	auto con = sh->UserName + L" has connected to your machine . . .";
-	_SystemTray->Popup(L"Connection Established", con.c_str(), 2000);
+	if (sh->UserName.size() > 2){
+		auto con = sh->UserName + L" has connected to your machine . . .";
+		_SystemTray->Popup(L"Connection Established", con.c_str(), 2000);
+	}
+
 }
 void RemoteDesktop::RD_Server::OnReceive(Packet_Header* header, const char* data, std::shared_ptr<SocketHandler>& sh) {
 	switch (header->Packet_Type){
@@ -282,7 +285,7 @@ void RemoteDesktop::RD_Server::OnReceive(Packet_Header* header, const char* data
 	}
 }
 void RemoteDesktop::RD_Server::OnDisconnect(std::shared_ptr<SocketHandler>& sh) {
-	if (!sh->UserName.empty()){
+	if (sh->UserName.size()>2){
 		auto con = sh->UserName + L" has Disconnected from your machine . . .";
 		_SystemTray->Popup(L"Connection Disconnected", con.c_str(), 2000);
 	} 

RemoteDesktopServer_Library/RemoteDesktopServer_Library.rc

@@ -31,8 +31,10 @@ bool InstallService(PWSTR pszServiceName,
 {
 	wchar_t szPath[MAX_PATH];
 	bool ret = false;
-	if (GetModuleFileName(NULL, szPath, ARRAYSIZE(szPath)) == 0) wprintf(L"GetModuleFileName failed w/err 0x%08lx\n", GetLastError());
-
+	if (GetModuleFileName(NULL, szPath, ARRAYSIZE(szPath)) == 0) {
+		wprintf(L"GetModuleFileName failed w/err 0x%08lx\n", GetLastError());
+		return false;
+	}
 	auto schSCManager=RAIISC_HANDLE(OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT | SC_MANAGER_CREATE_SERVICE));
 	if (schSCManager.get() == nullptr) wprintf(L"OpenSCManager failed w/err 0x%08lx\n", GetLastError());
 	else {

RemoteDesktopServer_Library/ServiceInstaller.cpp

@@ -167,6 +167,7 @@ void RemoteDesktop::SystemTray::_Run(){
 	MSG msg;
 	while (_Running && (GetMessage(&msg, Hwnd, 0, 0) != 0))
 	{
+
 		TranslateMessage(&msg);
 		DispatchMessage(&msg);
 	}
@@ -177,6 +178,7 @@ void RemoteDesktop::SystemTray::AddMenuItem(const wchar_t* itemname, Delegate<vo
 	CallBacks.push_back(cb);
 }
 void RemoteDesktop::SystemTray::Popup(const wchar_t* title, const wchar_t* message, unsigned int timeout){
+	
 	if (!_TrayIconCreated) return;
 	NOTIFYICONDATA ni;
 	memset(&ni, 0, sizeof(NOTIFYICONDATA));

RemoteDesktopServer_Library/SystemTray.cpp

@@ -30,7 +30,7 @@ void RemoteDesktop::BaseClient::Connect(std::wstring host, std::wstring port, in
 void RemoteDesktop::BaseClient::_RunWrapper(int dst_id, std::wstring aeskey){
 	int counter = 0;
 
-	while (Running && ++counter< MaxConnectAttempts){
+	while (Running && ++counter < MaxConnectAttempts){
 		DEBUG_MSG("Connect Loop % ", dst_id);
 		_OnConnectingAttempt(counter, MaxConnectAttempts);
 		if (!_Connect(dst_id, aeskey)){
@@ -55,15 +55,15 @@ bool RemoteDesktop::BaseClient::_Connect(int dst_id, std::wstring aeskey){
 	Socket->Connected_CallBack = DELEGATE(&RemoteDesktop::BaseClient::_OnConnectHandler, this);
 	Socket->Receive_CallBack = DELEGATE(&RemoteDesktop::BaseClient::_OnReceiveHandler, this);
 	Socket->Disconnect_CallBack = DELEGATE(&RemoteDesktop::BaseClient::_OnDisconnectHandler, this);
-	
+
 	Socket->Exchange_Keys(dst_id, -1, aeskey);
 	return true;
 }
 void RemoteDesktop::BaseClient::_Run(){
 	auto newevent = WSACreateEvent();
 
 	WSAEventSelect(Socket->get_Socket(), newevent, FD_CLOSE | FD_READ);
-
+	int counter = 0;
 	WSANETWORKEVENTS NetworkEvents;
 	DEBUG_MSG("Starting Loop");
 
@@ -81,11 +81,14 @@ void RemoteDesktop::BaseClient::_Run(){
 			else if (((NetworkEvents.lNetworkEvents & FD_CLOSE) == FD_CLOSE) && NetworkEvents.iErrorCode[FD_CLOSE_BIT] == ERROR_SUCCESS){
 				break;// get out of loop and try reconnecting
 			}
-		}		
-		if (Index == WSA_WAIT_TIMEOUT)
-		{//this will check every timeout... which is good
+		}
+		if (counter++ > 5 || Index == WSA_WAIT_TIMEOUT){
+			DEBUG_MSG("Checking Timeouts!");
 			Socket->CheckState();
+			counter = 0;
 		}
+
+
 	}
 	DEBUG_MSG("Ending Loop");
 	WSACloseEvent(newevent);
@@ -118,7 +121,7 @@ void RemoteDesktop::BaseClient::Send(NetworkMessages m, NetworkMsg& msg){
 }
 
 void RemoteDesktop::BaseClient::Stop() {
-	Running = false; 
+	Running = false;
 	if (std::this_thread::get_id() != _BackGroundNetworkWorker.get_id()){
 		if (_BackGroundNetworkWorker.joinable()) _BackGroundNetworkWorker.join();
 	}

RemoteDesktopServer_Library/logo.bmp

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7BE9D1DD-5D03-4070-B471-F4BF98C408D3}</ProjectGuid>
+    <ProjectGuid>{8E748DA1-9A21-42C7-B89A-94CB72BC954F}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RemoteDesktop_CSLibrary</RootNamespace>