From ca4940622c05e50a50f77c621ade914029663446 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Mon, 21 Jun 2010 13:51:56 +0000 Subject: [PATCH] 2010-06-21 Tatsuhiro Tsujikawa Changed naming standards for class member variable: now it looks like var_ instead of _var. --- ChangeLog | 5 + src/AbstractAuthResolver.cc | 4 +- src/AbstractAuthResolver.h | 8 +- src/AbstractBtMessage.cc | 32 +- src/AbstractBtMessage.h | 64 +- src/AbstractCommand.cc | 320 +++++----- src/AbstractCommand.h | 54 +- src/AbstractDiskWriter.cc | 76 +-- src/AbstractDiskWriter.h | 12 +- src/AbstractProxyRequestCommand.cc | 16 +- src/AbstractProxyRequestCommand.h | 18 +- src/AbstractProxyResponseCommand.cc | 4 +- src/AbstractProxyResponseCommand.h | 4 +- src/AbstractSingleDiskAdaptor.cc | 40 +- src/AbstractSingleDiskAdaptor.h | 12 +- src/ActivePeerConnectionCommand.cc | 76 +-- src/ActivePeerConnectionCommand.h | 20 +- src/AdaptiveURISelector.cc | 76 +-- src/AdaptiveURISelector.h | 12 +- src/AlphaNumberDecorator.h | 14 +- src/AnnounceList.cc | 94 +-- src/AnnounceList.h | 12 +- src/AsyncNameResolver.cc | 38 +- src/AsyncNameResolver.h | 18 +- src/AuthConfig.h | 14 +- src/AuthConfigFactory.cc | 50 +- src/AuthConfigFactory.h | 18 +- src/BNode.cc | 30 +- src/BNode.h | 16 +- src/BitfieldMan.cc | 360 +++++------ src/BitfieldMan.h | 56 +- src/BtAbortOutstandingRequestEvent.h | 6 +- src/BtBitfieldMessage.cc | 34 +- src/BtBitfieldMessage.h | 8 +- src/BtBitfieldMessageValidator.h | 14 +- src/BtCancelSendingPieceEvent.h | 14 +- src/BtDependency.cc | 48 +- src/BtDependency.h | 6 +- src/BtExtendedMessage.cc | 26 +- src/BtExtendedMessage.h | 6 +- src/BtHandshakeMessage.cc | 56 +- src/BtHandshakeMessage.h | 32 +- src/BtHandshakeMessageValidator.h | 22 +- src/BtInterestedMessage.cc | 4 +- src/BtInterestedMessage.h | 2 +- src/BtLeecherStateChoke.cc | 60 +- src/BtLeecherStateChoke.h | 12 +- src/BtMessage.h | 6 +- src/BtNotInterestedMessage.cc | 4 +- src/BtNotInterestedMessage.h | 2 +- src/BtPieceMessage.cc | 76 +-- src/BtPieceMessage.h | 26 +- src/BtPieceMessageValidator.h | 16 +- src/BtPortMessage.cc | 30 +- src/BtPortMessage.h | 12 +- src/BtRegistry.cc | 20 +- src/BtRegistry.h | 44 +- src/BtRequestMessage.cc | 4 +- src/BtRequestMessage.h | 6 +- src/BtRuntime.h | 66 +- src/BtSeederStateChoke.cc | 46 +- src/BtSeederStateChoke.h | 22 +- src/BtSetup.cc | 22 +- src/BtSetup.h | 2 +- src/BtStopDownloadCommand.cc | 16 +- src/BtStopDownloadCommand.h | 16 +- src/ByteArrayDiskWriter.cc | 24 +- src/ByteArrayDiskWriter.h | 6 +- src/CUIDCounter.h | 10 +- src/CheckIntegrityCommand.cc | 10 +- src/CheckIntegrityCommand.h | 2 +- src/CheckIntegrityEntry.cc | 14 +- src/CheckIntegrityEntry.h | 2 +- src/Checksum.h | 20 +- src/ChunkChecksum.h | 36 +- src/ChunkedDecoder.cc | 22 +- src/ChunkedDecoder.h | 6 +- src/Command.cc | 36 +- src/Command.h | 34 +- src/ConsoleStatCalc.cc | 32 +- src/ConsoleStatCalc.h | 8 +- src/ContentTypeRequestGroupCriteria.cc | 6 +- src/ContentTypeRequestGroupCriteria.h | 8 +- src/Cookie.cc | 98 +-- src/Cookie.h | 40 +- src/CookieStorage.cc | 88 +-- src/CookieStorage.h | 32 +- src/DHTAbstractMessage.cc | 10 +- src/DHTAbstractMessage.h | 16 +- src/DHTAbstractNodeLookupTask.h | 60 +- src/DHTAbstractTask.cc | 16 +- src/DHTAbstractTask.h | 28 +- src/DHTAnnouncePeerMessage.cc | 30 +- src/DHTAnnouncePeerMessage.h | 16 +- src/DHTAutoSaveCommand.cc | 8 +- src/DHTAutoSaveCommand.h | 4 +- src/DHTBucket.cc | 140 ++-- src/DHTBucket.h | 30 +- src/DHTBucketRefreshCommand.cc | 8 +- src/DHTBucketRefreshCommand.h | 6 +- src/DHTBucketRefreshTask.cc | 6 +- src/DHTBucketRefreshTask.h | 2 +- src/DHTConnectionImpl.cc | 18 +- src/DHTConnectionImpl.h | 6 +- src/DHTEntryPointNameResolveCommand.cc | 68 +- src/DHTEntryPointNameResolveCommand.h | 18 +- src/DHTFindNodeMessage.cc | 8 +- src/DHTFindNodeMessage.h | 4 +- src/DHTFindNodeReplyMessage.cc | 12 +- src/DHTFindNodeReplyMessage.h | 4 +- src/DHTGetPeersCommand.cc | 52 +- src/DHTGetPeersCommand.h | 18 +- src/DHTGetPeersMessage.cc | 18 +- src/DHTGetPeersMessage.h | 8 +- src/DHTGetPeersReplyMessage.cc | 18 +- src/DHTGetPeersReplyMessage.h | 16 +- src/DHTIDCloser.h | 8 +- src/DHTInteractionCommand.cc | 28 +- src/DHTInteractionCommand.h | 10 +- src/DHTMessage.cc | 4 +- src/DHTMessage.h | 18 +- src/DHTMessageDispatcherImpl.cc | 34 +- src/DHTMessageDispatcherImpl.h | 10 +- src/DHTMessageFactoryImpl.cc | 58 +- src/DHTMessageFactoryImpl.h | 14 +- src/DHTMessageReceiver.cc | 38 +- src/DHTMessageReceiver.h | 14 +- src/DHTMessageTracker.cc | 52 +- src/DHTMessageTracker.h | 8 +- src/DHTMessageTrackerEntry.cc | 26 +- src/DHTMessageTrackerEntry.h | 20 +- src/DHTNode.cc | 36 +- src/DHTNode.h | 24 +- src/DHTNodeLookupTaskCallback.cc | 6 +- src/DHTNodeLookupTaskCallback.h | 2 +- src/DHTPeerAnnounceCommand.cc | 4 +- src/DHTPeerAnnounceCommand.h | 2 +- src/DHTPeerAnnounceEntry.cc | 28 +- src/DHTPeerAnnounceEntry.h | 12 +- src/DHTPeerAnnounceStorage.cc | 54 +- src/DHTPeerAnnounceStorage.h | 8 +- src/DHTPeerLookupTask.cc | 14 +- src/DHTPeerLookupTask.h | 10 +- src/DHTPeerLookupTaskCallback.cc | 6 +- src/DHTPeerLookupTaskCallback.h | 2 +- src/DHTPingReplyMessage.cc | 4 +- src/DHTPingReplyMessage.h | 4 +- src/DHTPingReplyMessageCallback.h | 8 +- src/DHTPingTask.cc | 24 +- src/DHTPingTask.h | 12 +- src/DHTRegistry.cc | 20 +- src/DHTRegistry.h | 6 +- src/DHTReplaceNodeTask.cc | 22 +- src/DHTReplaceNodeTask.h | 10 +- src/DHTRoutingTable.cc | 52 +- src/DHTRoutingTable.h | 12 +- src/DHTRoutingTableDeserializer.cc | 8 +- src/DHTRoutingTableDeserializer.h | 12 +- src/DHTRoutingTableSerializer.cc | 12 +- src/DHTRoutingTableSerializer.h | 4 +- src/DHTSetup.cc | 20 +- src/DHTSetup.h | 4 +- src/DHTTaskFactoryImpl.cc | 28 +- src/DHTTaskFactoryImpl.h | 16 +- src/DHTTaskQueueImpl.cc | 12 +- src/DHTTaskQueueImpl.h | 12 +- src/DHTTokenTracker.cc | 16 +- src/DHTTokenTracker.h | 2 +- src/DHTTokenUpdateCommand.cc | 4 +- src/DHTTokenUpdateCommand.h | 2 +- src/DHTUnknownMessage.cc | 26 +- src/DHTUnknownMessage.h | 8 +- src/DNSCache.h | 86 +-- src/DefaultBtAnnounce.cc | 170 ++--- src/DefaultBtAnnounce.h | 50 +- src/DefaultBtInteractive.cc | 388 ++++++------ src/DefaultBtInteractive.h | 84 +-- src/DefaultBtMessageDispatcher.cc | 226 +++---- src/DefaultBtMessageDispatcher.h | 30 +- src/DefaultBtMessageFactory.cc | 138 ++-- src/DefaultBtMessageFactory.h | 36 +- src/DefaultBtMessageReceiver.cc | 34 +- src/DefaultBtMessageReceiver.h | 10 +- src/DefaultBtProgressInfoFile.cc | 102 +-- src/DefaultBtProgressInfoFile.h | 18 +- src/DefaultBtRequestFactory.cc | 114 ++-- src/DefaultBtRequestFactory.h | 16 +- src/DefaultExtensionMessageFactory.cc | 34 +- src/DefaultExtensionMessageFactory.h | 26 +- src/DefaultPeerStorage.cc | 140 ++-- src/DefaultPeerStorage.h | 22 +- src/DefaultPieceStorage.cc | 222 +++---- src/DefaultPieceStorage.h | 50 +- src/DiskAdaptor.cc | 4 +- src/DiskAdaptor.h | 18 +- src/DownloadCommand.cc | 78 +-- src/DownloadCommand.h | 24 +- src/DownloadContext.cc | 78 +-- src/DownloadContext.h | 86 +-- src/DownloadEngine.cc | 146 ++--- src/DownloadEngine.h | 84 +-- src/DownloadEngineFactory.cc | 2 +- src/DownloadEngineFactory.h | 2 +- src/DownloadHandler.cc | 6 +- src/DownloadHandler.h | 6 +- src/DownloadHandlerFactory.cc | 44 +- src/DownloadHandlerFactory.h | 10 +- src/EpollEventPoll.cc | 96 +-- src/EpollEventPoll.h | 12 +- src/Event.h | 128 ++-- src/Exception.cc | 16 +- src/Exception.h | 8 +- src/ExpatMetalinkProcessor.cc | 38 +- src/ExpatMetalinkProcessor.h | 2 +- src/ExpatXmlRpcRequestProcessor.cc | 34 +- src/ExpatXmlRpcRequestProcessor.h | 2 +- src/ExtensionMessageRegistry.h | 18 +- src/FallocFileAllocationIterator.cc | 14 +- src/FallocFileAllocationIterator.h | 6 +- src/FeatureConfig.cc | 26 +- src/FeatureConfig.h | 8 +- src/FeedbackURISelector.cc | 6 +- src/FeedbackURISelector.h | 2 +- src/File.cc | 30 +- src/File.h | 4 +- src/FileAllocationCommand.cc | 10 +- src/FileAllocationCommand.h | 4 +- src/FileAllocationEntry.cc | 10 +- src/FileAllocationEntry.h | 2 +- src/FileEntry.cc | 160 ++--- src/FileEntry.h | 76 +-- src/FillRequestGroupCommand.cc | 10 +- src/FillRequestGroupCommand.h | 2 +- src/FixedWidthNumberDecorator.h | 6 +- src/FtpConnection.cc | 222 +++---- src/FtpConnection.h | 20 +- src/FtpDownloadCommand.cc | 6 +- src/FtpDownloadCommand.h | 4 +- src/FtpFinishDownloadCommand.cc | 8 +- src/FtpFinishDownloadCommand.h | 2 +- src/FtpNegotiationCommand.cc | 226 +++---- src/FtpNegotiationCommand.h | 26 +- src/GZipDecoder.cc | 46 +- src/GZipDecoder.h | 4 +- src/GZipEncoder.cc | 54 +- src/GZipEncoder.h | 6 +- src/GrowSegment.cc | 14 +- src/GrowSegment.h | 8 +- src/HandshakeExtensionMessage.cc | 82 +-- src/HandshakeExtensionMessage.h | 32 +- src/HttpConnection.cc | 68 +- src/HttpConnection.h | 20 +- src/HttpDownloadCommand.cc | 8 +- src/HttpDownloadCommand.h | 4 +- src/HttpHeader.cc | 20 +- src/HttpHeader.h | 20 +- src/HttpHeaderProcessor.cc | 48 +- src/HttpHeaderProcessor.h | 6 +- src/HttpListenCommand.cc | 42 +- src/HttpListenCommand.h | 4 +- src/HttpRequest.cc | 118 ++-- src/HttpRequest.h | 80 +-- src/HttpRequestCommand.cc | 24 +- src/HttpRequestCommand.h | 16 +- src/HttpResponse.cc | 92 +-- src/HttpResponse.h | 14 +- src/HttpResponseCommand.cc | 10 +- src/HttpResponseCommand.h | 2 +- src/HttpServer.cc | 94 +-- src/HttpServer.h | 46 +- src/HttpServerBodyCommand.cc | 40 +- src/HttpServerBodyCommand.h | 8 +- src/HttpServerCommand.cc | 66 +- src/HttpServerCommand.h | 8 +- src/HttpServerResponseCommand.cc | 26 +- src/HttpServerResponseCommand.h | 8 +- src/HttpSkipResponseCommand.cc | 46 +- src/HttpSkipResponseCommand.h | 10 +- src/IndexBtMessage.cc | 4 +- src/IndexBtMessage.h | 8 +- src/IndexBtMessageValidator.h | 10 +- src/InitiatorMSEHandshakeCommand.cc | 100 +-- src/InitiatorMSEHandshakeCommand.h | 12 +- src/IteratableChecksumValidator.cc | 56 +- src/IteratableChecksumValidator.h | 14 +- src/IteratableChunkChecksumValidator.cc | 88 +-- src/IteratableChunkChecksumValidator.h | 14 +- src/KqueueEventPoll.cc | 90 +-- src/KqueueEventPoll.h | 12 +- src/LibgcryptARC4Context.h | 16 +- src/LibgcryptARC4Decryptor.h | 6 +- src/LibgcryptARC4Encryptor.h | 6 +- src/LibgcryptDHKeyExchange.h | 68 +- src/LibgnutlsTLSContext.cc | 44 +- src/LibgnutlsTLSContext.h | 8 +- src/LibsslARC4Context.h | 28 +- src/LibsslARC4Decryptor.h | 6 +- src/LibsslARC4Encryptor.h | 6 +- src/LibsslDHKeyExchange.h | 86 +-- src/LibsslTLSContext.cc | 44 +- src/LibsslTLSContext.h | 12 +- src/LogFactory.cc | 38 +- src/LogFactory.h | 12 +- src/Logger.cc | 32 +- src/Logger.h | 10 +- src/LpdDispatchMessageCommand.cc | 32 +- src/LpdDispatchMessageCommand.h | 10 +- src/LpdMessage.h | 10 +- src/LpdMessageDispatcher.cc | 52 +- src/LpdMessageDispatcher.h | 26 +- src/LpdMessageReceiver.cc | 38 +- src/LpdMessageReceiver.h | 14 +- src/LpdReceiveMessageCommand.cc | 38 +- src/LpdReceiveMessageCommand.h | 16 +- src/MSEHandshake.cc | 390 ++++++------ src/MSEHandshake.h | 54 +- src/MessageDigestHelper.cc | 14 +- src/MessageDigestHelper.h | 8 +- src/MetadataInfo.cc | 8 +- src/MetadataInfo.h | 18 +- src/Metalink2RequestGroup.cc | 12 +- src/Metalink2RequestGroup.h | 2 +- src/MetalinkEntry.cc | 26 +- src/MetalinkEntry.h | 4 +- src/MetalinkParserController.cc | 284 ++++----- src/MetalinkParserController.h | 24 +- src/MetalinkParserStateMachine.cc | 228 +++---- src/MetalinkParserStateMachine.h | 66 +- src/MetalinkParserStateV3Impl.cc | 6 +- src/MetalinkParserStateV4Impl.cc | 6 +- src/Metalinker.cc | 2 +- src/Metalinker.h | 8 +- src/MultiDiskAdaptor.cc | 138 ++-- src/MultiDiskAdaptor.h | 46 +- src/MultiFileAllocationIterator.cc | 38 +- src/MultiFileAllocationIterator.h | 8 +- src/MultiUrlRequestInfo.cc | 80 +-- src/MultiUrlRequestInfo.h | 10 +- src/NameMatchOptionHandler.h | 58 +- src/NameResolver.cc | 6 +- src/NameResolver.h | 6 +- src/Netrc.cc | 8 +- src/Netrc.h | 40 +- src/NetrcAuthResolver.cc | 14 +- src/NetrcAuthResolver.h | 6 +- src/Option.cc | 20 +- src/Option.h | 6 +- src/OptionHandlerException.cc | 8 +- src/OptionHandlerException.h | 2 +- src/OptionHandlerImpl.h | 214 +++---- src/OptionParser.cc | 80 +-- src/OptionParser.h | 8 +- src/PStringBuildVisitor.cc | 16 +- src/PStringBuildVisitor.h | 4 +- src/PStringNumLoop.h | 38 +- src/PStringSegment.cc | 10 +- src/PStringSegment.h | 4 +- src/PStringSelect.h | 14 +- src/Peer.cc | 242 +++---- src/Peer.h | 60 +- src/PeerAbstractCommand.cc | 92 +-- src/PeerAbstractCommand.h | 28 +- src/PeerAddrEntry.h | 18 +- src/PeerChokeCommand.cc | 14 +- src/PeerChokeCommand.h | 6 +- src/PeerConnection.cc | 152 ++--- src/PeerConnection.h | 32 +- src/PeerInitiateConnectionCommand.cc | 48 +- src/PeerInitiateConnectionCommand.h | 10 +- src/PeerInteractionCommand.cc | 102 +-- src/PeerInteractionCommand.h | 12 +- src/PeerListenCommand.cc | 46 +- src/PeerListenCommand.h | 14 +- src/PeerReceiveHandshakeCommand.cc | 16 +- src/PeerReceiveHandshakeCommand.h | 2 +- src/PeerSessionResource.cc | 114 ++-- src/PeerSessionResource.h | 64 +- src/PeerStat.h | 108 ++-- src/Piece.cc | 126 ++-- src/Piece.h | 28 +- src/PieceStatMan.cc | 70 +- src/PieceStatMan.h | 28 +- src/PiecedSegment.cc | 50 +- src/PiecedSegment.h | 14 +- src/Platform.cc | 12 +- src/Platform.h | 2 +- src/PollEventPoll.cc | 84 +-- src/PollEventPoll.h | 16 +- src/PortEventPoll.cc | 100 +-- src/PortEventPoll.h | 12 +- src/PriorityPieceSelector.cc | 8 +- src/PriorityPieceSelector.h | 6 +- src/Range.h | 26 +- src/RangeBtMessage.cc | 18 +- src/RangeBtMessage.h | 18 +- src/RangeBtMessageValidator.h | 24 +- src/RarestPieceSelector.cc | 14 +- src/RarestPieceSelector.h | 2 +- src/RealtimeCommand.cc | 10 +- src/RealtimeCommand.h | 8 +- src/ReceiverMSEHandshakeCommand.cc | 68 +- src/ReceiverMSEHandshakeCommand.h | 4 +- src/RecoverableException.cc | 8 +- src/RecoverableException.h | 4 +- src/Request.cc | 108 ++-- src/Request.h | 112 ++-- src/RequestGroup.cc | 596 +++++++++--------- src/RequestGroup.h | 172 ++--- src/RequestGroupEntry.cc | 14 +- src/RequestGroupEntry.h | 8 +- src/RequestGroupMan.cc | 246 ++++---- src/RequestGroupMan.h | 80 +-- src/RequestSlot.cc | 8 +- src/RequestSlot.h | 74 +-- src/SeedCheckCommand.cc | 38 +- src/SeedCheckCommand.h | 12 +- src/SegmentMan.cc | 196 +++--- src/SegmentMan.h | 32 +- src/SelectEventPoll.cc | 134 ++-- src/SelectEventPoll.h | 50 +- src/Sequence.h | 28 +- src/SequentialDispatcherCommand.h | 18 +- src/SequentialPicker.h | 22 +- src/ServerStat.cc | 98 +-- src/ServerStat.h | 44 +- src/ServerStatMan.cc | 24 +- src/ServerStatMan.h | 2 +- src/SessionSerializer.cc | 22 +- src/SessionSerializer.h | 8 +- src/ShareRatioSeedCriteria.h | 18 +- src/SharedHandle.h | 190 +++--- src/Signature.cc | 8 +- src/Signature.h | 12 +- src/SimpleRandomizer.cc | 8 +- src/SimpleRandomizer.h | 2 +- src/SingleFileAllocationIterator.cc | 28 +- src/SingleFileAllocationIterator.h | 12 +- src/SingletonHolder.h | 8 +- src/SleepCommand.cc | 16 +- src/SleepCommand.h | 10 +- src/SocketBuffer.cc | 28 +- src/SocketBuffer.h | 8 +- src/SocketCore.cc | 306 ++++----- src/SocketCore.h | 46 +- src/SpeedCalc.cc | 56 +- src/SpeedCalc.h | 18 +- src/StringFormat.cc | 4 +- src/StringFormat.h | 2 +- src/TimeA2.cc | 58 +- src/TimeA2.h | 8 +- src/TimeBasedCommand.cc | 20 +- src/TimeBasedCommand.h | 20 +- src/TimeSeedCriteria.h | 14 +- src/TimedHaltCommand.cc | 4 +- src/TimedHaltCommand.h | 2 +- src/TimerA2.cc | 38 +- src/TimerA2.h | 6 +- src/TrackerWatcherCommand.cc | 94 +-- src/TrackerWatcherCommand.h | 14 +- src/URIResult.cc | 2 +- src/URIResult.h | 8 +- src/UTMetadataDataExtensionMessage.cc | 38 +- src/UTMetadataDataExtensionMessage.h | 26 +- src/UTMetadataExtensionMessage.cc | 4 +- src/UTMetadataExtensionMessage.h | 10 +- src/UTMetadataPostDownloadHandler.cc | 6 +- src/UTMetadataPostDownloadHandler.h | 2 +- src/UTMetadataRequestExtensionMessage.cc | 12 +- src/UTMetadataRequestExtensionMessage.h | 16 +- src/UTMetadataRequestFactory.cc | 26 +- src/UTMetadataRequestFactory.h | 22 +- src/UTMetadataRequestTracker.cc | 36 +- src/UTMetadataRequestTracker.h | 16 +- src/UTPexExtensionMessage.cc | 40 +- src/UTPexExtensionMessage.h | 24 +- src/UnionSeedCriteria.h | 12 +- src/UnknownLengthPieceStorage.cc | 64 +- src/UnknownLengthPieceStorage.h | 22 +- src/UriListParser.cc | 28 +- src/UriListParser.h | 6 +- src/XML2SAXMetalinkProcessor.cc | 48 +- src/XML2SAXMetalinkProcessor.h | 2 +- src/XORCloser.h | 12 +- src/Xml2XmlRpcRequestProcessor.cc | 34 +- src/Xml2XmlRpcRequestProcessor.h | 2 +- src/XmlRpcMethod.cc | 14 +- src/XmlRpcMethod.h | 6 +- src/XmlRpcMethodImpl.cc | 8 +- src/XmlRpcRequestParserController.cc | 38 +- src/XmlRpcRequestParserController.h | 24 +- src/XmlRpcRequestParserStateMachine.cc | 38 +- src/XmlRpcRequestParserStateMachine.h | 90 +-- src/a2functional.h | 32 +- src/a2netcompat.h | 8 +- src/array_fun.h | 38 +- src/download_helper.cc | 40 +- src/messageDigest.cc | 2 +- src/messageDigest.h | 46 +- src/util.cc | 8 +- test/BittorrentHelperTest.cc | 2 +- test/BtDependencyTest.cc | 36 +- test/BtExtendedMessageTest.cc | 2 +- test/BtPieceMessageTest.cc | 16 +- test/BtPortMessageTest.cc | 16 +- test/BtPostDownloadHandlerTest.cc | 10 +- test/BtRegistryTest.cc | 6 +- test/BtRequestMessageTest.cc | 56 +- test/DHTAnnouncePeerMessageTest.cc | 6 +- test/DHTFindNodeMessageTest.cc | 10 +- test/DHTGetPeersMessageTest.cc | 40 +- test/DHTPingMessageTest.cc | 6 +- test/DNSCacheTest.cc | 36 +- test/DefaultAuthResolverTest.cc | 12 +- test/DefaultBtAnnounceTest.cc | 122 ++-- test/DefaultBtMessageDispatcherTest.cc | 34 +- test/DefaultBtMessageFactoryTest.cc | 36 +- test/DefaultBtProgressInfoFileTest.cc | 138 ++-- test/DefaultBtRequestFactoryTest.cc | 92 +-- test/DefaultExtensionMessageFactoryTest.cc | 60 +- test/DefaultPieceStorageTest.cc | 44 +- test/DownloadHandlerFactoryTest.cc | 12 +- test/DownloadHelperTest.cc | 90 +-- test/FeedbackURISelectorTest.cc | 20 +- test/FtpConnectionTest.cc | 204 +++--- test/HttpRequestTest.cc | 42 +- test/InOrderURISelectorTest.cc | 12 +- test/MSEHandshakeTest.cc | 10 +- test/Metalink2RequestGroupTest.cc | 16 +- test/MetalinkPostDownloadHandlerTest.cc | 10 +- test/MockBtMessage.h | 4 +- test/MockDHTMessage.h | 42 +- test/MockDHTMessageDispatcher.h | 20 +- test/MockDHTMessageFactory.h | 6 +- test/MockDHTTask.h | 8 +- test/MockDHTTaskQueue.h | 12 +- test/MockExtensionMessage.h | 34 +- test/MockPeerStorage.h | 8 +- test/MockPieceStorage.h | 16 +- test/MultiFileAllocationIteratorTest.cc | 2 +- test/NetrcAuthResolverTest.cc | 42 +- test/OptionParserTest.cc | 38 +- test/RequestGroupManTest.cc | 24 +- test/RequestGroupTest.cc | 8 +- test/SegmentManTest.cc | 56 +- test/SingletonHolderTest.cc | 8 +- test/UTMetadataPostDownloadHandlerTest.cc | 58 +- test/UTMetadataRequestExtensionMessageTest.cc | 46 +- test/UTPexExtensionMessageTest.cc | 12 +- test/XmlRpcMethodTest.cc | 218 +++---- test/a2functionalTest.cc | 8 +- 550 files changed, 10253 insertions(+), 10248 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0cda9819..4aceba05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-06-21 Tatsuhiro Tsujikawa + + Changed naming standards for class member variable: now it looks + like var_ instead of _var. + 2010-06-20 Tatsuhiro Tsujikawa When wrong type DHT reply message is received for a transaction diff --git a/src/AbstractAuthResolver.cc b/src/AbstractAuthResolver.cc index 3a58333c..94d2e7d6 100644 --- a/src/AbstractAuthResolver.cc +++ b/src/AbstractAuthResolver.cc @@ -43,12 +43,12 @@ AbstractAuthResolver::~AbstractAuthResolver() {} void AbstractAuthResolver::setUserDefinedAuthConfig(const AuthConfigHandle& authConfig) { - _userDefinedAuthConfig = authConfig; + userDefinedAuthConfig_ = authConfig; } void AbstractAuthResolver::setDefaultAuthConfig(const AuthConfigHandle& authConfig) { - _defaultAuthConfig = authConfig; + defaultAuthConfig_ = authConfig; } } // namespace aria2 diff --git a/src/AbstractAuthResolver.h b/src/AbstractAuthResolver.h index 23b5908a..19876962 100644 --- a/src/AbstractAuthResolver.h +++ b/src/AbstractAuthResolver.h @@ -41,9 +41,9 @@ namespace aria2 { class AbstractAuthResolver : public AuthResolver { private: - SharedHandle _userDefinedAuthConfig; + SharedHandle userDefinedAuthConfig_; - SharedHandle _defaultAuthConfig; + SharedHandle defaultAuthConfig_; public: AbstractAuthResolver(); @@ -53,14 +53,14 @@ public: const SharedHandle& getUserDefinedAuthConfig() const { - return _userDefinedAuthConfig; + return userDefinedAuthConfig_; } void setDefaultAuthConfig(const SharedHandle& authConfig); const SharedHandle& getDefaultAuthConfig() const { - return _defaultAuthConfig; + return defaultAuthConfig_; } }; diff --git a/src/AbstractBtMessage.cc b/src/AbstractBtMessage.cc index 4ec8106c..38c15be6 100644 --- a/src/AbstractBtMessage.cc +++ b/src/AbstractBtMessage.cc @@ -43,59 +43,59 @@ namespace aria2 { AbstractBtMessage::AbstractBtMessage(uint8_t id, const std::string& name): BtMessage(id), - _sendingInProgress(false), - _invalidate(false), - _uploading(false), - _cuid(0), - _name(name), - _metadataGetMode(false), - _logger(LogFactory::getInstance()) + sendingInProgress_(false), + invalidate_(false), + uploading_(false), + cuid_(0), + name_(name), + metadataGetMode_(false), + logger_(LogFactory::getInstance()) {} AbstractBtMessage::~AbstractBtMessage() {} void AbstractBtMessage::setPeer(const SharedHandle& peer) { - _peer = peer; + peer_ = peer; } void AbstractBtMessage::validate() { - if(!_validator.isNull()) { - _validator->validate(); + if(!validator_.isNull()) { + validator_->validate(); } } void AbstractBtMessage::setBtMessageValidator(const SharedHandle& validator) { - _validator = validator; + validator_ = validator; } void AbstractBtMessage::setPieceStorage (const SharedHandle& pieceStorage) { - _pieceStorage = pieceStorage; + pieceStorage_ = pieceStorage; } void AbstractBtMessage::setBtMessageDispatcher (const WeakHandle& dispatcher) { - _dispatcher = dispatcher; + dispatcher_ = dispatcher; } void AbstractBtMessage::setPeerConnection(const WeakHandle& peerConnection) { - _peerConnection = peerConnection; + peerConnection_ = peerConnection; } void AbstractBtMessage::setBtMessageFactory(const WeakHandle& factory) { - _messageFactory = factory; + messageFactory_ = factory; } void AbstractBtMessage::setBtRequestFactory(const WeakHandle& factory) { - _requestFactory = factory; + requestFactory_ = factory; } } // namespace aria2 diff --git a/src/AbstractBtMessage.h b/src/AbstractBtMessage.h index accb56a2..b6fef8ad 100644 --- a/src/AbstractBtMessage.h +++ b/src/AbstractBtMessage.h @@ -51,64 +51,64 @@ class Logger; class AbstractBtMessage : public BtMessage { private: - bool _sendingInProgress; - bool _invalidate; - bool _uploading; - cuid_t _cuid; + bool sendingInProgress_; + bool invalidate_; + bool uploading_; + cuid_t cuid_; - std::string _name; + std::string name_; - SharedHandle _pieceStorage; + SharedHandle pieceStorage_; - SharedHandle _peer; + SharedHandle peer_; - WeakHandle _dispatcher; + WeakHandle dispatcher_; - WeakHandle _messageFactory; + WeakHandle messageFactory_; - WeakHandle _requestFactory; + WeakHandle requestFactory_; - WeakHandle _peerConnection; + WeakHandle peerConnection_; - SharedHandle _validator; + SharedHandle validator_; - bool _metadataGetMode; + bool metadataGetMode_; - Logger* _logger; + Logger* logger_; protected: Logger* getLogger() const { - return _logger; + return logger_; } const SharedHandle& getPieceStorage() const { - return _pieceStorage; + return pieceStorage_; } const WeakHandle& getPeerConnection() const { - return _peerConnection; + return peerConnection_; } const WeakHandle& getBtMessageDispatcher() const { - return _dispatcher; + return dispatcher_; } const WeakHandle& getBtRequestFactory() const { - return _requestFactory; + return requestFactory_; } const WeakHandle& getBtMessageFactory() const { - return _messageFactory; + return messageFactory_; } bool isMetadataGetMode() const { - return _metadataGetMode; + return metadataGetMode_; } public: AbstractBtMessage(uint8_t id, const std::string& name); @@ -116,40 +116,40 @@ public: virtual ~AbstractBtMessage(); virtual bool isSendingInProgress() { - return _sendingInProgress; + return sendingInProgress_; } void setSendingInProgress(bool sendingInProgress) { - _sendingInProgress = sendingInProgress; + sendingInProgress_ = sendingInProgress; } virtual bool isInvalidate() { - return _invalidate; + return invalidate_; } void setInvalidate(bool invalidate) { - _invalidate = invalidate; + invalidate_ = invalidate; } virtual bool isUploading() { - return _uploading; + return uploading_; } void setUploading(bool uploading) { - _uploading = uploading; + uploading_ = uploading; } cuid_t getCuid() const { - return _cuid; + return cuid_; } void setCuid(cuid_t cuid) { - _cuid = cuid; + cuid_ = cuid; } const SharedHandle& getPeer() const { - return _peer; + return peer_; } void setPeer(const SharedHandle& peer); @@ -183,12 +183,12 @@ public: const std::string& getName() const { - return _name; + return name_; } void enableMetadataGetMode() { - _metadataGetMode = true; + metadataGetMode_ = true; } }; diff --git a/src/AbstractCommand.cc b/src/AbstractCommand.cc index e8bd53c3..305c238a 100644 --- a/src/AbstractCommand.cc +++ b/src/AbstractCommand.cc @@ -77,28 +77,28 @@ AbstractCommand::AbstractCommand(cuid_t cuid, RequestGroup* requestGroup, DownloadEngine* e, const SocketHandle& s): - Command(cuid), _checkPoint(global::wallclock), - _timeout(requestGroup->getTimeout()), - _requestGroup(requestGroup), - _req(req), _fileEntry(fileEntry), _e(e), _socket(s), - _checkSocketIsReadable(false), _checkSocketIsWritable(false), - _nameResolverCheck(false) + Command(cuid), checkPoint_(global::wallclock), + timeout_(requestGroup->getTimeout()), + requestGroup_(requestGroup), + req_(req), fileEntry_(fileEntry), e_(e), socket_(s), + checkSocketIsReadable_(false), checkSocketIsWritable_(false), + nameResolverCheck_(false) { - if(!_socket.isNull() && _socket->isOpen()) { - setReadCheckSocket(_socket); + if(!socket_.isNull() && socket_->isOpen()) { + setReadCheckSocket(socket_); } - _requestGroup->increaseStreamConnection(); - _requestGroup->increaseNumCommand(); + requestGroup_->increaseStreamConnection(); + requestGroup_->increaseNumCommand(); } AbstractCommand::~AbstractCommand() { disableReadCheckSocket(); disableWriteCheckSocket(); #ifdef ENABLE_ASYNC_DNS - disableNameResolverCheck(_asyncNameResolver); + disableNameResolverCheck(asyncNameResolver_); #endif // ENABLE_ASYNC_DNS - _requestGroup->decreaseNumCommand(); - _requestGroup->decreaseStreamConnection(); + requestGroup_->decreaseNumCommand(); + requestGroup_->decreaseStreamConnection(); } bool AbstractCommand::execute() { @@ -111,22 +111,22 @@ bool AbstractCommand::execute() { errorEventEnabled()); } try { - if(_requestGroup->downloadFinished() || _requestGroup->isHaltRequested()) { + if(requestGroup_->downloadFinished() || requestGroup_->isHaltRequested()) { return true; } - if(!_req.isNull() && _req->removalRequested()) { + if(!req_.isNull() && req_->removalRequested()) { if(getLogger()->debug()) { getLogger()->debug ("CUID#%s - Discard original URI=%s because it is requested.", - util::itos(getCuid()).c_str(), _req->getUri().c_str()); + util::itos(getCuid()).c_str(), req_->getUri().c_str()); } return prepareForRetry(0); } // TODO it is not needed to check other PeerStats every time. // Find faster Request when no segment is available. - if(!_req.isNull() && _fileEntry->countPooledRequest() > 0 && + if(!req_.isNull() && fileEntry_->countPooledRequest() > 0 && !getPieceStorage()->hasMissingUnusedPiece()) { - SharedHandle fasterRequest = _fileEntry->findFasterRequest(_req); + SharedHandle fasterRequest = fileEntry_->findFasterRequest(req_); if(!fasterRequest.isNull()) { if(getLogger()->info()) { getLogger()->info("CUID#%s - Use faster Request hostname=%s, port=%u", @@ -135,28 +135,28 @@ bool AbstractCommand::execute() { fasterRequest->getPort()); } // Cancel current Request object and use faster one. - _fileEntry->removeRequest(_req); + fileEntry_->removeRequest(req_); Command* command = InitiateConnectionCommandFactory::createInitiateConnectionCommand - (getCuid(), fasterRequest, _fileEntry, _requestGroup, _e); - _e->setNoWait(true); - _e->addCommand(command); + (getCuid(), fasterRequest, fileEntry_, requestGroup_, e_); + e_->setNoWait(true); + e_->addCommand(command); return true; } } - if((_checkSocketIsReadable && readEventEnabled()) || - (_checkSocketIsWritable && writeEventEnabled()) || + if((checkSocketIsReadable_ && readEventEnabled()) || + (checkSocketIsWritable_ && writeEventEnabled()) || hupEventEnabled() || #ifdef ENABLE_ASYNC_DNS - (_nameResolverCheck && nameResolveFinished()) || + (nameResolverCheck_ && nameResolveFinished()) || #endif // ENABLE_ASYNC_DNS - (!_checkSocketIsReadable && !_checkSocketIsWritable && - !_nameResolverCheck)) { - _checkPoint = global::wallclock; + (!checkSocketIsReadable_ && !checkSocketIsWritable_ && + !nameResolverCheck_)) { + checkPoint_ = global::wallclock; if(!getPieceStorage().isNull()) { - _segments.clear(); - getSegmentMan()->getInFlightSegment(_segments, getCuid()); - if(!_req.isNull() && _segments.empty()) { + segments_.clear(); + getSegmentMan()->getInFlightSegment(segments_, getCuid()); + if(!req_.isNull() && segments_.empty()) { // This command previously has assigned segments, but it is // canceled. So discard current request chain. if(getLogger()->debug()) { @@ -166,16 +166,16 @@ bool AbstractCommand::execute() { } return prepareForRetry(0); } - if(_req.isNull() || _req->getMaxPipelinedRequest() == 1 || + if(req_.isNull() || req_->getMaxPipelinedRequest() == 1 || getDownloadContext()->getFileEntries().size() == 1) { - if(_segments.empty()) { + if(segments_.empty()) { SharedHandle segment = getSegmentMan()->getSegment(getCuid()); if(!segment.isNull()) { - _segments.push_back(segment); + segments_.push_back(segment); } } - if(_segments.empty()) { + if(segments_.empty()) { // TODO socket could be pooled here if pipelining is enabled... if(getLogger()->info()) { getLogger()->info(MSG_NO_SEGMENT_AVAILABLE, @@ -193,12 +193,12 @@ bool AbstractCommand::execute() { } } } else { - size_t maxSegments = _req->getMaxPipelinedRequest(); - if(_segments.size() < maxSegments) { + size_t maxSegments = req_->getMaxPipelinedRequest(); + if(segments_.size() < maxSegments) { getSegmentMan()->getSegment - (_segments, getCuid(), _fileEntry, maxSegments); + (segments_, getCuid(), fileEntry_, maxSegments); } - if(_segments.empty()) { + if(segments_.empty()) { return prepareForRetry(0); } } @@ -207,23 +207,23 @@ bool AbstractCommand::execute() { } else if(errorEventEnabled()) { throw DL_RETRY_EX (StringFormat(MSG_NETWORK_PROBLEM, - _socket->getSocketError().c_str()).str()); + socket_->getSocketError().c_str()).str()); } else { - if(_checkPoint.difference(global::wallclock) >= _timeout) { + if(checkPoint_.difference(global::wallclock) >= timeout_) { // timeout triggers ServerStat error state. SharedHandle ss = - _e->getRequestGroupMan()->getOrCreateServerStat(_req->getHost(), - _req->getProtocol()); + e_->getRequestGroupMan()->getOrCreateServerStat(req_->getHost(), + req_->getProtocol()); ss->setError(); throw DL_RETRY_EX2(EX_TIME_OUT, downloadresultcode::TIME_OUT); } - _e->addCommand(this); + e_->addCommand(this); return false; } } catch(DlAbortEx& err) { - if(_req.isNull()) { + if(req_.isNull()) { if(getLogger()->debug()) { getLogger()->debug(EX_EXCEPTION_CAUGHT, err); } @@ -231,43 +231,43 @@ bool AbstractCommand::execute() { getLogger()->error (MSG_DOWNLOAD_ABORTED, DL_ABORT_EX2(StringFormat - ("URI=%s", _req->getCurrentUri().c_str()).str(),err), - util::itos(getCuid()).c_str(), _req->getUri().c_str()); - _fileEntry->addURIResult(_req->getUri(), err.getCode()); - _requestGroup->setLastUriResult(_req->getUri(), err.getCode()); + ("URI=%s", req_->getCurrentUri().c_str()).str(),err), + util::itos(getCuid()).c_str(), req_->getUri().c_str()); + fileEntry_->addURIResult(req_->getUri(), err.getCode()); + requestGroup_->setLastUriResult(req_->getUri(), err.getCode()); if(err.getCode() == downloadresultcode::CANNOT_RESUME) { - _requestGroup->increaseResumeFailureCount(); + requestGroup_->increaseResumeFailureCount(); } } onAbort(); tryReserved(); return true; } catch(DlRetryEx& err) { - assert(!_req.isNull()); + assert(!req_.isNull()); if(getLogger()->info()) { getLogger()->info (MSG_RESTARTING_DOWNLOAD, DL_RETRY_EX2(StringFormat - ("URI=%s", _req->getCurrentUri().c_str()).str(), + ("URI=%s", req_->getCurrentUri().c_str()).str(), err), - util::itos(getCuid()).c_str(), _req->getUri().c_str()); + util::itos(getCuid()).c_str(), req_->getUri().c_str()); } - _req->addTryCount(); - _req->resetRedirectCount(); + req_->addTryCount(); + req_->resetRedirectCount(); const unsigned int maxTries = getOption()->getAsInt(PREF_MAX_TRIES); - bool isAbort = maxTries != 0 && _req->getTryCount() >= maxTries; + bool isAbort = maxTries != 0 && req_->getTryCount() >= maxTries; if(isAbort) { if(getLogger()->info()) { getLogger()->info(MSG_MAX_TRY, - util::itos(getCuid()).c_str(), _req->getTryCount()); + util::itos(getCuid()).c_str(), req_->getTryCount()); } getLogger()->error(MSG_DOWNLOAD_ABORTED, err, util::itos(getCuid()).c_str(), - _req->getUri().c_str()); - _fileEntry->addURIResult(_req->getUri(), err.getCode()); - _requestGroup->setLastUriResult(_req->getUri(), err.getCode()); + req_->getUri().c_str()); + fileEntry_->addURIResult(req_->getUri(), err.getCode()); + requestGroup_->setLastUriResult(req_->getUri(), err.getCode()); if(err.getCode() == downloadresultcode::CANNOT_RESUME) { - _requestGroup->increaseResumeFailureCount(); + requestGroup_->increaseResumeFailureCount(); } onAbort(); tryReserved(); @@ -277,11 +277,11 @@ bool AbstractCommand::execute() { } } catch(DownloadFailureException& err) { getLogger()->error(EX_EXCEPTION_CAUGHT, err); - if(!_req.isNull()) { - _fileEntry->addURIResult(_req->getUri(), err.getCode()); - _requestGroup->setLastUriResult(_req->getUri(), err.getCode()); + if(!req_.isNull()) { + fileEntry_->addURIResult(req_->getUri(), err.getCode()); + requestGroup_->setLastUriResult(req_->getUri(), err.getCode()); } - _requestGroup->setHaltRequested(true); + requestGroup_->setHaltRequested(true); return true; } } @@ -308,45 +308,45 @@ void AbstractCommand::tryReserved() { util::itos(getCuid()).c_str()); } std::vector commands; - _requestGroup->createNextCommand(commands, _e, 1); - _e->setNoWait(true); - _e->addCommand(commands); + requestGroup_->createNextCommand(commands, e_, 1); + e_->setNoWait(true); + e_->addCommand(commands); } bool AbstractCommand::prepareForRetry(time_t wait) { if(!getPieceStorage().isNull()) { getSegmentMan()->cancelSegment(getCuid()); } - if(!_req.isNull()) { - _fileEntry->poolRequest(_req); + if(!req_.isNull()) { + fileEntry_->poolRequest(req_); if(getLogger()->debug()) { getLogger()->debug("CUID#%s - Pooling request URI=%s", - util::itos(getCuid()).c_str(), _req->getUri().c_str()); + util::itos(getCuid()).c_str(), req_->getUri().c_str()); } if(!getSegmentMan().isNull()) { - getSegmentMan()->recognizeSegmentFor(_fileEntry); + getSegmentMan()->recognizeSegmentFor(fileEntry_); } } - Command* command = new CreateRequestCommand(getCuid(), _requestGroup, _e); + Command* command = new CreateRequestCommand(getCuid(), requestGroup_, e_); if(wait == 0) { - _e->setNoWait(true); - _e->addCommand(command); + e_->setNoWait(true); + e_->addCommand(command); } else { - SleepCommand* scom = new SleepCommand(getCuid(), _e, _requestGroup, + SleepCommand* scom = new SleepCommand(getCuid(), e_, requestGroup_, command, wait); - _e->addCommand(scom); + e_->addCommand(scom); } return true; } void AbstractCommand::onAbort() { - if(!_req.isNull()) { + if(!req_.isNull()) { // TODO This might be a problem if the failure is caused by proxy. - _e->getRequestGroupMan()->getOrCreateServerStat - (_req->getHost(), _req->getProtocol())->setError(); - _fileEntry->removeIdenticalURI(_req->getUri()); - _fileEntry->removeRequest(_req); + e_->getRequestGroupMan()->getOrCreateServerStat + (req_->getHost(), req_->getProtocol())->setError(); + fileEntry_->removeIdenticalURI(req_->getUri()); + fileEntry_->removeRequest(req_); } if(getLogger()->debug()) { getLogger()->debug("CUID#%s - Aborting download", @@ -358,13 +358,13 @@ void AbstractCommand::onAbort() { // in DownloadContext is more than 1. The latter condition is // limitation of current implementation. if(!getOption()->getAsBool(PREF_ALWAYS_RESUME) && - !_fileEntry.isNull() && + !fileEntry_.isNull() && getSegmentMan()->calculateSessionDownloadLength() == 0 && - !_requestGroup->p2pInvolved() && + !requestGroup_->p2pInvolved() && getDownloadContext()->getFileEntries().size() == 1) { const int maxTries = getOption()->getAsInt(PREF_MAX_RESUME_FAILURE_TRIES); - if((maxTries > 0 && _requestGroup->getResumeFailureCount() >= maxTries)|| - _fileEntry->emptyRequestUri()) { + if((maxTries > 0 && requestGroup_->getResumeFailureCount() >= maxTries)|| + fileEntry_->emptyRequestUri()) { // Local file exists, but given servers(or at least contacted // ones) doesn't support resume. Let's restart download from // scratch. @@ -380,7 +380,7 @@ void AbstractCommand::onAbort() { // process. getOption()->put(PREF_ALWAYS_RESUME, V_TRUE); std::deque res; - _fileEntry->extractURIResult(res, downloadresultcode::CANNOT_RESUME); + fileEntry_->extractURIResult(res, downloadresultcode::CANNOT_RESUME); if(!res.empty()) { getSegmentMan()->cancelAllSegments(); getSegmentMan()->eraseSegmentWrittenLengthMemo(); @@ -394,8 +394,8 @@ void AbstractCommand::onAbort() { util::itos(getCuid()).c_str(), static_cast(uris.size())); } - _fileEntry->addUris(uris.begin(), uris.end()); - getSegmentMan()->recognizeSegmentFor(_fileEntry); + fileEntry_->addUris(uris.begin(), uris.end()); + getSegmentMan()->recognizeSegmentFor(fileEntry_); } } } @@ -403,10 +403,10 @@ void AbstractCommand::onAbort() { } void AbstractCommand::disableReadCheckSocket() { - if(_checkSocketIsReadable) { - _e->deleteSocketForReadCheck(_readCheckTarget, this); - _checkSocketIsReadable = false; - _readCheckTarget.reset(); + if(checkSocketIsReadable_) { + e_->deleteSocketForReadCheck(readCheckTarget_, this); + checkSocketIsReadable_ = false; + readCheckTarget_.reset(); } } @@ -414,16 +414,16 @@ void AbstractCommand::setReadCheckSocket(const SocketHandle& socket) { if(!socket->isOpen()) { disableReadCheckSocket(); } else { - if(_checkSocketIsReadable) { - if(_readCheckTarget != socket) { - _e->deleteSocketForReadCheck(_readCheckTarget, this); - _e->addSocketForReadCheck(socket, this); - _readCheckTarget = socket; + if(checkSocketIsReadable_) { + if(readCheckTarget_ != socket) { + e_->deleteSocketForReadCheck(readCheckTarget_, this); + e_->addSocketForReadCheck(socket, this); + readCheckTarget_ = socket; } } else { - _e->addSocketForReadCheck(socket, this); - _checkSocketIsReadable = true; - _readCheckTarget = socket; + e_->addSocketForReadCheck(socket, this); + checkSocketIsReadable_ = true; + readCheckTarget_ = socket; } } } @@ -439,10 +439,10 @@ void AbstractCommand::setReadCheckSocketIf } void AbstractCommand::disableWriteCheckSocket() { - if(_checkSocketIsWritable) { - _e->deleteSocketForWriteCheck(_writeCheckTarget, this); - _checkSocketIsWritable = false; - _writeCheckTarget.reset(); + if(checkSocketIsWritable_) { + e_->deleteSocketForWriteCheck(writeCheckTarget_, this); + checkSocketIsWritable_ = false; + writeCheckTarget_.reset(); } } @@ -450,16 +450,16 @@ void AbstractCommand::setWriteCheckSocket(const SocketHandle& socket) { if(!socket->isOpen()) { disableWriteCheckSocket(); } else { - if(_checkSocketIsWritable) { - if(_writeCheckTarget != socket) { - _e->deleteSocketForWriteCheck(_writeCheckTarget, this); - _e->addSocketForWriteCheck(socket, this); - _writeCheckTarget = socket; + if(checkSocketIsWritable_) { + if(writeCheckTarget_ != socket) { + e_->deleteSocketForWriteCheck(writeCheckTarget_, this); + e_->addSocketForWriteCheck(socket, this); + writeCheckTarget_ = socket; } } else { - _e->addSocketForWriteCheck(socket, this); - _checkSocketIsWritable = true; - _writeCheckTarget = socket; + e_->addSocketForWriteCheck(socket, this); + checkSocketIsWritable_ = true; + writeCheckTarget_ = socket; } } } @@ -512,16 +512,16 @@ static bool isProxyRequest class DomainMatch { private: - std::string _hostname; + std::string hostname_; public: - DomainMatch(const std::string& hostname):_hostname(hostname) {} + DomainMatch(const std::string& hostname):hostname_(hostname) {} bool operator()(const std::string& domain) const { if(util::startsWith(domain, A2STR::DOT_C)) { - return util::endsWith(_hostname, domain); + return util::endsWith(hostname_, domain); } else { - return util::endsWith(_hostname, A2STR::DOT_C+domain); + return util::endsWith(hostname_, A2STR::DOT_C+domain); } } }; @@ -569,17 +569,17 @@ static bool inNoProxy(const SharedHandle& req, bool AbstractCommand::isProxyDefined() const { - return isProxyRequest(_req->getProtocol(), getOption()) && - !inNoProxy(_req, getOption()->get(PREF_NO_PROXY)); + return isProxyRequest(req_->getProtocol(), getOption()) && + !inNoProxy(req_, getOption()->get(PREF_NO_PROXY)); } SharedHandle AbstractCommand::createProxyRequest() const { SharedHandle proxyRequest; - if(inNoProxy(_req, getOption()->get(PREF_NO_PROXY))) { + if(inNoProxy(req_, getOption()->get(PREF_NO_PROXY))) { return proxyRequest; } - std::string proxy = getProxyUri(_req->getProtocol(), getOption()); + std::string proxy = getProxyUri(req_->getProtocol(), getOption()); if(!proxy.empty()) { proxyRequest.reset(new Request()); if(proxyRequest->setUri(proxy)) { @@ -602,37 +602,37 @@ SharedHandle AbstractCommand::createProxyRequest() const bool AbstractCommand::isAsyncNameResolverInitialized() const { - return !_asyncNameResolver.isNull(); + return !asyncNameResolver_.isNull(); } void AbstractCommand::initAsyncNameResolver(const std::string& hostname) { - _asyncNameResolver.reset(new AsyncNameResolver()); + asyncNameResolver_.reset(new AsyncNameResolver()); if(getLogger()->info()) { getLogger()->info(MSG_RESOLVING_HOSTNAME, util::itos(getCuid()).c_str(), hostname.c_str()); } - _asyncNameResolver->resolve(hostname); - setNameResolverCheck(_asyncNameResolver); + asyncNameResolver_->resolve(hostname); + setNameResolverCheck(asyncNameResolver_); } bool AbstractCommand::asyncResolveHostname() { - switch(_asyncNameResolver->getStatus()) { + switch(asyncNameResolver_->getStatus()) { case AsyncNameResolver::STATUS_SUCCESS: - disableNameResolverCheck(_asyncNameResolver); + disableNameResolverCheck(asyncNameResolver_); return true; case AsyncNameResolver::STATUS_ERROR: - disableNameResolverCheck(_asyncNameResolver); - if(!isProxyRequest(_req->getProtocol(), getOption())) { - _e->getRequestGroupMan()->getOrCreateServerStat - (_req->getHost(), _req->getProtocol())->setError(); + disableNameResolverCheck(asyncNameResolver_); + if(!isProxyRequest(req_->getProtocol(), getOption())) { + e_->getRequestGroupMan()->getOrCreateServerStat + (req_->getHost(), req_->getProtocol())->setError(); } throw DL_ABORT_EX (StringFormat(MSG_NAME_RESOLUTION_FAILED, util::itos(getCuid()).c_str(), - _asyncNameResolver->getHostname().c_str(), - _asyncNameResolver->getError().c_str()).str()); + asyncNameResolver_->getHostname().c_str(), + asyncNameResolver_->getError().c_str()).str()); default: return false; } @@ -640,36 +640,36 @@ bool AbstractCommand::asyncResolveHostname() const std::vector& AbstractCommand::getResolvedAddresses() { - return _asyncNameResolver->getResolvedAddresses(); + return asyncNameResolver_->getResolvedAddresses(); } void AbstractCommand::setNameResolverCheck (const SharedHandle& resolver) { if(!resolver.isNull()) { - _nameResolverCheck = true; - _e->addNameResolverCheck(resolver, this); + nameResolverCheck_ = true; + e_->addNameResolverCheck(resolver, this); } } void AbstractCommand::disableNameResolverCheck (const SharedHandle& resolver) { if(!resolver.isNull()) { - _nameResolverCheck = false; - _e->deleteNameResolverCheck(resolver, this); + nameResolverCheck_ = false; + e_->deleteNameResolverCheck(resolver, this); } } bool AbstractCommand::nameResolveFinished() const { return - _asyncNameResolver->getStatus() == AsyncNameResolver::STATUS_SUCCESS || - _asyncNameResolver->getStatus() == AsyncNameResolver::STATUS_ERROR; + asyncNameResolver_->getStatus() == AsyncNameResolver::STATUS_SUCCESS || + asyncNameResolver_->getStatus() == AsyncNameResolver::STATUS_ERROR; } #endif // ENABLE_ASYNC_DNS std::string AbstractCommand::resolveHostname (std::vector& addrs, const std::string& hostname, uint16_t port) { - _e->findAllCachedIPAddresses(std::back_inserter(addrs), hostname, port); + e_->findAllCachedIPAddresses(std::back_inserter(addrs), hostname, port); std::string ipaddr; if(addrs.empty()) { #ifdef ENABLE_ASYNC_DNS @@ -687,7 +687,7 @@ std::string AbstractCommand::resolveHostname { NameResolver res; res.setSocktype(SOCK_STREAM); - if(_e->getOption()->getAsBool(PREF_DISABLE_IPV6)) { + if(e_->getOption()->getAsBool(PREF_DISABLE_IPV6)) { res.setFamily(AF_INET); } res.resolve(addrs, hostname); @@ -700,9 +700,9 @@ std::string AbstractCommand::resolveHostname } for(std::vector::const_iterator i = addrs.begin(), eoi = addrs.end(); i != eoi; ++i) { - _e->cacheIPAddress(hostname, *i, port); + e_->cacheIPAddress(hostname, *i, port); } - ipaddr = _e->findCachedIPAddress(hostname, port); + ipaddr = e_->findCachedIPAddress(hostname, port); } else { ipaddr = addrs.front(); if(getLogger()->info()) { @@ -720,14 +720,14 @@ std::string AbstractCommand::resolveHostname void AbstractCommand::prepareForNextAction(Command* nextCommand) { SharedHandle entry - (new StreamCheckIntegrityEntry(_requestGroup, nextCommand)); + (new StreamCheckIntegrityEntry(requestGroup_, nextCommand)); std::vector* commands = new std::vector(); auto_delete_container > commandsDel(commands); - _requestGroup->processCheckIntegrityEntry(*commands, entry, _e); - _e->addCommand(*commands); + requestGroup_->processCheckIntegrityEntry(*commands, entry, e_); + e_->addCommand(*commands); commands->clear(); - _e->setNoWait(true); + e_->setNoWait(true); } bool AbstractCommand::checkIfConnectionEstablished @@ -740,8 +740,8 @@ bool AbstractCommand::checkIfConnectionEstablished std::string error = socket->getSocketError(); if(!error.empty()) { // See also InitiateConnectionCommand::executeInternal() - _e->markBadIPAddress(connectedHostname, connectedAddr, connectedPort); - if(!_e->findCachedIPAddress(connectedHostname, connectedPort).empty()) { + e_->markBadIPAddress(connectedHostname, connectedAddr, connectedPort); + if(!e_->findCachedIPAddress(connectedHostname, connectedPort).empty()) { if(getLogger()->info()) { getLogger()->info(MSG_CONNECT_FAILED_AND_RETRY, util::itos(getCuid()).c_str(), @@ -749,17 +749,17 @@ bool AbstractCommand::checkIfConnectionEstablished } Command* command = InitiateConnectionCommandFactory::createInitiateConnectionCommand - (getCuid(), _req, _fileEntry, _requestGroup, _e); - _e->setNoWait(true); - _e->addCommand(command); + (getCuid(), req_, fileEntry_, requestGroup_, e_); + e_->setNoWait(true); + e_->addCommand(command); return false; } - _e->removeCachedIPAddress(connectedHostname, connectedPort); + e_->removeCachedIPAddress(connectedHostname, connectedPort); // Don't set error if proxy server is used and its method is GET. - if(resolveProxyMethod(_req->getProtocol()) != V_GET || - !isProxyRequest(_req->getProtocol(), getOption())) { - _e->getRequestGroupMan()->getOrCreateServerStat - (_req->getHost(), _req->getProtocol())->setError(); + if(resolveProxyMethod(req_->getProtocol()) != V_GET || + !isProxyRequest(req_->getProtocol(), getOption())) { + e_->getRequestGroupMan()->getOrCreateServerStat + (req_->getHost(), req_->getProtocol())->setError(); } throw DL_RETRY_EX (StringFormat(MSG_ESTABLISHING_CONNECTION_FAILED, error.c_str()).str()); @@ -781,12 +781,12 @@ const std::string& AbstractCommand::resolveProxyMethod const SharedHandle