Menu
▾
▴
[Dcplusplus-commit] SF.net SVN: dcplusplus: [598] dcplusplus/trunk
|
From: <arn...@us...> - 2006-04-30 09:34:36
|
Revision: 598 Author: arnetheduck Date: 2006-04-30 02:27:55 -0700 (Sun, 30 Apr 2006) ViewCVS: http://svn.sourceforge.net/dcplusplus/?rev=598&view=rev Log Message: ----------- New copyright, fixed some annoying crash bugs Modified Paths: -------------- dcplusplus/trunk/changelog.txt dcplusplus/trunk/client/ADLSearch.cpp dcplusplus/trunk/client/ADLSearch.h dcplusplus/trunk/client/AdcCommand.cpp dcplusplus/trunk/client/AdcCommand.h dcplusplus/trunk/client/AdcHub.cpp dcplusplus/trunk/client/AdcHub.h dcplusplus/trunk/client/BZUtils.cpp dcplusplus/trunk/client/BZUtils.h dcplusplus/trunk/client/BitInputStream.h dcplusplus/trunk/client/BitOutputStream.h dcplusplus/trunk/client/BloomFilter.h dcplusplus/trunk/client/BufferedSocket.cpp dcplusplus/trunk/client/BufferedSocket.h dcplusplus/trunk/client/CID.h dcplusplus/trunk/client/Client.cpp dcplusplus/trunk/client/Client.h dcplusplus/trunk/client/ClientManager.cpp dcplusplus/trunk/client/ClientManager.h dcplusplus/trunk/client/ClientManagerListener.h dcplusplus/trunk/client/ConnectionManager.cpp dcplusplus/trunk/client/ConnectionManager.h dcplusplus/trunk/client/ConnectionManagerListener.h dcplusplus/trunk/client/CriticalSection.h dcplusplus/trunk/client/CryptoManager.cpp dcplusplus/trunk/client/CryptoManager.h dcplusplus/trunk/client/DCPlusPlus.cpp dcplusplus/trunk/client/DCPlusPlus.h dcplusplus/trunk/client/DirectoryListing.cpp dcplusplus/trunk/client/DirectoryListing.h dcplusplus/trunk/client/DownloadManager.cpp dcplusplus/trunk/client/DownloadManager.h dcplusplus/trunk/client/Encoder.cpp dcplusplus/trunk/client/Encoder.h dcplusplus/trunk/client/Exception.h dcplusplus/trunk/client/FastAlloc.h dcplusplus/trunk/client/FavoriteManager.cpp dcplusplus/trunk/client/FavoriteManager.h dcplusplus/trunk/client/FavoriteUser.h dcplusplus/trunk/client/File.h dcplusplus/trunk/client/FilteredFile.h dcplusplus/trunk/client/FinishedManager.cpp dcplusplus/trunk/client/FinishedManager.h dcplusplus/trunk/client/HashManager.cpp dcplusplus/trunk/client/HashManager.h dcplusplus/trunk/client/HashValue.h dcplusplus/trunk/client/HttpConnection.cpp dcplusplus/trunk/client/HttpConnection.h dcplusplus/trunk/client/LogManager.cpp dcplusplus/trunk/client/LogManager.h dcplusplus/trunk/client/MerkleCheckOutputStream.h dcplusplus/trunk/client/MerkleTree.h dcplusplus/trunk/client/NmdcHub.h dcplusplus/trunk/client/Pointer.h dcplusplus/trunk/client/QueueItem.h dcplusplus/trunk/client/QueueManager.cpp dcplusplus/trunk/client/QueueManager.h dcplusplus/trunk/client/QueueManagerListener.h dcplusplus/trunk/client/ResourceManager.cpp dcplusplus/trunk/client/ResourceManager.h dcplusplus/trunk/client/SFVReader.cpp dcplusplus/trunk/client/SFVReader.h dcplusplus/trunk/client/SSLSocket.cpp dcplusplus/trunk/client/SSLSocket.h dcplusplus/trunk/client/SearchManager.cpp dcplusplus/trunk/client/SearchManager.h dcplusplus/trunk/client/SearchManagerListener.h dcplusplus/trunk/client/Semaphore.h dcplusplus/trunk/client/ServerSocket.cpp dcplusplus/trunk/client/ServerSocket.h dcplusplus/trunk/client/SettingsManager.cpp dcplusplus/trunk/client/SettingsManager.h dcplusplus/trunk/client/ShareManager.cpp dcplusplus/trunk/client/ShareManager.h dcplusplus/trunk/client/SimpleXML.cpp dcplusplus/trunk/client/SimpleXML.h dcplusplus/trunk/client/Singleton.h dcplusplus/trunk/client/Socket.cpp dcplusplus/trunk/client/Socket.h dcplusplus/trunk/client/Speaker.h dcplusplus/trunk/client/Streams.h dcplusplus/trunk/client/StringSearch.h dcplusplus/trunk/client/StringTokenizer.cpp dcplusplus/trunk/client/StringTokenizer.h dcplusplus/trunk/client/Text.cpp dcplusplus/trunk/client/Text.h dcplusplus/trunk/client/Thread.cpp dcplusplus/trunk/client/Thread.h dcplusplus/trunk/client/TigerHash.cpp dcplusplus/trunk/client/TigerHash.h dcplusplus/trunk/client/TimerManager.cpp dcplusplus/trunk/client/TimerManager.h dcplusplus/trunk/client/UploadManager.cpp dcplusplus/trunk/client/UploadManager.h dcplusplus/trunk/client/User.cpp dcplusplus/trunk/client/User.h dcplusplus/trunk/client/UserCommand.h dcplusplus/trunk/client/UserConnection.cpp dcplusplus/trunk/client/UserConnection.h dcplusplus/trunk/client/Util.cpp dcplusplus/trunk/client/Util.h dcplusplus/trunk/client/ZUtils.cpp dcplusplus/trunk/client/ZUtils.h dcplusplus/trunk/client/config.h dcplusplus/trunk/client/stdinc.cpp dcplusplus/trunk/client/stdinc.h dcplusplus/trunk/help/faq_upnp.html dcplusplus/trunk/windows/ADLSProperties.cpp dcplusplus/trunk/windows/ADLSProperties.h dcplusplus/trunk/windows/ADLSearchFrame.cpp dcplusplus/trunk/windows/ADLSearchFrame.h dcplusplus/trunk/windows/AboutDlg.h dcplusplus/trunk/windows/Advanced3Page.cpp dcplusplus/trunk/windows/Advanced3Page.h dcplusplus/trunk/windows/AdvancedPage.cpp dcplusplus/trunk/windows/AdvancedPage.h dcplusplus/trunk/windows/Appearance2Page.cpp dcplusplus/trunk/windows/Appearance2Page.h dcplusplus/trunk/windows/AppearancePage.cpp dcplusplus/trunk/windows/AppearancePage.h dcplusplus/trunk/windows/CertificatesPage.cpp dcplusplus/trunk/windows/CertificatesPage.h dcplusplus/trunk/windows/CommandDlg.cpp dcplusplus/trunk/windows/CommandDlg.h dcplusplus/trunk/windows/DirectoryListingFrm.cpp dcplusplus/trunk/windows/DirectoryListingFrm.h dcplusplus/trunk/windows/DownloadPage.cpp dcplusplus/trunk/windows/DownloadPage.h dcplusplus/trunk/windows/ExListViewCtrl.cpp dcplusplus/trunk/windows/ExListViewCtrl.h dcplusplus/trunk/windows/FavHubProperties.cpp dcplusplus/trunk/windows/FavHubProperties.h dcplusplus/trunk/windows/FavoriteDirsPage.cpp dcplusplus/trunk/windows/FavoriteDirsPage.h dcplusplus/trunk/windows/FavoritesFrm.cpp dcplusplus/trunk/windows/FavoritesFrm.h dcplusplus/trunk/windows/FinishedFrame.h dcplusplus/trunk/windows/FinishedFrameBase.h dcplusplus/trunk/windows/FinishedULFrame.h dcplusplus/trunk/windows/FlatTabCtrl.h dcplusplus/trunk/windows/GeneralPage.cpp dcplusplus/trunk/windows/GeneralPage.h dcplusplus/trunk/windows/HashProgressDlg.h dcplusplus/trunk/windows/HubFrame.cpp dcplusplus/trunk/windows/HubFrame.h dcplusplus/trunk/windows/LineDlg.h dcplusplus/trunk/windows/ListViewArrows.h dcplusplus/trunk/windows/LogPage.cpp dcplusplus/trunk/windows/LogPage.h dcplusplus/trunk/windows/MagnetDlg.h dcplusplus/trunk/windows/MainFrm.cpp dcplusplus/trunk/windows/MainFrm.h dcplusplus/trunk/windows/NetworkPage.cpp dcplusplus/trunk/windows/NetworkPage.h dcplusplus/trunk/windows/NotepadFrame.cpp dcplusplus/trunk/windows/NotepadFrame.h dcplusplus/trunk/windows/PrivateFrame.cpp dcplusplus/trunk/windows/PrivateFrame.h dcplusplus/trunk/windows/PropPage.cpp dcplusplus/trunk/windows/PropPage.h dcplusplus/trunk/windows/PropertiesDlg.cpp dcplusplus/trunk/windows/PropertiesDlg.h dcplusplus/trunk/windows/PublicHubsFrm.cpp dcplusplus/trunk/windows/PublicHubsFrm.h dcplusplus/trunk/windows/PublicHubsListDlg.h dcplusplus/trunk/windows/QueueFrame.cpp dcplusplus/trunk/windows/QueueFrame.h dcplusplus/trunk/windows/QueuePage.cpp dcplusplus/trunk/windows/QueuePage.h dcplusplus/trunk/windows/SearchFrm.cpp dcplusplus/trunk/windows/SearchFrm.h dcplusplus/trunk/windows/SingleInstance.h dcplusplus/trunk/windows/SpyFrame.cpp dcplusplus/trunk/windows/SpyFrame.h dcplusplus/trunk/windows/StatsFrame.cpp dcplusplus/trunk/windows/StatsFrame.h dcplusplus/trunk/windows/SystemFrame.cpp dcplusplus/trunk/windows/SystemFrame.h dcplusplus/trunk/windows/TextFrame.cpp dcplusplus/trunk/windows/TextFrame.h dcplusplus/trunk/windows/TransferView.cpp dcplusplus/trunk/windows/TransferView.h dcplusplus/trunk/windows/TreePropertySheet.cpp dcplusplus/trunk/windows/TreePropertySheet.h dcplusplus/trunk/windows/TypedListViewCtrl.h dcplusplus/trunk/windows/UCHandler.h dcplusplus/trunk/windows/UCPage.cpp dcplusplus/trunk/windows/UCPage.h dcplusplus/trunk/windows/UPnP.cpp dcplusplus/trunk/windows/UPnP.h dcplusplus/trunk/windows/UploadPage.cpp dcplusplus/trunk/windows/UploadPage.h dcplusplus/trunk/windows/UsersFrame.cpp dcplusplus/trunk/windows/UsersFrame.h dcplusplus/trunk/windows/WaitingUsersFrame.cpp dcplusplus/trunk/windows/WaitingUsersFrame.h dcplusplus/trunk/windows/WinUtil.cpp dcplusplus/trunk/windows/WinUtil.h dcplusplus/trunk/windows/WindowsPage.cpp dcplusplus/trunk/windows/WindowsPage.h dcplusplus/trunk/windows/main.cpp dcplusplus/trunk/windows/stdafx.cpp dcplusplus/trunk/windows/stdafx.h Modified: dcplusplus/trunk/changelog.txt =================================================================== --- dcplusplus/trunk/changelog.txt 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/changelog.txt 2006-04-30 09:27:55 UTC (rev 598) @@ -1,4 +1,11 @@ --- 0.689 2006-04-01 -- +-- -- +* Small linux / old gcc fixes (thanks jens oknelid) +* Fixed an issue where client could be crashed from remote +* Fixed an issue bad nicks could cause directories to be created in log / file list download folder +* Changed autodrop default to 2 for fewer unexpected autodrops (thanks paka) + + +-- 0.689 2006-04-01 -- * Fixed displaying of available bytes when user list is off * Fixed a potential crash when not showing user list * Fixed 100% CPU bug on upload Modified: dcplusplus/trunk/client/ADLSearch.cpp =================================================================== --- dcplusplus/trunk/client/ADLSearch.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/ADLSearch.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/ADLSearch.h =================================================================== --- dcplusplus/trunk/client/ADLSearch.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/ADLSearch.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -56,7 +56,7 @@ stringSearchList.clear(); // Replace parameters such as %[nick] - string stringParams = Util::formatParams(searchString, params); + string stringParams = Util::formatParams(searchString, params, false); // Split into substrings StringTokenizer<string> st(stringParams, ' '); Modified: dcplusplus/trunk/client/AdcCommand.cpp =================================================================== --- dcplusplus/trunk/client/AdcCommand.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/AdcCommand.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/AdcCommand.h =================================================================== --- dcplusplus/trunk/client/AdcCommand.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/AdcCommand.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/AdcHub.cpp =================================================================== --- dcplusplus/trunk/client/AdcHub.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/AdcHub.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/AdcHub.h =================================================================== --- dcplusplus/trunk/client/AdcHub.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/AdcHub.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/BZUtils.cpp =================================================================== --- dcplusplus/trunk/client/BZUtils.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/BZUtils.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/BZUtils.h =================================================================== --- dcplusplus/trunk/client/BZUtils.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/BZUtils.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/BitInputStream.h =================================================================== --- dcplusplus/trunk/client/BitInputStream.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/BitInputStream.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/BitOutputStream.h =================================================================== --- dcplusplus/trunk/client/BitOutputStream.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/BitOutputStream.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/BloomFilter.h =================================================================== --- dcplusplus/trunk/client/BloomFilter.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/BloomFilter.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/BufferedSocket.cpp =================================================================== --- dcplusplus/trunk/client/BufferedSocket.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/BufferedSocket.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/BufferedSocket.h =================================================================== --- dcplusplus/trunk/client/BufferedSocket.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/BufferedSocket.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/CID.h =================================================================== --- dcplusplus/trunk/client/CID.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/CID.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/Client.cpp =================================================================== --- dcplusplus/trunk/client/Client.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/Client.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/Client.h =================================================================== --- dcplusplus/trunk/client/Client.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/Client.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/ClientManager.cpp =================================================================== --- dcplusplus/trunk/client/ClientManager.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/ClientManager.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -391,7 +391,7 @@ ou.getClient().getHubIdentity().getParams(params, "hub", false); ou.getClient().getMyIdentity().getParams(params, "my", compatibility); ou.getClient().escapeParams(params); - ou.getClient().sendUserCmd(Util::formatParams(uc.getCommand(), params)); + ou.getClient().sendUserCmd(Util::formatParams(uc.getCommand(), params, false)); } void ClientManager::on(AdcSearch, Client*, const AdcCommand& adc, const CID& from) throw() { Modified: dcplusplus/trunk/client/ClientManager.h =================================================================== --- dcplusplus/trunk/client/ClientManager.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/ClientManager.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/ClientManagerListener.h =================================================================== --- dcplusplus/trunk/client/ClientManagerListener.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/ClientManagerListener.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/ConnectionManager.cpp =================================================================== --- dcplusplus/trunk/client/ConnectionManager.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/ConnectionManager.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -691,8 +691,9 @@ } else if(*i == UserConnection::FEATURE_TTHL) { conn->setFlag(UserConnection::FLAG_SUPPORTS_TTHL); } else if(*i == UserConnection::FEATURE_TTHF) { - conn->setFlag(UserConnection::FLAG_SUPPORTS_TTHF); - conn->getUser()->setFlag(User::TTH_GET); + conn->setFlag(UserConnection::FLAG_SUPPORTS_TTHF); + if(conn->getUser()) + conn->getUser()->setFlag(User::TTH_GET); } } } Modified: dcplusplus/trunk/client/ConnectionManager.h =================================================================== --- dcplusplus/trunk/client/ConnectionManager.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/ConnectionManager.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/ConnectionManagerListener.h =================================================================== --- dcplusplus/trunk/client/ConnectionManagerListener.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/ConnectionManagerListener.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/CriticalSection.h =================================================================== --- dcplusplus/trunk/client/CriticalSection.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/CriticalSection.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/CryptoManager.cpp =================================================================== --- dcplusplus/trunk/client/CryptoManager.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/CryptoManager.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/CryptoManager.h =================================================================== --- dcplusplus/trunk/client/CryptoManager.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/CryptoManager.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/DCPlusPlus.cpp =================================================================== --- dcplusplus/trunk/client/DCPlusPlus.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/DCPlusPlus.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/DCPlusPlus.h =================================================================== --- dcplusplus/trunk/client/DCPlusPlus.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/DCPlusPlus.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/DirectoryListing.cpp =================================================================== --- dcplusplus/trunk/client/DirectoryListing.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/DirectoryListing.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/DirectoryListing.h =================================================================== --- dcplusplus/trunk/client/DirectoryListing.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/DirectoryListing.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/DownloadManager.cpp =================================================================== --- dcplusplus/trunk/client/DownloadManager.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/DownloadManager.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/DownloadManager.h =================================================================== --- dcplusplus/trunk/client/DownloadManager.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/DownloadManager.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/Encoder.cpp =================================================================== --- dcplusplus/trunk/client/Encoder.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/Encoder.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/Encoder.h =================================================================== --- dcplusplus/trunk/client/Encoder.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/Encoder.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/Exception.h =================================================================== --- dcplusplus/trunk/client/Exception.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/Exception.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/FastAlloc.h =================================================================== --- dcplusplus/trunk/client/FastAlloc.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/FastAlloc.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/FavoriteManager.cpp =================================================================== --- dcplusplus/trunk/client/FavoriteManager.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/FavoriteManager.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/FavoriteManager.h =================================================================== --- dcplusplus/trunk/client/FavoriteManager.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/FavoriteManager.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/FavoriteUser.h =================================================================== --- dcplusplus/trunk/client/FavoriteUser.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/FavoriteUser.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/File.h =================================================================== --- dcplusplus/trunk/client/File.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/File.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/FilteredFile.h =================================================================== --- dcplusplus/trunk/client/FilteredFile.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/FilteredFile.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/FinishedManager.cpp =================================================================== --- dcplusplus/trunk/client/FinishedManager.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/FinishedManager.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/FinishedManager.h =================================================================== --- dcplusplus/trunk/client/FinishedManager.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/FinishedManager.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/HashManager.cpp =================================================================== --- dcplusplus/trunk/client/HashManager.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/HashManager.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,6 +29,7 @@ #define HASH_FILE_VERSION_STRING "2" static const u_int32_t HASH_FILE_VERSION=2; +const int64_t HashManager::MIN_BLOCK_SIZE = 64*1024; bool HashManager::checkTTH(const string& aFileName, int64_t aSize, u_int32_t aTimeStamp) { Lock l(cs); Modified: dcplusplus/trunk/client/HashManager.h =================================================================== --- dcplusplus/trunk/client/HashManager.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/HashManager.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -55,7 +55,7 @@ public: /** We don't keep leaves for blocks smaller than this... */ - static const int64_t MIN_BLOCK_SIZE = 64*1024; + static const int64_t MIN_BLOCK_SIZE; HashManager() { TimerManager::getInstance()->addListener(this); Modified: dcplusplus/trunk/client/HashValue.h =================================================================== --- dcplusplus/trunk/client/HashValue.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/HashValue.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/HttpConnection.cpp =================================================================== --- dcplusplus/trunk/client/HttpConnection.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/HttpConnection.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/HttpConnection.h =================================================================== --- dcplusplus/trunk/client/HttpConnection.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/HttpConnection.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/LogManager.cpp =================================================================== --- dcplusplus/trunk/client/LogManager.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/LogManager.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/LogManager.h =================================================================== --- dcplusplus/trunk/client/LogManager.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/LogManager.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -47,8 +47,8 @@ string path = SETTING(LOG_DIRECTORY); string msg; - path += Util::formatParams(getSetting(area, FILE), params); - msg = Util::formatParams(getSetting(area, FORMAT), params); + path += Util::formatParams(getSetting(area, FILE), params, true); + msg = Util::formatParams(getSetting(area, FORMAT), params, false); log(path, msg); } Modified: dcplusplus/trunk/client/MerkleCheckOutputStream.h =================================================================== --- dcplusplus/trunk/client/MerkleCheckOutputStream.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/MerkleCheckOutputStream.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/MerkleTree.h =================================================================== --- dcplusplus/trunk/client/MerkleTree.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/MerkleTree.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/NmdcHub.h =================================================================== --- dcplusplus/trunk/client/NmdcHub.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/NmdcHub.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/Pointer.h =================================================================== --- dcplusplus/trunk/client/Pointer.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/Pointer.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/QueueItem.h =================================================================== --- dcplusplus/trunk/client/QueueItem.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/QueueItem.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/QueueManager.cpp =================================================================== --- dcplusplus/trunk/client/QueueManager.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/QueueManager.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -81,7 +81,7 @@ sm["targetdrive"] = target.substr(0, 3); else sm["targetdrive"] = Util::getConfigPath().substr(0, 3); - setTempTarget(Util::formatParams(SETTING(TEMP_DOWNLOAD_DIRECTORY), sm) + getTempName(getTargetFileName(), getTTH())); + setTempTarget(Util::formatParams(SETTING(TEMP_DOWNLOAD_DIRECTORY), sm, true) + getTempName(getTargetFileName(), getTTH())); #else //_WIN32 setTempTarget(SETTING(TEMP_DOWNLOAD_DIRECTORY) + getTempName(getTargetFileName(), getTTH())); #endif //_WIN32 Modified: dcplusplus/trunk/client/QueueManager.h =================================================================== --- dcplusplus/trunk/client/QueueManager.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/QueueManager.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/QueueManagerListener.h =================================================================== --- dcplusplus/trunk/client/QueueManagerListener.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/QueueManagerListener.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/ResourceManager.cpp =================================================================== --- dcplusplus/trunk/client/ResourceManager.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/ResourceManager.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/ResourceManager.h =================================================================== --- dcplusplus/trunk/client/ResourceManager.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/ResourceManager.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/SFVReader.cpp =================================================================== --- dcplusplus/trunk/client/SFVReader.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/SFVReader.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/SFVReader.h =================================================================== --- dcplusplus/trunk/client/SFVReader.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/SFVReader.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/SSLSocket.cpp =================================================================== --- dcplusplus/trunk/client/SSLSocket.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/SSLSocket.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/SSLSocket.h =================================================================== --- dcplusplus/trunk/client/SSLSocket.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/SSLSocket.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/SearchManager.cpp =================================================================== --- dcplusplus/trunk/client/SearchManager.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/SearchManager.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/SearchManager.h =================================================================== --- dcplusplus/trunk/client/SearchManager.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/SearchManager.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/SearchManagerListener.h =================================================================== --- dcplusplus/trunk/client/SearchManagerListener.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/SearchManagerListener.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/Semaphore.h =================================================================== --- dcplusplus/trunk/client/Semaphore.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/Semaphore.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/ServerSocket.cpp =================================================================== --- dcplusplus/trunk/client/ServerSocket.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/ServerSocket.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/ServerSocket.h =================================================================== --- dcplusplus/trunk/client/ServerSocket.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/ServerSocket.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/SettingsManager.cpp =================================================================== --- dcplusplus/trunk/client/SettingsManager.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/SettingsManager.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -220,7 +220,7 @@ setDefault(AUTODROP_INTERVAL, 10); setDefault(AUTODROP_ELAPSED, 15); setDefault(AUTODROP_INACTIVITY, 10); - setDefault(AUTODROP_MINSOURCES, 1); + setDefault(AUTODROP_MINSOURCES, 2); setDefault(AUTODROP_FILESIZE, 0); setDefault(AUTODROP_ALL, false); setDefault(AUTODROP_FILELISTS, false); Modified: dcplusplus/trunk/client/SettingsManager.h =================================================================== --- dcplusplus/trunk/client/SettingsManager.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/SettingsManager.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/ShareManager.cpp =================================================================== --- dcplusplus/trunk/client/ShareManager.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/ShareManager.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/ShareManager.h =================================================================== --- dcplusplus/trunk/client/ShareManager.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/ShareManager.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/SimpleXML.cpp =================================================================== --- dcplusplus/trunk/client/SimpleXML.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/SimpleXML.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/SimpleXML.h =================================================================== --- dcplusplus/trunk/client/SimpleXML.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/SimpleXML.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/Singleton.h =================================================================== --- dcplusplus/trunk/client/Singleton.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/Singleton.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/Socket.cpp =================================================================== --- dcplusplus/trunk/client/Socket.cpp 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/Socket.cpp 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/Socket.h =================================================================== --- dcplusplus/trunk/client/Socket.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/Socket.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -154,9 +154,9 @@ void setBlocking(bool block) throw() { int flags = fcntl(sock, F_GETFL, 0); if(block) { + fcntl(sock, F_SETFL, flags & (~O_NONBLOCK)); + } else { fcntl(sock, F_SETFL, flags | O_NONBLOCK); - } else { - fcntl(sock, F_SETFL, flags & (~O_NONBLOCK)); } blocking = block; } @@ -233,7 +233,7 @@ static int check(int ret, bool blockOk = false) { if(ret == -1) { int error = getLastError(); - if(blockOk && (error == EWOULDBLOCK || error == ENOBUFS) ) { + if(blockOk && (error == EWOULDBLOCK || error == ENOBUFS || error == EINPROGRESS) ) { return -1; } else { throw SocketException(error); Modified: dcplusplus/trunk/client/Speaker.h =================================================================== --- dcplusplus/trunk/client/Speaker.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/Speaker.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/Streams.h =================================================================== --- dcplusplus/trunk/client/Streams.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/Streams.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C) 2001-2006 Jacek Sieka, arnetheduck on gmail point com * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: dcplusplus/trunk/client/StringSearch.h =================================================================== --- dcplusplus/trunk/client/StringSearch.h 2006-04-01 18:26:49 UTC (rev 597) +++ dcplusplus/trunk/client/StringSearch.h 2006-04-30 09:27:55 UTC (rev 598) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2005 Jacek Sieka, arnetheduck on gmail point com + * Copyright (C)... [truncated message content] |
