2006-02-17 13:35:04 +00:00
|
|
|
bin_PROGRAMS = aria2c
|
|
|
|
|
aria2c_SOURCES = main.cc
|
|
|
|
|
SRCS = Socket.cc Socket.h\
|
2006-02-17 14:47:45 +00:00
|
|
|
SocketCore.cc SocketCore.h\
|
2006-02-17 13:35:04 +00:00
|
|
|
Command.h\
|
|
|
|
|
AbstractCommand.cc AbstractCommand.h\
|
|
|
|
|
InitiateConnectionCommandFactory.cc InitiateConnectionCommandFactory.h\
|
|
|
|
|
DownloadCommand.cc DownloadCommand.h\
|
|
|
|
|
HttpInitiateConnectionCommand.cc HttpInitiateConnectionCommand.h\
|
|
|
|
|
HttpRequestCommand.cc HttpRequestCommand.h\
|
|
|
|
|
HttpResponseCommand.cc HttpResponseCommand.h\
|
|
|
|
|
HttpProxyRequestCommand.cc HttpProxyRequestCommand.h\
|
|
|
|
|
HttpProxyResponseCommand.cc HttpProxyResponseCommand.h\
|
|
|
|
|
HttpDownloadCommand.cc HttpDownloadCommand.h\
|
2006-02-21 12:27:17 +00:00
|
|
|
HttpHeader.cc HttpHeader.h\
|
2006-02-17 13:35:04 +00:00
|
|
|
HttpConnection.cc HttpConnection.h\
|
2006-02-21 12:27:17 +00:00
|
|
|
FtpConnection.cc FtpConnection.h\
|
|
|
|
|
FtpInitiateConnectionCommand.cc FtpInitiateConnectionCommand.h\
|
|
|
|
|
FtpNegotiationCommand.cc FtpNegotiationCommand.h\
|
|
|
|
|
FtpDownloadCommand.cc FtpDownloadCommand.h\
|
|
|
|
|
FtpTunnelRequestCommand.cc FtpTunnelRequestCommand.h\
|
|
|
|
|
FtpTunnelResponseCommand.cc FtpTunnelResponseCommand.h\
|
2006-02-17 13:35:04 +00:00
|
|
|
SleepCommand.cc SleepCommand.h\
|
|
|
|
|
DownloadEngine.cc DownloadEngine.h\
|
2006-03-02 02:54:49 +00:00
|
|
|
ConsoleDownloadEngine.cc ConsoleDownloadEngine.h\
|
2006-02-17 13:35:04 +00:00
|
|
|
Segment.h\
|
|
|
|
|
SegmentMan.cc SegmentMan.h\
|
2006-02-22 14:30:47 +00:00
|
|
|
SegmentSplitter.cc SegmentSplitter.h\
|
|
|
|
|
SplitFirstSegmentSplitter.cc SplitFirstSegmentSplitter.h\
|
|
|
|
|
SplitSlowestSegmentSplitter.cc SplitSlowestSegmentSplitter.h\
|
2006-02-17 13:35:04 +00:00
|
|
|
Util.cc Util.h\
|
|
|
|
|
Request.cc Request.h\
|
|
|
|
|
common.h\
|
|
|
|
|
message.h\
|
|
|
|
|
Exception.h\
|
|
|
|
|
DlAbortEx.h\
|
|
|
|
|
DlRetryEx.h\
|
|
|
|
|
Logger.h\
|
|
|
|
|
SimpleLogger.cc SimpleLogger.h\
|
|
|
|
|
TransferEncoding.h\
|
|
|
|
|
ChunkedEncoding.cc ChunkedEncoding.h\
|
|
|
|
|
DiskWriter.h\
|
|
|
|
|
DefaultDiskWriter.cc DefaultDiskWriter.h\
|
2006-03-21 14:12:51 +00:00
|
|
|
PreAllocationDiskWriter.cc PreAllocationDiskWriter.h\
|
2006-02-17 13:35:04 +00:00
|
|
|
AbstractDiskWriter.cc AbstractDiskWriter.h\
|
|
|
|
|
File.cc File.h\
|
|
|
|
|
Option.cc Option.h\
|
|
|
|
|
Base64.cc Base64.h\
|
2006-03-21 14:12:51 +00:00
|
|
|
CookieBox.cc CookieBox.h\
|
|
|
|
|
MetaEntry.h\
|
|
|
|
|
Data.cc Data.h\
|
|
|
|
|
Dictionary.cc Dictionary.h\
|
|
|
|
|
List.cc List.h\
|
|
|
|
|
MetaFileUtil.cc MetaFileUtil.h\
|
|
|
|
|
MetaEntryVisitor.h\
|
|
|
|
|
ShaVisitor.cc ShaVisitor.h\
|
|
|
|
|
TrackerInitCommand.cc TrackerInitCommand.h\
|
|
|
|
|
TrackerDownloadCommand.cc TrackerDownloadCommand.h\
|
|
|
|
|
TrackerUpdateCommand.cc TrackerUpdateCommand.h\
|
|
|
|
|
TorrentMan.cc TorrentMan.h\
|
|
|
|
|
PeerConnection.cc PeerConnection.h\
|
|
|
|
|
PeerMessageUtil.cc PeerMessageUtil.h\
|
|
|
|
|
PeerAbstractCommand.cc PeerAbstractCommand.h\
|
|
|
|
|
PeerInitiateConnectionCommand.cc PeerInitiateConnectionCommand.h\
|
|
|
|
|
PeerInteractionCommand.cc PeerInteractionCommand.h\
|
|
|
|
|
Peer.cc Peer.h\
|
|
|
|
|
BitfieldMan.cc BitfieldMan.h\
|
|
|
|
|
TorrentDownloadEngine.cc TorrentDownloadEngine.h\
|
|
|
|
|
TorrentConsoleDownloadEngine.cc TorrentConsoleDownloadEngine.h\
|
|
|
|
|
PeerListenCommand.cc PeerListenCommand.h\
|
|
|
|
|
PendingMessage.cc PendingMessage.h\
|
|
|
|
|
PeerMessage.cc PeerMessage.h\
|
|
|
|
|
HandshakeMessage.h\
|
|
|
|
|
Piece.cc Piece.h\
|
|
|
|
|
RequestSlot.cc RequestSlot.h\
|
|
|
|
|
RequestSlotMan.cc RequestSlotMan.h\
|
|
|
|
|
TorrentAutoSaveCommand.cc TorrentAutoSaveCommand.h\
|
2006-03-27 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
* configure.in: Added gnutls support. Added several CPP macros.
* m4/openssl.m4: Added.
* src/SocketCore.{h,cc}: Drop const quarifier from writeData(),
readData(), peekData(). Added gnutls support.
* src/HttpDownloadCommand.cc: Removed SleepCommand.h
* src/TrackerWatcherCommand.{h,cc}: Added. This command creates
TrackerInitCommand periodicaly(TorrentMan::minInterval).
* src/TorrentMan.cc: Remove downloadedSize == 0 check from
save().
Instead, added a check for whether setup method has executed
successfully.
* src/TorrentMan.h: Added member vaiable setupComplete. Updated
DEFAULT_ANNOUNCE_INTERVAL and DEFAULT_ANNOUNCE_MIN_INTERVAL to
300.
* src/Makefile.am: Updated.
* src/messageDigest.h: Added. This is a macro calculating SHA1
digest
using whether OpenSSL or gcrypt, depending on the result of
configure
script.
* src/ShaVisitor.{h,cc}: Removed direct dependency on OpenSSL by
using
messageDigest.h.
* src/TorrentAutoSaveCommand.h: Removed unused variable cuid.
* src/PeerListenCommand.cc: Added log about port binded
successfully.
Fixed memory leak.
* src/main.cc: Added gnutls support. Replaced LIB_SSL with
ENABLE_BITTORRENT where they are not related to OpenSSL but
BitTorrent.
Removed instantiation of TrackerInitCommand. Instead,
TrackerWatcherCommand is instantiated and pushed to the command
queue.
* src/InitiateConnectionCommandFactory.cc: Replaced HAVE_LIBSSL
with
ENABLE_SSL.
* src/Request.cc: Replaced HAVE_LIBSSL with ENABLE_SSL.
* src/RequestSlotMan.cc:
(deleteCompletedRequestSlot)
If a piece is already acquired by another command, delete the
request
slots for the piece.
* src/TrackerUpdateCommand.cc:
(execute)
Changed log level of MSG_TRACKER_WARNING_MESSAGE from info to
warn.
Added a check whether peer list is null.
Fixed the bug that causes sending completed event to the tracker
several times.
* src/TrackerInitCommand.cc:
(execute)
Fixed the bug that causes sending completed event to the tracker
several times.
* src/AbstractDiskWriter.{h,cc}: Removed direct dependency on
OpenSSL
by using messageDigest.h.
2006-03-26 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
* PeerConnection.cc: Replaced log message "keep-alive" with
"keep alive".
* PeerInteractionCommand.{h,cc}: Close connection if peer is
choking
localhost long time.
* TorrentMan.cc: When adding new peer with duplicate = true, if
the
number of peer list is equal to or grater than MAX_PEER_LIST,
delete
at most 100 failure entry from the list. If with duplicate =
false,
MAX_PEER_LIST is not checked.
* PeerListenCommand.cc: Fixed the argument order of log message.
2006-03-25 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
* Logger.h: Moved enum LEVEL from SimpleLogger.h to here.
Added warn().
* SimpleLogger.h: Moved enum LEVEL to Logger.h.
Implemented warn().
Defined 2 macros(WRITE_LOG, WRITE_LOG_EX) to avoid duplicated
code.
2006-03-27 14:47:26 +00:00
|
|
|
Directory.cc Directory.h\
|
|
|
|
|
TrackerWatcherCommand.cc TrackerWatcherCommand.h\
|
Added new class SendMessageQueue that includes PendingMessages
and
RequestSlotMan.
* src/SendMessageQueue.h: New class.
* src/SendMessageQueue.cc: New class.
* src/PendingMessage.h: Added new member variable blockIndex and
its
accessors.
(createRequestMessage): Updated.
* src/PendingMessage.cc (createRequestMessage): Updated.
* src/PeerInteractionCommand.cc (executeInternal): Updated with
SendMessageQueue.
(checkLongTimePeerChoking): Updated with SendMessageQueue.
(receiveMessage): Updated with SendMessageQueue.
(deletePendingPieceMessage): Removed.
(getNewPieceAndSendInterest): Updated with SendMessageQueue.
(sendInterest): Updated with SendMessageQueue.
(createRequestPendingMessage): Updated with SendMessageQueue.
(sendMessages): Updated with SendMessageQueue.
(onAbort): Updated with SendMessageQueue.
(keepAlive): Updated with SendMessageQueue.
(beforeSocketCheck): Updated SendMessageQueue.
* src/PeerInteractionCommand (sendMessages): Shuffle
missingBLockIndexes before using it.
Added its own timeout for peer connection.
* src/PeerAbstractCommand.h: Added member variable timeout and
its
setter.
* src/prefs.h: Added PREF_PEER_CONNECTION_TIMEOUT.
* src/PeerInteractionCommand.cc (PeerInteractionCommand):
Added setTimeout() call.
(executeInternal): Added setTimeout() call.
* src/PeerAbstractCommand.cc (PeerAbstractCommand):
Added timeout.
(isTimeoutDetected): Updated.
* src/main.cc (main): Added PREF_PEER_CONNECTION_TIMEOUT entry
to
option.
Added *simple* message flooding checker.
* src/PeerInteractionCommand.cc (executeInternal):
Added detectMessageFlooding() call.
(detectMessageFlooding): New function.
(receiveMessage): Count up CHOKE, UNCHOKE, HAVE message.
(beforeSocketCheck): Added detectMessageFlooding() call.
* src/PeerInteractionCommand.h: Added sendMessageQueue,
chokeUnchokeCount, haveCount, detectMessageFlooding().
Removed deletePendingPieceMessage(), getRequestSlot(),
deleteRequestSlot(), deleteAllRequestSlot().
* src/PeerInteractionCommand.cc (beforeSocketCheck):
Added checkLongTimePeerChoking() call.
* src/RequestSlotMan.h: Renamed deleteTimeoutRequestSlot().
* src/TorrentMan.cc (addPeer): Delete at most MAX_PEER_LIST_SIZE
peers
if duplicate == false.
The parameter "uploaded" and "downloaded" in the tracker request
are
the size since the client sent the "started" event to the
tracker.
* src/TorrentMan.cc (setup): Assigned saved downloaded Size and
uploaded size to preDownloadedSize, preUploadedSize
respectively.
* src/TorrentMan.h: Added preDownloadedSize, preUploadedSize,
getSessionDownloadedSize(), getSessionUploadedSize().
* src/TrackerInitCommand.cc (execute): Use
getSessionDownloadedSize(),
getSessionUploadedSize() instead of getDownloadedSize(),
getUploadedSize().
* src/PendingMessage.cc (processMessage): Do not send request
message
if the peer is choking the client.
* src/TrackerUpdateCommand.cc (execute): Check wtheher
minInterval is
less than interval.
2006-03-28 15:23:51 +00:00
|
|
|
messageDigest.h\
|
2006-04-12 13:55:43 +00:00
|
|
|
SendMessageQueue.cc SendMessageQueue.h\
|
2006-04-16 14:38:19 +00:00
|
|
|
MultiDiskWriter.cc MultiDiskWriter.h\
|
|
|
|
|
DiskAdaptor.cc DiskAdaptor.h\
|
|
|
|
|
CopyDiskAdaptor.cc CopyDiskAdaptor.h\
|
|
|
|
|
DirectDiskAdaptor.cc DirectDiskAdaptor.h\
|
|
|
|
|
MultiDiskAdaptor.cc MultiDiskAdaptor.h\
|
2006-04-17 16:17:20 +00:00
|
|
|
FileEntry.h\
|
|
|
|
|
LogFactory.cc LogFactory.h
|
2006-02-17 13:35:04 +00:00
|
|
|
noinst_LIBRARIES = libaria2c.a
|
|
|
|
|
libaria2c_a_SOURCES = $(SRCS)
|
2006-03-27 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
* configure.in: Added gnutls support. Added several CPP macros.
* m4/openssl.m4: Added.
* src/SocketCore.{h,cc}: Drop const quarifier from writeData(),
readData(), peekData(). Added gnutls support.
* src/HttpDownloadCommand.cc: Removed SleepCommand.h
* src/TrackerWatcherCommand.{h,cc}: Added. This command creates
TrackerInitCommand periodicaly(TorrentMan::minInterval).
* src/TorrentMan.cc: Remove downloadedSize == 0 check from
save().
Instead, added a check for whether setup method has executed
successfully.
* src/TorrentMan.h: Added member vaiable setupComplete. Updated
DEFAULT_ANNOUNCE_INTERVAL and DEFAULT_ANNOUNCE_MIN_INTERVAL to
300.
* src/Makefile.am: Updated.
* src/messageDigest.h: Added. This is a macro calculating SHA1
digest
using whether OpenSSL or gcrypt, depending on the result of
configure
script.
* src/ShaVisitor.{h,cc}: Removed direct dependency on OpenSSL by
using
messageDigest.h.
* src/TorrentAutoSaveCommand.h: Removed unused variable cuid.
* src/PeerListenCommand.cc: Added log about port binded
successfully.
Fixed memory leak.
* src/main.cc: Added gnutls support. Replaced LIB_SSL with
ENABLE_BITTORRENT where they are not related to OpenSSL but
BitTorrent.
Removed instantiation of TrackerInitCommand. Instead,
TrackerWatcherCommand is instantiated and pushed to the command
queue.
* src/InitiateConnectionCommandFactory.cc: Replaced HAVE_LIBSSL
with
ENABLE_SSL.
* src/Request.cc: Replaced HAVE_LIBSSL with ENABLE_SSL.
* src/RequestSlotMan.cc:
(deleteCompletedRequestSlot)
If a piece is already acquired by another command, delete the
request
slots for the piece.
* src/TrackerUpdateCommand.cc:
(execute)
Changed log level of MSG_TRACKER_WARNING_MESSAGE from info to
warn.
Added a check whether peer list is null.
Fixed the bug that causes sending completed event to the tracker
several times.
* src/TrackerInitCommand.cc:
(execute)
Fixed the bug that causes sending completed event to the tracker
several times.
* src/AbstractDiskWriter.{h,cc}: Removed direct dependency on
OpenSSL
by using messageDigest.h.
2006-03-26 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
* PeerConnection.cc: Replaced log message "keep-alive" with
"keep alive".
* PeerInteractionCommand.{h,cc}: Close connection if peer is
choking
localhost long time.
* TorrentMan.cc: When adding new peer with duplicate = true, if
the
number of peer list is equal to or grater than MAX_PEER_LIST,
delete
at most 100 failure entry from the list. If with duplicate =
false,
MAX_PEER_LIST is not checked.
* PeerListenCommand.cc: Fixed the argument order of log message.
2006-03-25 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
* Logger.h: Moved enum LEVEL from SimpleLogger.h to here.
Added warn().
* SimpleLogger.h: Moved enum LEVEL to Logger.h.
Implemented warn().
Defined 2 macros(WRITE_LOG, WRITE_LOG_EX) to avoid duplicated
code.
2006-03-27 14:47:26 +00:00
|
|
|
aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ @LIBGNUTLS_LIBS@\
|
|
|
|
|
@LIBGCRYPT_LIBS@ @OPENSSL_LIBS@
|
|
|
|
|
AM_CPPFLAGS = -Wall\
|
|
|
|
|
-I../lib -I../intl -I$(top_srcdir)/intl\
|
|
|
|
|
@LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@\
|
|
|
|
|
-D_FILE_OFFSET_BITS=64 -DLOCALEDIR=\"$(localedir)\" @DEFS@
|