2008-03-01 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

Updated Makfefile.am to make 'make dist' work. Now packaged filename is aria2c-VERSION.tar.bz2. Added README, README.html, and aria2c.1.html to dist_doc_DATA. Added LICENSE.OpenSSL to dist_noinst_DATA. Large file support is now configured by configure script. * configure.ac Removed unsused source files * src/ * test/ Removed PeerDecl.h and BtContextDecl.h. typedefs are removed to Peer.h and BtContext.h respectively. * src/Peer.h * src/BtContext.h Updated translations. Added Polish, Thai, Indonesian, Norwegian Nynorsk, Hungarian translations. Great thanks to all translators!;) * po/*.{po, gmo}
2008-03-01 04:42:53 +00:00 · 2008-03-01 04:42:53 +00:00 · b1aeb277aa
parent 3698b46805
commit b1aeb277aa
86 changed files with 9606 additions and 2296 deletions
--- a/24
+++ b/24
@ -1,3 +1,27 @@
+2008-03-01  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Updated Makfefile.am to make 'make dist' work.
+	Now packaged filename is aria2c-VERSION.tar.bz2.
+	Added README, README.html, and aria2c.1.html to dist_doc_DATA.
+	Added LICENSE.OpenSSL to dist_noinst_DATA.
+
+	Large file support is now configured by configure script.
+	* configure.ac
+	
+	Removed unsused source files
+	* src/
+	* test/
+
+	Removed PeerDecl.h and BtContextDecl.h. typedefs are removed to
+	Peer.h and BtContext.h respectively.
+	* src/Peer.h
+	* src/BtContext.h
+
+	Updated translations.
+	Added Polish, Thai, Indonesian, Norwegian Nynorsk, Hungarian
+	translations. Great thanks to all translators!;)
+	* po/*.{po, gmo}
+	
 2008-02-29  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>

 	Create MessageDigestHelper::staticSHA1DigestInit() which uses
--- a/Makefile.am
+++ b/Makefile.am
@ -1,5 +1,9 @@
-SUBDIRS =  m4 po intl src test doc
+SUBDIRS =  m4 po intl lib src test doc

 ACLOCAL_AMFLAGS = -I m4

 EXTRA_DIST = config.rpath
+
+dist_doc_DATA = README README.html
+
+dist_noinst_DATA = LICENSE.OpenSSL
--- a/Makefile.in
+++ b/Makefile.in
@ -13,6 +13,7 @@
 # PARTICULAR PURPOSE.

@SET_MAKE@
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@ -36,7 +37,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
+	$(dist_noinst_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure $(top_srcdir)/intl/Makefile.in \
 	ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS TODO \
@ -77,6 +79,15 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-recursive installcheck-recursive installdirs-recursive \
 	pdf-recursive ps-recursive uninstall-info-recursive \
 	uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(docdir)"
+dist_docDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_doc_DATA) $(dist_noinst_DATA)
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@ -286,9 +297,11 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-SUBDIRS = m4 po intl src test doc
+SUBDIRS = m4 po intl lib src test doc
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = config.rpath
+dist_doc_DATA = README README.html
+dist_noinst_DATA = LICENSE.OpenSSL
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

@ -346,6 +359,23 @@ distclean-hdr:
 intl/Makefile: $(top_builddir)/config.status $(top_srcdir)/intl/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 uninstall-info-am:
+install-dist_docDATA: $(dist_doc_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
+	@list='$(dist_doc_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+	  $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+	done
+
+uninstall-dist_docDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_doc_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
+	done

 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@ -624,9 +654,12 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile config.h
+all-am: Makefile $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(docdir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@ -670,7 +703,7 @@ info: info-recursive

 info-am:

-install-data-am:
+install-data-am: install-dist_docDATA

 install-exec-am:

@ -698,7 +731,7 @@ ps: ps-recursive

 ps-am:

-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-dist_docDATA uninstall-info-am

 uninstall-info: uninstall-info-recursive

@ -709,12 +742,13 @@ uninstall-info: uninstall-info-recursive
 	distclean-hdr distclean-recursive distclean-tags \
 	distcleancheck distdir distuninstallcheck dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	install-data-am install-dist_docDATA install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_docDATA \
 	uninstall-info-am

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/config.h.in
+++ b/config.h.in
@ -543,11 +543,17 @@
 # undef _ALL_SOURCE
 #endif

+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif

+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
 /* Define to 1 if on MINIX. */
 #undef _MINIX

--- a/354
+++ b/354
@ -1412,6 +1412,7 @@ Optional Features:
  --disable-dependency-tracking  speeds up one-time build
  --enable-dependency-tracking   do not reject slow dependency extractors
  --disable-xmltest       Do not try to compile and run a test LIBXML program
+  --disable-largefile     omit support for large files
  --disable-nls           do not use Native Language Support
  --enable-threads={posix|solaris|pth|win32}
                          specify multithreading API
@ -8195,6 +8196,356 @@ _ACEOF

 fi

+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then
+  enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+
+  { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
+echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; }
+if test "${ac_cv_sys_largefile_CC+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+	 # IRIX 6.2 and later do not support large files by default,
+	 # so use the C compiler's -n32 option if that helps.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+	 rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext
+	 CC="$CC -n32"
+	 rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_sys_largefile_CC=' -n32'; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext
+	 break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
+echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; }
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
+
+  { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; }
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  while :; do
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_sys_file_offset_bits=no; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_sys_file_offset_bits=64; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_file_offset_bits=unknown
+  break
+done
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
+echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+;;
+esac
+rm -f conftest*
+  if test $ac_cv_sys_file_offset_bits = unknown; then
+    { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
+echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
+if test "${ac_cv_sys_large_files+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  while :; do
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_sys_large_files=no; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_cv_sys_large_files=1; break
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_large_files=unknown
+  break
+done
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
+echo "${ECHO_T}$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -f conftest*
+  fi
+fi
+

 # Checks for library functions.

@ -18562,7 +18913,7 @@ fi
 		;;
 esac

-ac_config_files="$ac_config_files Makefile src/Makefile test/Makefile po/Makefile.in m4/Makefile intl/Makefile doc/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile test/Makefile po/Makefile.in m4/Makefile intl/Makefile lib/Makefile doc/Makefile"

 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@ -19359,6 +19710,7 @@ do
    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
    "m4/Makefile") CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
    "intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
+    "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;

  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
--- a/configure.ac
+++ b/configure.ac
@ -142,6 +142,7 @@ AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_STRUCT_TM
 AC_C_VOLATILE
+AC_SYS_LARGEFILE

 # Checks for library functions.
 AM_GNU_GETTEXT
@ -204,6 +205,7 @@ AC_CONFIG_FILES([Makefile
 		po/Makefile.in
 		m4/Makefile
 		intl/Makefile
+		lib/Makefile
 		doc/Makefile])
 AC_OUTPUT

--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@ -1,2 +1,3 @@
 man_MANS = aria2c.1
 EXTRA_DIST = $(man_MANS)
+dist_doc_DATA = aria2c.1.html
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@ -13,6 +13,7 @@
 # PARTICULAR PURPOSE.

@SET_MAKE@
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@ -37,7 +38,8 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_doc_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
 	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
@ -65,9 +67,17 @@ CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
 man1dir = $(mandir)/man1
-am__installdirs = "$(DESTDIR)$(man1dir)"
+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"
 NROFF = nroff
 MANS = $(man_MANS)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+dist_docDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_doc_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@ -266,6 +276,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 man_MANS = aria2c.1
 EXTRA_DIST = $(man_MANS)
+dist_doc_DATA = aria2c.1.html
 all: all-am

 .SUFFIXES:
@ -344,6 +355,23 @@ uninstall-man1:
 	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
 	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
 	done
+install-dist_docDATA: $(dist_doc_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
+	@list='$(dist_doc_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+	  $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+	done
+
+uninstall-dist_docDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_doc_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:

@ -380,9 +408,9 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(MANS)
+all-am: Makefile $(MANS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(man1dir)"; do \
+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@ -427,7 +455,7 @@ info: info-am

 info-am:

-install-data-am: install-man
+install-data-am: install-dist_docDATA install-man

 install-exec-am:

@ -453,18 +481,19 @@ ps: ps-am

 ps-am:

-uninstall-am: uninstall-info-am uninstall-man
+uninstall-am: uninstall-dist_docDATA uninstall-info-am uninstall-man

 uninstall-man: uninstall-man1

 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-man1 install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-man uninstall-man1
+	install install-am install-data install-data-am \
+	install-dist_docDATA install-exec install-exec-am install-info \
+	install-info-am install-man install-man1 install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am uninstall-dist_docDATA \
+	uninstall-info-am uninstall-man uninstall-man1

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@ -0,0 +1 @@
+EXTRA_DIST = gettext.h
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@ -0,0 +1,416 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = lib
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc2.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/intl.m4 \
+	$(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax.m4 \
+	$(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libares.m4 \
+	$(top_srcdir)/m4/libcares.m4 $(top_srcdir)/m4/libexpat.m4 \
+	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/openssl.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf-posix.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/visibility.m4 $(top_srcdir)/m4/wchar_t.m4 \
+	$(top_srcdir)/m4/wint_t.m4 $(top_srcdir)/m4/xsize.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
+CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENABLE_ASYNC_DNS_FALSE = @ENABLE_ASYNC_DNS_FALSE@
+ENABLE_ASYNC_DNS_TRUE = @ENABLE_ASYNC_DNS_TRUE@
+ENABLE_BITTORRENT_FALSE = @ENABLE_BITTORRENT_FALSE@
+ENABLE_BITTORRENT_TRUE = @ENABLE_BITTORRENT_TRUE@
+ENABLE_LIBEXPAT_FALSE = @ENABLE_LIBEXPAT_FALSE@
+ENABLE_LIBEXPAT_TRUE = @ENABLE_LIBEXPAT_TRUE@
+ENABLE_LIBXML2_FALSE = @ENABLE_LIBXML2_FALSE@
+ENABLE_LIBXML2_TRUE = @ENABLE_LIBXML2_TRUE@
+ENABLE_MESSAGE_DIGEST_FALSE = @ENABLE_MESSAGE_DIGEST_FALSE@
+ENABLE_MESSAGE_DIGEST_TRUE = @ENABLE_MESSAGE_DIGEST_TRUE@
+ENABLE_METALINK_FALSE = @ENABLE_METALINK_FALSE@
+ENABLE_METALINK_TRUE = @ENABLE_METALINK_TRUE@
+EXEEXT = @EXEEXT@
+GENCAT = @GENCAT@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIBC2 = @GLIBC2@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_BASENAME_FALSE = @HAVE_BASENAME_FALSE@
+HAVE_BASENAME_TRUE = @HAVE_BASENAME_TRUE@
+HAVE_GAI_STRERROR_FALSE = @HAVE_GAI_STRERROR_FALSE@
+HAVE_GAI_STRERROR_TRUE = @HAVE_GAI_STRERROR_TRUE@
+HAVE_GETADDRINFO_FALSE = @HAVE_GETADDRINFO_FALSE@
+HAVE_GETADDRINFO_TRUE = @HAVE_GETADDRINFO_TRUE@
+HAVE_GETTIMEOFDAY_FALSE = @HAVE_GETTIMEOFDAY_FALSE@
+HAVE_GETTIMEOFDAY_TRUE = @HAVE_GETTIMEOFDAY_TRUE@
+HAVE_INET_ATON_FALSE = @HAVE_INET_ATON_FALSE@
+HAVE_INET_ATON_TRUE = @HAVE_INET_ATON_TRUE@
+HAVE_LOCALTIME_R_FALSE = @HAVE_LOCALTIME_R_FALSE@
+HAVE_LOCALTIME_R_TRUE = @HAVE_LOCALTIME_R_TRUE@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_STRPTIME_FALSE = @HAVE_STRPTIME_FALSE@
+HAVE_STRPTIME_TRUE = @HAVE_STRPTIME_TRUE@
+HAVE_TIMEGM_FALSE = @HAVE_TIMEGM_FALSE@
+HAVE_TIMEGM_TRUE = @HAVE_TIMEGM_TRUE@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBARES_CPPFLAGS = @LIBARES_CPPFLAGS@
+LIBARES_LIBS = @LIBARES_LIBS@
+LIBCARES_CPPFLAGS = @LIBCARES_CPPFLAGS@
+LIBCARES_LIBS = @LIBCARES_LIBS@
+LIBEXPAT_CPPFLAGS = @LIBEXPAT_CPPFLAGS@
+LIBEXPAT_LIBS = @LIBEXPAT_LIBS@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBMULTITHREAD = @LIBMULTITHREAD@
+LIBOBJS = @LIBOBJS@
+LIBPTH = @LIBPTH@
+LIBPTH_PREFIX = @LIBPTH_PREFIX@
+LIBS = @LIBS@
+LIBTHREAD = @LIBTHREAD@
+LTLIBC = @LTLIBC@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBMULTITHREAD = @LTLIBMULTITHREAD@
+LTLIBOBJS = @LTLIBOBJS@
+LTLIBPTH = @LTLIBPTH@
+LTLIBTHREAD = @LTLIBTHREAD@
+MAKEINFO = @MAKEINFO@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+POSUB = @POSUB@
+PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WINDRES = @WINDRES@
+WINSOCK_LIBS = @WINSOCK_LIBS@
+WOE32 = @WOE32@
+WOE32DLL = @WOE32DLL@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+XML2_CONFIG = @XML2_CONFIG@
+XML_CPPFLAGS = @XML_CPPFLAGS@
+XML_LIBS = @XML_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+EXTRA_DIST = gettext.h
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lib/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  lib/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
--- a/po/LINGUAS
+++ b/po/LINGUAS
@ -1 +1 @@
-ca de es fi fr he it ja nl pt_BR ru sv
+ca de es fi fr he hu id it ja nl nn pl pt_BR ru sv th
--- a/po/Makevars.template
+++ b/po/Makevars.template
@ -1,41 +0,0 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
-
-# This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright.  The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = Free Software Foundation, Inc.
-
-# This is the email address or URL to which the translators shall report
-# bugs in the untranslated strings:
-# - Strings which are not entire sentences, see the maintainer guidelines
-#   in the GNU gettext documentation, section 'Preparing Strings'.
-# - Strings which use unclear terms or require additional context to be
-#   understood.
-# - Strings which make invalid assumptions about notation of date, time or
-#   money.
-# - Pluralisation problems.
-# - Incorrect English spelling.
-# - Incorrect formatting.
-# It can be your email address, or a mailing list address where translators
-# can write to without being subscribed, or the URL of a web page through
-# which the translators can contact you.
-MSGID_BUGS_ADDRESS =
-
-# This is the list of locale categories, beyond LC_MESSAGES, for which the
-# message catalogs shall be used.  It is usually empty.
-EXTRA_LOCALE_CATEGORIES =
--- a/po/POTFILES
+++ b/po/POTFILES
@ -1,10 +0,0 @@
-     ../src/OptionHandlerImpl.h \
-     ../src/message.h \
-     ../src/usage_text.h \
-     ../src/BtSetup.cc \
-     ../src/DownloadEngine.cc \
-     ../src/HelpItem.cc \
-     ../src/MultiUrlRequestInfo.cc \
-     ../src/RequestGroupMan.cc \
-     ../src/Util.cc \
-     ../src/version_usage.cc
--- a/po/aria2c.pot
+++ b/po/aria2c.pot
@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: aria2c 0.13.0b\n"
+"Project-Id-Version: aria2c 0.13.0rc\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-02-21 23:22+0900\n"
+"POT-Creation-Date: 2008-03-01 01:55+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -1491,7 +1491,7 @@ msgstr ""
 msgid "Status Legend:"
 msgstr ""

-#: src/Util.cc:702
+#: src/Util.cc:634
 msgid "Files:"
 msgstr ""

--- a/po/ca.gmo
+++ b/po/ca.gmo
--- a/po/ca.po
+++ b/po/ca.po
@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-02-21 23:22+0900\n"
+"POT-Creation-Date: 2008-03-01 01:55+0900\n"
 "PO-Revision-Date: 2007-11-30 20:02+0000\n"
 "Last-Translator: Jordi Pujol <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-02-21 12:32+0000\n"
+"X-Launchpad-Export-Date: 2008-03-01 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: src/OptionHandlerImpl.h:70
@ -1739,7 +1739,7 @@ msgstr "Resultats de la descàrrega:"
 msgid "Status Legend:"
 msgstr ""

-#: src/Util.cc:702
+#: src/Util.cc:634
 msgid "Files:"
 msgstr "Fitxers:"

--- a/po/de.gmo
+++ b/po/de.gmo
--- a/po/de.po
+++ b/po/de.po
@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-02-21 23:22+0900\n"
-"PO-Revision-Date: 2008-02-14 20:33+0000\n"
-"Last-Translator: Moritz G. <Unknown>\n"
+"POT-Creation-Date: 2008-03-01 01:55+0900\n"
+"PO-Revision-Date: 2008-02-29 16:42+0000\n"
+"Last-Translator: BoomerBoss <dev@breuer-pascal.de>\n"
 "Language-Team: deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-02-21 12:32+0000\n"
+"X-Launchpad-Export-Date: 2008-03-01 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: src/OptionHandlerImpl.h:70
@ -1586,7 +1586,7 @@ msgstr "Download Ergebnisse"
 msgid "Status Legend:"
 msgstr ""

-#: src/Util.cc:702
+#: src/Util.cc:634
 msgid "Files:"
 msgstr ""

@ -1654,7 +1654,7 @@ msgstr "Optionen:"
 #: src/version_usage.cc:125
 #, c-format
 msgid "Printing options whose name starts with '%s'."
-msgstr ""
+msgstr "Druckoptionen dessen name mit %s anfängt."

 #: src/version_usage.cc:130
 #, c-format
@ -1662,10 +1662,14 @@ msgid "No help category or option name matching with '%s'."
 msgstr ""

 #: src/version_usage.cc:138
+#, fuzzy
 msgid ""
 " You can specify multiple URLs. Unless you specify -Z option, all URLs must\n"
 " point to the same file or downloading will fail."
 msgstr ""
+" Sie können mehrere URLs angeben. Solange sie nicht die -Z Option benutzen, "
+"müssen\n"
+" alle URLs zur selben Datei zeigen oder der Download schlägt fehl."

 #: src/version_usage.cc:140
 msgid ""
@ -1683,8 +1687,9 @@ msgid ""
 msgstr ""

 #: src/version_usage.cc:149
+#, fuzzy
 msgid "Refer to man page for more information."
-msgstr ""
+msgstr "Für mehr Informationen, sehen Sie bitte in der man page nach."

 #~ msgid ""
 #~ "\n"
--- a/po/es.gmo
+++ b/po/es.gmo
--- a/po/es.po
+++ b/po/es.po
@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-02-21 23:22+0900\n"
-"PO-Revision-Date: 2008-02-21 21:40+0900\n"
+"POT-Creation-Date: 2008-03-01 01:55+0900\n"
+"PO-Revision-Date: 2008-03-01 13:38+0900\n"
 "Last-Translator: Jordi Pujol <Unknown>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-02-21 12:32+0000\n"
+"X-Launchpad-Export-Date: 2008-03-01 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: src/OptionHandlerImpl.h:70
@ -1746,7 +1746,7 @@ msgstr "Resultados de la descarga:"
 msgid "Status Legend:"
 msgstr ""

-#: src/Util.cc:702
+#: src/Util.cc:634
 msgid "Files:"
 msgstr "Ficheros:"

--- a/po/fi.gmo
+++ b/po/fi.gmo
--- a/po/fi.po
+++ b/po/fi.po
@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-02-21 23:22+0900\n"
+"POT-Creation-Date: 2008-03-01 01:55+0900\n"
 "PO-Revision-Date: 2008-01-27 16:49+0000\n"
 "Last-Translator: Curaga <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-02-21 12:32+0000\n"
+"X-Launchpad-Export-Date: 2008-03-01 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: src/OptionHandlerImpl.h:70
@ -1532,7 +1532,6 @@ msgid " --enable-dht[=true|false]    Enable DHT functionality."
 msgstr ""

 #: src/usage_text.h:262
-#, fuzzy
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for DHT.\n"
 "                              Multiple ports can be specified by using ',',\n"
@ -1542,12 +1541,6 @@ msgid ""
 "can\n"
 "                              be used together."
 msgstr ""
-" --listen-port=PORTTI ... Aseta TCP-portin numero BitTorrent-latauksiin.\n"
-"                            Monia portteja voi valita käyttämällä pilkkua, "
-"esim '6881,6885'\n"
-"                            Voit käyttää myös '-' alueen merkitsemiseen: "
-"'6881-6999'\n"
-"                            Molempia voi käyttää yhtäaikaa."

 #: src/usage_text.h:268
 msgid ""
@ -1669,7 +1662,6 @@ msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version Tulosta versionumero ja lopeta."

 #: src/usage_text.h:319
-#, fuzzy
 msgid ""
 " -h, --help[=CATEGORY]        Print usage and exit.\n"
 "                              The help messages are classified in several\n"
@ -1683,12 +1675,6 @@ msgid ""
 "match\n"
 "                              and print the result."
 msgstr ""
-" -h, --help[=CATEGORY] Tulosta ohje ja lopeta.\n"
-"                              Ohjeet on ryhmitelty useisiin\n"
-"                              osioihin. Esim. käytä --help=http\n"
-"                              saadaksesi ohjeita http:stä.\n"
-"                              Jos vastaavaa osiota ei ole,\n"
-"                              etsitään valintaa hakusanalla."

 #: src/usage_text.h:327
 msgid " --no-conf                    Disable loading aria2.conf file."
@ -1751,7 +1737,7 @@ msgstr "Lataustulokset:"
 msgid "Status Legend:"
 msgstr "Tilalegenda:"

-#: src/Util.cc:702
+#: src/Util.cc:634
 msgid "Files:"
 msgstr "Tiedostot:"

--- a/po/fr.gmo
+++ b/po/fr.gmo
--- a/po/fr.po
+++ b/po/fr.po
@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2 0.11.2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-02-21 23:22+0900\n"
-"PO-Revision-Date: 2008-02-19 10:32+0000\n"
+"POT-Creation-Date: 2008-03-01 01:55+0900\n"
+"PO-Revision-Date: 2008-02-29 12:51+0000\n"
 "Last-Translator: willemijns <Unknown>\n"
 "Language-Team: Fran&ccedil;ais\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-02-21 12:32+0000\n"
+"X-Launchpad-Export-Date: 2008-03-01 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: src/OptionHandlerImpl.h:70
@ -593,7 +593,7 @@ msgstr "L'initialisation de la librairie socket Windows a échoué."
 #: src/message.h:142
 #, c-format
 msgid "%d second(s) has passed. Stopping application."
-msgstr ""
+msgstr "%d seconde(s) sont passée(s). Arrêt de l'applicatiion"

 #: src/message.h:144
 msgid "Timeout."
@ -1631,7 +1631,6 @@ msgid " --enable-dht[=true|false]    Enable DHT functionality."
 msgstr " --enable-dht[=true|false] Active ou non la fonctionnalité \"DHT\"."

 #: src/usage_text.h:262
-#, fuzzy
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for DHT.\n"
 "                              Multiple ports can be specified by using ',',\n"
@ -1641,21 +1640,22 @@ msgid ""
 "can\n"
 "                              be used together."
 msgstr ""
-" --listen-port=PORT... Définit le nombre de port TCP pour les "
-"téléchargements BitTorrent.\n"
-"                              Plusieurs ports peuvent être spécifiés en "
-"utilisant ',',\n"
-"                              par exemple: \"6881,6885\". Vous pouvez aussi "
+" --dht-listen-port=PORT...    Configure le port d'écoute UDP pour le DHT.\n"
+"                              De multiples port peuvent être spécifiés en "
+"utilisant une\n"
+"                              virgule (ex: \"6881,6885\". Vous pouvez aussi "
 "utiliser  '-'\n"
 "                              pour spécifier une rangée: \"6881-6999\". ',' "
 "et '-' peuvent\n"
-"                              être utilisés ensemble."
+"                              être utilisée simultanément."

 #: src/usage_text.h:268
 msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to DHT\n"
 "                              network."
 msgstr ""
+" --dht-entry-point=HOST:PORT  Configure le host et le port comme un point  "
+"d'entrée au réseau DHT."

 #: src/usage_text.h:271
 msgid ""
@ -1784,7 +1784,6 @@ msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version"

 #: src/usage_text.h:319
-#, fuzzy
 msgid ""
 " -h, --help[=CATEGORY]        Print usage and exit.\n"
 "                              The help messages are classified in several\n"
@ -1798,18 +1797,12 @@ msgid ""
 "match\n"
 "                              and print the result."
 msgstr ""
-" -h, --help[=CATEGORY] Affiche l'aide et quitte.\n"
-"                              Les messages d'aides sont classés en "
-"plusieurs\n"
-"                              catégories. Par exemple, tapez \"--help=http\" "
-"pour\n"
-"                              une explication détaillée en rapport avec "
-"http.\n"
-"                              Si aucune catégorie correspondante est "
-"trouvée, cherchez\n"
-"                              une fois encore le nom de l'option dans la "
-"liste qui s'affichera.\n"
-"                              affichez les résultats."
+" -h, --help[=CATEGORY]        Liste l'aide et les options.\n"
+"                              Cette aide est clasée en plusieurs "
+"catégories.\n"
+"                              Par exemple, \"--help=http\" détaille l'aide "
+"et les \n"
+"                              options concernant le HTTP."

 #: src/usage_text.h:327
 msgid " --no-conf                    Disable loading aria2.conf file."
@ -1827,6 +1820,10 @@ msgid ""
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
+" --stop=SEC                   Stoppe l'application après \"SEC\" seconde"
+"(s).\n"
+"                              Si la valeur est égale à 0 cette fonction est "
+"inactive."

 #: src/BtSetup.cc:120
 msgid "Errors occurred while binding port.\n"
@ -1875,7 +1872,7 @@ msgstr "Résultats du ou des téléchargements:"
 msgid "Status Legend:"
 msgstr "Légende du statut:"

-#: src/Util.cc:702
+#: src/Util.cc:634
 msgid "Files:"
 msgstr "Fichiers:"

--- a/po/he.gmo
+++ b/po/he.gmo
--- a/po/he.po
+++ b/po/he.po
@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-02-21 23:22+0900\n"
+"POT-Creation-Date: 2008-03-01 01:55+0900\n"
 "PO-Revision-Date: 2008-02-13 11:01+0000\n"
 "Last-Translator: Yaron <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-02-21 12:32+0000\n"
+"X-Launchpad-Export-Date: 2008-03-01 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: src/OptionHandlerImpl.h:70
@ -1507,7 +1507,7 @@ msgstr ""
 msgid "Status Legend:"
 msgstr ""

-#: src/Util.cc:702
+#: src/Util.cc:634
 msgid "Files:"
 msgstr ""

--- a/po/hu.gmo
+++ b/po/hu.gmo
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/id.gmo
+++ b/po/id.gmo
--- a/po/id.po
+++ b/po/id.po
--- a/po/it.gmo
+++ b/po/it.gmo
--- a/po/it.po
+++ b/po/it.po
@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-02-21 23:22+0900\n"
+"POT-Creation-Date: 2008-03-01 01:55+0900\n"
 "PO-Revision-Date: 2007-12-23 22:42+0000\n"
 "Last-Translator: benazzo <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-02-21 12:32+0000\n"
+"X-Launchpad-Export-Date: 2008-03-01 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: src/OptionHandlerImpl.h:70
@ -1556,7 +1556,7 @@ msgstr "Risultati del download:"
 msgid "Status Legend:"
 msgstr ""

-#: src/Util.cc:702
+#: src/Util.cc:634
 msgid "Files:"
 msgstr "File:"

--- a/po/ja.gmo
+++ b/po/ja.gmo
--- a/po/ja.po
+++ b/po/ja.po
@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2c 0.2.1\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-02-21 23:22+0900\n"
-"PO-Revision-Date: 2007-12-28 10:41+0000\n"
+"POT-Creation-Date: 2008-03-01 01:55+0900\n"
+"PO-Revision-Date: 2008-02-26 15:36+0000\n"
 "Last-Translator: Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-02-21 12:32+0000\n"
+"X-Launchpad-Export-Date: 2008-03-01 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: src/OptionHandlerImpl.h:70
@ -279,7 +279,7 @@ msgstr "CUID#%d - Fast extension が有効になりました."
 #: src/message.h:81
 #, c-format
 msgid "CUID#%d - Extended Messaging enabled."
-msgstr ""
+msgstr "CUID#%d - Extended Messaging が有効になりました."

 #: src/message.h:82
 #, c-format
@ -338,7 +338,7 @@ msgstr ""
 #: src/message.h:92
 #, c-format
 msgid "CUID#%d - The peer is DHT-enabled."
-msgstr ""
+msgstr "CUID#%d - このピアは DHT 機能も持っています."

 #: src/message.h:94
 #, c-format
@ -553,7 +553,7 @@ msgstr "metalink XML ファイルが壊れているので読めません."
 #: src/message.h:136
 #, c-format
 msgid "Too small payload size for %s, size=%d."
-msgstr ""
+msgstr "%s のペイロード長にしては短すぎます. ペイロード長=%d"

 #: src/message.h:137
 #, c-format
@ -561,29 +561,31 @@ msgid ""
 "Removed the defunct control file %s because the download file %s doesn't "
 "exist."
 msgstr ""
+"無効なコントロールファイル %s を削除しました. 理由: 対象のダウンロードファイ"
+"ル %s が存在しないため."

 #: src/message.h:138
 #, c-format
 msgid "Your share ratio was %.1f, uploaded/downloaded=%sB/%sB"
-msgstr ""
+msgstr "シェアレシオは %.1f でした. uploaded/downloaded=%sB/%sB"

 #: src/message.h:139
 #, c-format
 msgid "Missing %s in torrent metainfo."
-msgstr ""
+msgstr "%s が torrent ファイルに存在しません."

 #: src/message.h:140
 msgid "Tracker returned null data."
-msgstr ""
+msgstr "トラッカーが null データを返しました."

 #: src/message.h:141
 msgid "Windows socket library initialization failed"
-msgstr ""
+msgstr "Windows ソケットライブラリの初期化に失敗しました."

 #: src/message.h:142
 #, c-format
 msgid "%d second(s) has passed. Stopping application."
-msgstr ""
+msgstr "%d 秒が経過したので, アプリケーションを停止します."

 #: src/message.h:144
 msgid "Timeout."
@ -739,17 +741,17 @@ msgstr "ディレクトリ %s を作成できませんでした. 原因: %s"
 #: src/message.h:177
 #, c-format
 msgid "Failed to open the segment file %s, cause: %s"
-msgstr "セグメントファイル %s をオープンできませんでした. 原因: %s"
+msgstr "コントロールファイル %s をオープンできませんでした. 原因: %s"

 #: src/message.h:178
 #, c-format
 msgid "Failed to write into the segment file %s, cause: %s"
-msgstr "セグメントファイル %s への書き込みに失敗しました. 原因: %s"
+msgstr "コントロールファイル %s への書き込みに失敗しました. 原因: %s"

 #: src/message.h:179
 #, c-format
 msgid "Failed to read from the segment file %s, cause: %s"
-msgstr "セグメントファイル %s からの読み込みに失敗しました. 原因: %s"
+msgstr "コントロールファイル %s からの読み込みに失敗しました. 原因: %s"

 #: src/message.h:181
 #, c-format
@ -936,7 +938,7 @@ msgstr "例外発生"
 #: src/message.h:216
 #, c-format
 msgid "Max payload length exceeded or invalid. length = %u"
-msgstr ""
+msgstr "ペイロード長が許容最大値を越えているか, 不正です. ペイロード長 = %u"

 #: src/message.h:217
 #, c-format
@ -1571,10 +1573,10 @@ msgstr ""
 "範\n"
 "                              囲を指定します.\n"
 "                              複数のポートを ',' で区切って指定できます:\n"
-"                              \\\"6881,6885\\\". また, '-' を使って範囲指定も"
-"できま\n"
-"                              す: \\\"6881-6999\\\". ',' と '-' は組み合わせ"
-"て使う\n"
+"                              \"6881,6885\". また, '-' を使って範囲指定もでき"
+"ま\n"
+"                              す: \"6881-6999\". ',' と '-' は組み合わせて使"
+"う\n"
 "                              ことができます."

 #: src/usage_text.h:234
@ -1648,14 +1650,13 @@ msgstr ""

 #: src/usage_text.h:258
 msgid " --enable-peer-exchange[=true|false] Enable Peer Exchange extension."
-msgstr ""
+msgstr " --enable-peer-exchange[=true|false] Peer Exchange を有効にします."

 #: src/usage_text.h:260
 msgid " --enable-dht[=true|false]    Enable DHT functionality."
-msgstr ""
+msgstr " --enable-dht[=true|false]    DHT を有効にします."

 #: src/usage_text.h:262
-#, fuzzy
 msgid ""
 " --dht-listen-port=PORT...    Set UDP listening port for DHT.\n"
 "                              Multiple ports can be specified by using ',',\n"
@ -1665,14 +1666,12 @@ msgid ""
 "can\n"
 "                              be used together."
 msgstr ""
-" --listen-port=PORT...        BitTorrent ダウンロードで使用する TCP ポートの"
-"範\n"
-"                              囲を指定します.\n"
+" --dht-listen-port=PORT...    DHT で使用する UDP ポートの範囲を指定します.\n"
 "                              複数のポートを ',' で区切って指定できます:\n"
-"                              \\\"6881,6885\\\". また, '-' を使って範囲指定も"
-"できま\n"
-"                              す: \\\"6881-6999\\\". ',' と '-' は組み合わせ"
-"て使う\n"
+"                              \"6881,6885\". また, '-' を使って範囲指定もでき"
+"ま\n"
+"                              す: \"6881-6999\". ',' と '-' は組み合わせて使"
+"う\n"
 "                              ことができます."

 #: src/usage_text.h:268
@ -1680,6 +1679,9 @@ msgid ""
 " --dht-entry-point=HOST:PORT  Set host and port as an entry point to DHT\n"
 "                              network."
 msgstr ""
+" --dht-entry-point=HOST:PORT  DHT ネットワークへのエントリーポイントとして使"
+"用\n"
+"                              するホストとポート番号を指定します."

 #: src/usage_text.h:271
 msgid ""
@ -1690,6 +1692,13 @@ msgid ""
 "satisfies\n"
 "                              the given level."
 msgstr ""
+" --bt-min-crypto-level=plain|arc4 許容する暗号化レベルの最小値をセットしま"
+"す.\n"
+"                              いくつかの暗号化レベルがピアから提示された場"
+"合,\n"
+"                              その中からここで指定する最小値を満たす暗号化レ"
+"ベ\n"
+"                              ルを選択します."

 #: src/usage_text.h:276
 msgid ""
@ -1698,6 +1707,13 @@ msgid ""
 "                              handshake. Thus aria2 always uses Obfuscation\n"
 "                              handshake."
 msgstr ""
+" --bt-require-crypto=true|false true を指定した場合, aria2 は従来の "
+"BitTorrent\n"
+"                              ハンドシェイクを拒否し, またそれを使って外部へ"
+"接\n"
+"                              続しません. つまり常に暗号化ハンドシェイクを使"
+"い\n"
+"                              ます."

 #: src/usage_text.h:281
 msgid " -M, --metalink-file=METALINK_FILE The file path to the .metalink file."
@ -1744,6 +1760,12 @@ msgid ""
 "                              values are 'http', 'https', 'ftp' and 'none'.\n"
 "                              Specifiy none to disable this feature."
 msgstr ""
+" --metalink-preferred-protocol=PROTO 優先的に使用するプロトコルを指定しま"
+"す.\n"
+"                              指定可能な値は, 'http', 'https', 'ftp', 'none' "
+"で\n"
+"                              す. 'none' を指定するとこの機能は無効になりま"
+"す."

 #: src/usage_text.h:301
 msgid ""
@ -1787,13 +1809,23 @@ msgid ""
 "                              Use --metalink-preferred-protocol option to\n"
 "                              specify the preference of protocol."
 msgstr ""
+" --metalink-enable-unique-protocol=true|false true が指定された場合で同じホス"
+"ト\n"
+"                              で複数のプロトコルのリソースが metalink ファイ"
+"ル\n"
+"                              に記述されている場合, aria2 はいづれか一つだけ"
+"を\n"
+"                              使うようになります. どのプロトコルを優先的に使"
+"用\n"
+"                              するかを指定するには--metalink-preferred-"
+"protocol\n"
+"                              オプションを使ってください."

 #: src/usage_text.h:317
 msgid " -v, --version                Print the version number and exit."
 msgstr " -v, --version                バージョン番号を表示し, 終了します."

 #: src/usage_text.h:319
-#, fuzzy
 msgid ""
 " -h, --help[=CATEGORY]        Print usage and exit.\n"
 "                              The help messages are classified in several\n"
@ -1807,27 +1839,28 @@ msgid ""
 "match\n"
 "                              and print the result."
 msgstr ""
-" --seed-ratio=RATIO           シェアレシオを指定します. BitTorrent のダウン"
-"ロー\n"
-"                              ドが完了しても, シェアレシオが RATIO に達するま"
-"で\n"
-"                              シードを継続します. RATIO は 1.0 が推奨されてい"
-"ま\n"
-"                              す. 0.0 を指定すると, シェアレシオに関係なく, "
-"シ\n"
-"                              ードを継続します.\n"
-"                              --seed-time オプションと共に使用した場合, どち"
-"ら\n"
-"                              かの条件が成立した時点でシードは終了となります."
+" -h, --help[=CATEGORY]        ヘルプを表示して終了します.\n"
+"                              ヘルプはいくつかのカテゴリに分けられています.\n"
+"                              例えば, \"--help=http\" と指定すると, http に関"
+"する\n"
+"                              詳細なオプションのヘルプが表示されます.\n"
+"                              マッチするカテゴリが存在しない場合, 指定された"
+"キ\n"
+"                              ーワードを使って, オプション名について前方一致"
+"検\n"
+"                              索を行い, 該当するオプションのヘルプを表示しま"
+"す."

 #: src/usage_text.h:327
 msgid " --no-conf                    Disable loading aria2.conf file."
 msgstr ""
+" --no-conf                    aria2.conf ファイルの読み込みを抑制します."

 #: src/usage_text.h:329
 msgid ""
 " --conf-path=PATH             Change the configuration file path to PATH."
 msgstr ""
+" --conf-path=PATH             読み込む設定ファイルのパスを PATH に変更します."

 #: src/usage_text.h:331
 msgid ""
@ -1835,6 +1868,9 @@ msgid ""
 "passed.\n"
 "                              If 0 is given, this feature is disabled."
 msgstr ""
+" --stop=SEC                   SEC 秒が経過した後, アプリケーションを停止しま"
+"す.\n"
+"                              0 を指定すると, この機能は無効になります."

 #: src/BtSetup.cc:120
 msgid "Errors occurred while binding port.\n"
@ -1844,10 +1880,12 @@ msgstr "ポートをバインド中にエラーが発生しました.\n"
 msgid ""
 "Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."
 msgstr ""
+"シャットダウン中です... 緊急時に即座にシャットダウンしたい場合は Ctrl-C をも"
+"う一度押してください."

 #: src/DownloadEngine.cc:299
 msgid "Emergency shutdown sequence commencing..."
-msgstr ""
+msgstr "緊急シャットダウン中です..."

 #: src/HelpItem.cc:40
 msgid "                              Default: "
@ -1855,11 +1893,11 @@ msgstr "                              既定値: "

 #: src/HelpItem.cc:41
 msgid "                              Tags: "
-msgstr ""
+msgstr "                              タグ: "

 #: src/HelpItem.cc:42
 msgid "                              Available Values: "
-msgstr ""
+msgstr "                              値域: "

 #: src/MultiUrlRequestInfo.cc:78
 msgid "aria2 will resume download if the transfer is restarted."
@ -1879,9 +1917,9 @@ msgstr "ダウンロード結果:"

 #: src/RequestGroupMan.cc:273
 msgid "Status Legend:"
-msgstr ""
+msgstr "凡例:"

-#: src/Util.cc:702
+#: src/Util.cc:634
 msgid "Files:"
 msgstr "ファイル:"

@ -1944,17 +1982,19 @@ msgstr "       %s [オプション] -M METALINK_FILE\n"
 #: src/version_usage.cc:112
 #, c-format
 msgid "Printing all options."
-msgstr ""
+msgstr "すべてのオプションを表示します."

 #: src/version_usage.cc:114
 #, c-format
 msgid "Printing options tagged with '%s'."
-msgstr ""
+msgstr "'%s' タグが付いたオプションのみ表示します."

 #: src/version_usage.cc:116
 #, c-format
 msgid "See -h option to know other command-line options(%s)."
 msgstr ""
+"他のコマンドラインオプション(%s)について知るには, -h オプションを参照してくだ"
+"さい."

 #: src/version_usage.cc:120 src/version_usage.cc:127
 msgid "Options:"
@ -1963,12 +2003,12 @@ msgstr "オプション:"
 #: src/version_usage.cc:125
 #, c-format
 msgid "Printing options whose name starts with '%s'."
-msgstr ""
+msgstr "'%s' で始まるオプションを表示しています."

 #: src/version_usage.cc:130
 #, c-format
 msgid "No help category or option name matching with '%s'."
-msgstr ""
+msgstr "'%s' のヘルプカテゴリや, それで始まるオプションはありません."

 #: src/version_usage.cc:138
 msgid ""
@ -1998,6 +2038,9 @@ msgid ""
 " Make sure that URL is quoted with single(') or double(\") quotation if it\n"
 " contains \"&\" or any characters that have special meaning in shell."
 msgstr ""
+" URL に \"&\" やシェルにおいて特別な意味を持つ文字が含まれる場合, URL を ' ま"
+"たは\n"
+" \" で囲って(クォートして)ください."

 #: src/version_usage.cc:149
 msgid "Refer to man page for more information."
--- a/po/nl.gmo
+++ b/po/nl.gmo
--- a/po/nl.po
+++ b/po/nl.po
@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-02-21 23:22+0900\n"
+"POT-Creation-Date: 2008-03-01 01:55+0900\n"
 "PO-Revision-Date: 2007-12-25 21:55+0000\n"
 "Last-Translator: Jelle Lampaert <crazed007@gmail.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-02-21 12:32+0000\n"
+"X-Launchpad-Export-Date: 2008-03-01 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: src/OptionHandlerImpl.h:70
@ -1514,7 +1514,7 @@ msgstr ""
 msgid "Status Legend:"
 msgstr ""

-#: src/Util.cc:702
+#: src/Util.cc:634
 msgid "Files:"
 msgstr ""

--- a/po/nn.gmo
+++ b/po/nn.gmo
--- a/po/nn.po
+++ b/po/nn.po
--- a/po/pl.gmo
+++ b/po/pl.gmo
--- a/po/pl.po
+++ b/po/pl.po
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-02-21 23:22+0900\n"
+"POT-Creation-Date: 2008-03-01 01:55+0900\n"
 "PO-Revision-Date: 2007-12-01 14:25+0000\n"
 "Last-Translator: jareth-Br <fcarretoni@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-02-21 12:32+0000\n"
+"X-Launchpad-Export-Date: 2008-03-01 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: src/OptionHandlerImpl.h:70
@ -1512,7 +1512,7 @@ msgstr ""
 msgid "Status Legend:"
 msgstr ""

-#: src/Util.cc:702
+#: src/Util.cc:634
 msgid "Files:"
 msgstr ""

--- a/po/remove-potcdate.sed
+++ b/po/remove-potcdate.sed
@ -1,11 +0,0 @@
-/^"POT-Creation-Date: .*"$/{
-x
-s/P/P/
-ta
-g
-d
-bb
-:a
-x
-:b
-}
--- a/po/ru.gmo
+++ b/po/ru.gmo
--- a/po/ru.po
+++ b/po/ru.po
@ -10,14 +10,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-02-21 23:22+0900\n"
-"PO-Revision-Date: 2008-02-21 21:41+0900\n"
+"POT-Creation-Date: 2008-03-01 01:55+0900\n"
+"PO-Revision-Date: 2008-03-01 13:39+0900\n"
 "Last-Translator: Anton <anton.bugs@gmail.com>\n"
 "Language-Team: <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-02-21 12:32+0000\n"
+"X-Launchpad-Export-Date: 2008-03-01 03:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: src/OptionHandlerImpl.h:70
@ -1562,7 +1562,7 @@ msgstr ""
 msgid "Status Legend:"
 msgstr ""

-#: src/Util.cc:702
+#: src/Util.cc:634
 msgid "Files:"
 msgstr "Файлы:"

--- a/po/sv.gmo
+++ b/po/sv.gmo
--- a/po/sv.po
+++ b/po/sv.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2008-02-21 23:22+0900\n"
+"POT-Creation-Date: 2008-03-01 01:55+0900\n"
 "PO-Revision-Date: 2007-12-09 00:07+0900\n"
 "Last-Translator: Hampus Wessman <hw@vox.nu>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@ -1544,7 +1544,7 @@ msgstr ""
 msgid "Status Legend:"
 msgstr ""

-#: src/Util.cc:702
+#: src/Util.cc:634
 msgid "Files:"
 msgstr ""

--- a/po/th.gmo
+++ b/po/th.gmo
--- a/po/th.po
+++ b/po/th.po
--- a/src/BNodeDecl.h
+++ b/src/BNodeDecl.h
@ -1,44 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#ifndef _D_BNODE_DECL_H_
-#define _D_BNODE_DECL_H_
-
-#include "SharedHandle.h"
-#include <deque>
-
-class BNode;
-
-typedef std::deque<BNode*> BNodes;
-#endif // _D_BNODE_DECL_H_
--- a/src/BtContext.h
+++ b/src/BtContext.h
@ -36,7 +36,6 @@
 #define _D_BT_CONTEXT_H_

 #include "DownloadContext.h"
-#include "BtContextDecl.h"
 #include <utility>
 #include <deque>

@ -83,6 +82,9 @@ public:

 };

+class BtContext;
+typedef SharedHandle<BtContext> BtContextHandle;
+
 } // namespace aria2

 #endif // _D_BT_CONTEXT_H_
--- a/src/BtContextDecl.h
+++ b/src/BtContextDecl.h
@ -1,47 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#ifndef _D_BT_CONTEXT_DECL_H_
-#define _D_BT_CONTEXT_DECL_H_
-
-#include "SharedHandle.h"
-
-namespace aria2 {
-
-class BtContext;
-typedef SharedHandle<BtContext> BtContextHandle;
-
-} // namespace aria2
-
-#endif // _D_BT_CONTEXT_DECL_H_
--- a/src/BtMessageFactory.cc
+++ b/src/BtMessageFactory.cc
@ -1,53 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#include "BtMessageFactory.h"
-#include "DefaultBtMessageFactory.h"
-
-void BtMessageFactory::registerFactory(const string& key,
-				       const BtMessageFactoryPrerequisiteHandle& prereq) {
-  prerequisiteMap.erase(key);
-  BtMessageFactoryPrerequisiteMap::value_type p(key, prereq);
-  prerequisiteMap.insert(p);
-}
-
-static BtMessageFactory::BtMessageFactoryHandle getNewFactory(const string& key) {
-  DefaultBtMessageFactoryHandle factory = new DefaultBtMessageFactory();
-  BtMessageFactoryPrerequisiteMap::iterator itr = prerequisiteMap.find(key);
-  if(prerequisiteMap.end() != itr) {
-    // TODO set prerequisite objects to factory here
-  }
-  return factory;
-}
-
--- a/src/ChunkChecksumValidator.cc
+++ b/src/ChunkChecksumValidator.cc
@ -1,68 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#include "ChunkChecksumValidator.h"
-#include "TimeA2.h"
-#include "message.h"
-
-void ChunkChecksumValidator::validate()
-{
-  /*
-  if(!_validator->canValidate()) {
-    // insufficient checksums.
-    logger->error(MSG_INSUFFICIENT_CHECKSUM,
-		  _validator->getChunkChecksum()->getChecksumLength(),
-		  _validator->getChunkChecksum()->countChecksum());
-    return;
-  }
-  _validator->init();
-
-  int32_t numChecksum = _validator->getChunkChecksum()->countChecksum();
-  fileAllocationMonitor->setMinValue(0);
-  fileAllocationMonitor->setMaxValue(numChecksum);
-  fileAllocationMonitor->setCurrentValue(0);
-  fileAllocationMonitor->showProgress();
-  Time cp;
-  for(int32_t i = 0; i < numChecksum; ++i) {
-    _validator->validateChunk();
-    if(cp.elapsedInMillis(500)) {
-      fileAllocationMonitor->setCurrentValue(i+1);
-      fileAllocationMonitor->showProgress();
-      cp.reset();
-    }
-  }
-  fileAllocationMonitor->setCurrentValue(numChecksum);
-  fileAllocationMonitor->showProgress();
-*/
-}
--- a/src/ChunkChecksumValidator.h
+++ b/src/ChunkChecksumValidator.h
@ -1,68 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#ifndef _D_CHUNK_CHECKSUM_VALIDATOR_H_
-#define _D_CHUNK_CHECKSUM_VALIDATOR_H_
-
-#include "common.h"
-#include "LogFactory.h"
-#include "FileAllocationMonitor.h"
-#include "NullFileAllocationMonitor.h"
-#include "IteratableChunkChecksumValidator.h"
-
-class ChunkChecksumValidator {
-private:
-  IteratableChunkChecksumValidatorHandle _validator;
-
-  FileAllocationMonitorHandle fileAllocationMonitor;
-
-  const Logger* logger;
-public:
-  ChunkChecksumValidator(const IteratableChunkChecksumValidatorHandle v):
-    _validator(v),
-    fileAllocationMonitor(new NullFileAllocationMonitor()),
-    logger(LogFactory::getInstance())
-  {}
-
-  ~ChunkChecksumValidator() {}
-
-  void validate();
-
-  void setFileAllocationMonitor(const FileAllocationMonitorHandle& monitor) {
-    this->fileAllocationMonitor = monitor;
-  }
-};
-
-typedef SharedHandle<ChunkChecksumValidator> ChunkChecksumValidatorHandle;
-#endif // _D_CHUNK_CHECKSUM_VALIDATOR_H_
--- a/src/ConnectionException.h
+++ b/src/ConnectionException.h
@ -1,46 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#ifndef _D_CONNECTION_EXCEPTION_H_
-#define _D_CONNECTION_EXCEPTION_H_
-
-#include "DlAbortEx.h"
-
-class ConnectionException:public DlAbortEx {
-public:
-  ConnectionException():DlAbortEx() {}
-  ConnectionException(const string& msg):DlAbortEx() {}
-};
-
-#endif // _D_CONNECTION_EXCEPTION_H_
--- a/src/DiskAdaptorWriter.h
+++ b/src/DiskAdaptorWriter.h
@ -1,92 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#ifndef _D_DISK_ADAPTOR_WRITER_H_
-#define _D_DISK_ADAPTOR_WRITER_H_
-
-#include "DiskWriter.h"
-#include "DiskAdaptor.h"
-#include "FatalException.h"
-
-class DiskAdaptorWriter : public DiskWriter {
-private:
-  DiskAdaptorHandle diskAdaptor;
-public:
-  DiskAdaptorWriter(const DiskAdaptorHandle& diskAdaptor):
-    diskAdaptor(diskAdaptor) {}
-
-  virtual ~DiskAdaptorWriter() {}
-
-  virtual void initAndOpenFile(const string& filename, int64_t totalLength = 0)
-  {
-    diskAdaptor->initAndOpenFile();
-  }
-  
-  virtual void openFile(const string& filename, int64_t totalLength = 0)
-  {
-    diskAdaptor->openFile();
-  }
-
-  virtual void closeFile()
-  {
-    diskAdaptor->closeFile();
-  }
-
-  virtual void openExistingFile(const string& filename, int64_t totalLength = 0)
-  {
-    diskAdaptor->openExistingFile();
-  }
-
-  virtual void writeData(const char* data, int32_t len, int64_t position = 0)
-  {
-    diskAdaptor->writeData((const unsigned char*)data, len, position);
-  }
-
-  virtual int32_t readData(char* data, int32_t len, int64_t position)
-  {
-    return diskAdaptor->readData((unsigned char*)data, len, position);
-  }
-
-  virtual void truncate(int64_t length)
-  {
-    throw new FatalException("DiskAdaptorWriter::truncate() is not implemented yet.");
-  }
-
-  virtual int64_t size() const
-  {
-    return diskAdaptor->size();
-  }
-};
-
-#endif // _D_DISK_ADAPTOR_WRITER_H_
--- a/src/DownloadMethod.h
+++ b/src/DownloadMethod.h
@ -1,46 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#ifndef _D_DOWNLOAD_METHOD_H_
-#define _D_DOWNLOAD_METHOD_H_
-
-#include "Request.h"
-
-class DownloadMethod {
-public:
-  virtual void sendRequest(Request& request) = 0;
-  virtual void getDataFragment(char* buffer, int len) = 0;
-};
-
-#endif // _D_DOWNLOAD_METHOD_H_
--- a/src/FileProgressMonitor.h
+++ b/src/FileProgressMonitor.h
@ -1,56 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#ifndef _D_FILE_PROGRESS_MONITOR_H_
-#define _D_FILE_PROGRESS_MONITOR_H_
-
-#include "common.h"
-
-template <typename T>
-class FileProgressMonitor {
-public:
-  virtual ~FileProgressMonitor() {}
-
-  virtual void setFilename(const string& filename) = 0;
-
-  virtual void setMinValue(const T& min) = 0;
-  
-  virtual void setMaxValue(const T& max) = 0;
-
-  virtual void setCurrentValue(const T& current) = 0;
-
-  virtual void showProgress() = 0;
-};
-
-#endif // _D_FILE_PROGRESS_MONITOR_H_
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -4,6 +4,7 @@ aria2c_SOURCES = main.cc\
 	version_usage.cc
 SRCS =  Socket.h\
 	SocketCore.cc SocketCore.h\
+	BinaryStream.h\
 	Command.cc Command.h\
 	AbstractCommand.cc AbstractCommand.h\
 	InitiateConnectionCommandFactory.cc InitiateConnectionCommandFactory.h\
@ -37,17 +38,19 @@ SRCS =  Socket.h\
 	RecoverableException.h\
 	DlAbortEx.h\
 	DlRetryEx.h\
+	DownloadFailureException.h\
 	Logger.h\
 	SimpleLogger.cc SimpleLogger.h\
 	TransferEncoding.h\
 	ChunkedEncoding.cc ChunkedEncoding.h\
 	DiskWriter.h\
+	DiskWriterFactory.h\
 	AbstractDiskWriter.cc AbstractDiskWriter.h\
 	DefaultDiskWriter.cc DefaultDiskWriter.h\
-	DefaultDiskWriterFactory.cc\
+	DefaultDiskWriterFactory.cc DefaultDiskWriterFactory.h\
 	File.cc File.h\
 	Option.cc Option.h\
-	Base64.cc\
+	Base64.cc Base64.h\
 	CookieBox.cc CookieBox.h\
 	LogFactory.cc LogFactory.h\
 	NullLogger.h\
@ -70,12 +73,15 @@ SRCS =  Socket.h\
 	Netrc.cc Netrc.h\
 	AuthConfig.cc AuthConfig.h\
 	AuthResolver.h\
-	AbstractAuthResolver.cc\
+	AbstractAuthResolver.cc AbstractAuthResolver.h\
 	DefaultAuthResolver.cc DefaultAuthResolver.h\
 	NetrcAuthResolver.cc NetrcAuthResolver.h\
 	AuthConfigFactory.cc AuthConfigFactory.h\
 	OptionParser.cc OptionParser.h\
 	OptionHandlerFactory.cc OptionHandlerFactory.h\
+	OptionHandler.h\
+	OptionHandlerImpl.h\
+	NameMatchOptionHandler.h\
 	NameResolver.cc NameResolver.h\
 	RequestGroup.cc RequestGroup.h\
 	RequestGroupAware.cc RequestGroupAware.h\
@ -124,6 +130,7 @@ SRCS =  Socket.h\
 	NullProgressInfoFile.h\
 	FileAllocationIterator.h\
 	SingleFileAllocationIterator.cc SingleFileAllocationIterator.h\
+	RequestGroupCriteria.h\
 	ContentTypeRequestGroupCriteria.cc ContentTypeRequestGroupCriteria.h\
 	DownloadHandler.cc DownloadHandler.h\
 	DownloadHandlerConstants.cc DownloadHandlerConstants.h\
@ -142,20 +149,38 @@ SRCS =  Socket.h\
 	DirectDiskAdaptor.cc DirectDiskAdaptor.h\
 	MultiDiskAdaptor.cc MultiDiskAdaptor.h\
 	Peer.cc\
-	PeerSessionResource.cc\
+	PeerSessionResource.cc PeerSessionResource.h\
 	BtRegistry.cc BtRegistry.h\
 	MultiFileAllocationIterator.cc MultiFileAllocationIterator.h\
 	PeerConnection.cc PeerConnection.h\
 	ByteArrayDiskWriter.cc ByteArrayDiskWriter.h\
-	ByteArrayDiskWriterFactory.cc\
-	ServerHost.cc\
-	HelpItem.cc\
-	TaggedItem.cc\
-	TagContainer.cc\
-	HelpItemFactory.cc\
-	SingleFileDownloadContext.cc\
-	TimedHaltCommand.cc
-#	debug_new.cpp
+	ByteArrayDiskWriterFactory.cc ByteArrayDiskWriterFactory.h\
+	ServerHost.cc ServerHost.h\
+	HelpItem.cc HelpItem.h\
+	TaggedItem.cc TaggedItem.h\
+	TagContainer.cc TagContainer.h\
+	HelpItemFactory.cc HelpItemFactory.h\
+	DownloadContext.h\
+	SingleFileDownloadContext.cc SingleFileDownloadContext.h\
+	TimedHaltCommand.cc TimedHaltCommand.h\
+	CUIDCounter.h\
+	DNSCache.h\
+	DownloadResult.h\
+	Sequence.h\
+	IntSequence.h\
+	PostDownloadHandler.h\
+	PreDownloadHandler.h\
+	SingletonHolder.h\
+	TrueRequestGroupCriteria.h\
+	a2algo.h\
+	a2functional.h\
+	a2io.h\
+	a2netcompat.h\
+	a2time.h\
+	array_fun.h\
+	help_tags.h\
+	prefs.h\
+	usage_text.h

 if ENABLE_MESSAGE_DIGEST
 SRCS += IteratableChunkChecksumValidator.cc IteratableChunkChecksumValidator.h\
@ -163,7 +188,9 @@ SRCS += IteratableChunkChecksumValidator.cc IteratableChunkChecksumValidator.h\
 	CheckIntegrityCommand.cc CheckIntegrityCommand.h\
 	ChecksumCheckIntegrityEntry.cc ChecksumCheckIntegrityEntry.h\
 	messageDigest.cc messageDigest.h\
-	MessageDigestHelper.cc MessageDigestHelper.h
+	MessageDigestHelper.cc MessageDigestHelper.h\
+	Checksum.h\
+	ChunkChecksum.h
 endif # ENABLE_MESSAGE_DIGEST

 if ENABLE_BITTORRENT
@ -173,7 +200,7 @@ SRCS += MetaEntry.h\
 	List.cc List.h\
 	MetaFileUtil.cc MetaFileUtil.h\
 	MetaEntryVisitor.h\
-	BencodeVisitor.cc\
+	BencodeVisitor.cc BencodeVisitor.h\
 	PeerMessageUtil.cc PeerMessageUtil.h\
 	PeerAbstractCommand.cc PeerAbstractCommand.h\
 	PeerInitiateConnectionCommand.cc PeerInitiateConnectionCommand.h\
@ -196,13 +223,14 @@ SRCS += MetaEntry.h\
 	AnnounceList.h AnnounceList.cc\
 	BtContext.h\
 	DefaultBtContext.cc DefaultBtContext.h\
+	PeerStorage.h\
 	DefaultPeerStorage.cc DefaultPeerStorage.h\
 	BtAnnounce.h\
 	DefaultBtAnnounce.cc DefaultBtAnnounce.h\
 	BtRuntime.h\
 	BtContextAwareCommand.cc BtContextAwareCommand.h\
 	BtMessage.h\
-	AbstractBtMessage.cc\
+	AbstractBtMessage.cc AbstractBtMessage.h\
 	SimpleBtMessage.cc SimpleBtMessage.h\
 	BtAllowedFastMessage.cc BtAllowedFastMessage.h\
 	BtBitfieldMessage.cc BtBitfieldMessage.h\
@ -241,6 +269,7 @@ SRCS += MetaEntry.h\
 	DefaultBtRequestFactory.cc DefaultBtRequestFactory.h\
 	BtEvent.h\
 	BtEventListener.h\
+	AbstractBtEventListener.h\
 	BtCancelSendingPieceEvent.h\
 	BtAbortOutstandingRequestEvent.h\
 	BtChokedEvent.h\
@ -255,63 +284,90 @@ SRCS += MetaEntry.h\
 	BtFileAllocationEntry.cc BtFileAllocationEntry.h\
 	BtPostDownloadHandler.cc BtPostDownloadHandler.h\
 	BtCheckIntegrityEntry.cc BtCheckIntegrityEntry.h\
-	BtExtendedMessage.cc\
-	DefaultExtensionMessageFactory.cc\
-	HandshakeExtensionMessage.cc\
-	UTPexExtensionMessage.cc\
-	DHTNode.cc\
-	DHTUtil.cc\
-	DHTBucket.cc\
-	DHTRoutingTable.cc\
-	DHTMessageEntry.cc\
-	DHTMessageDispatcherImpl.cc\
-	DHTMessageReceiver.cc\
-	DHTMessageTracker.cc\
-	DHTMessageTrackerEntry.cc\
-	DHTMessage.cc\
-	DHTConnectionImpl.cc\
-	DHTAbstractMessage.cc\
-	DHTQueryMessage.cc\
-	DHTResponseMessage.cc\
-	DHTPingMessage.cc\
-	DHTPingReplyMessage.cc\
-	DHTFindNodeMessage.cc\
-	DHTFindNodeReplyMessage.cc\
-	DHTGetPeersMessage.cc\
-	DHTGetPeersReplyMessage.cc\
-	DHTAnnouncePeerMessage.cc\
-	DHTAnnouncePeerReplyMessage.cc\
-	DHTUnknownMessage.cc\
-	DHTMessageFactoryImpl.cc\
-	DHTNodeLookupTask.cc\
-	DHTNodeLookupEntry.cc\
-	BNode.cc\
-	DHTMessageCallbackImpl.cc\
-	DHTAbstractTask.cc\
-	DHTPingTask.cc\
-	DHTTaskQueueImpl.cc\
-	DHTBucketRefreshTask.cc\
-	DHTAbstractNodeLookupTask.cc\
-	DHTPeerLookupTask.cc\
-	DHTSetup.cc\
-	DHTTaskFactoryImpl.cc\
-	DHTInteractionCommand.cc\
-	DHTPeerAnnounceEntry.cc\
-	DHTPeerAnnounceStorage.cc\
-	DHTTokenTracker.cc\
-	DHTGetPeersCommand.cc\
-	DHTTokenUpdateCommand.cc\
-	DHTBucketRefreshCommand.cc\
-	DHTPeerAnnounceCommand.cc\
-	DHTReplaceNodeTask.cc\
-	DHTEntryPointNameResolveCommand.cc\
-	DHTRoutingTableSerializer.cc\
-	DHTRoutingTableDeserializer.cc\
-	DHTAutoSaveCommand.cc\
-	DHTRegistry.cc\
-	InitiatorMSEHandshakeCommand.cc\
-	ReceiverMSEHandshakeCommand.cc\
-	MSEHandshake.cc
+	BtExtendedMessage.cc BtExtendedMessage.h\
+	ExtensionMessage.h\
+	ExtensionMessageFactory.h\
+	DefaultExtensionMessageFactory.cc DefaultExtensionMessageFactory.h\
+	HandshakeExtensionMessage.cc HandshakeExtensionMessage.h\
+	UTPexExtensionMessage.cc UTPexExtensionMessage.h\
+	ExtendedMessagingAware.h\
+	DHTNode.cc DHTNode.h\
+	DHTUtil.cc DHTUtil.h\
+	DHTBucket.cc DHTBucket.h\
+	DHTRoutingTable.cc DHTRoutingTable.h\
+	DHTMessageEntry.cc DHTMessageEntry.h\
+	DHTMessageDispatcher.h\
+	DHTMessageDispatcherImpl.cc DHTMessageDispatcherImpl.h\
+	DHTMessageReceiver.cc DHTMessageReceiver.h\
+	DHTMessageTracker.cc DHTMessageTracker.h\
+	DHTMessageTrackerEntry.cc DHTMessageTrackerEntry.h\
+	DHTMessage.cc DHTMessage.h\
+	DHTConnection.h\
+	DHTConnectionImpl.cc DHTConnectionImpl.h\
+	DHTAbstractMessage.cc DHTAbstractMessage.h\
+	DHTQueryMessage.cc DHTQueryMessage.h\
+	DHTResponseMessage.cc DHTResponseMessage.h\
+	DHTPingMessage.cc DHTPingMessage.h\
+	DHTPingReplyMessage.cc DHTPingReplyMessage.h\
+	DHTFindNodeMessage.cc DHTFindNodeMessage.h\
+	DHTFindNodeReplyMessage.cc DHTFindNodeReplyMessage.h\
+	DHTGetPeersMessage.cc DHTGetPeersMessage.h\
+	DHTGetPeersReplyMessage.cc DHTGetPeersReplyMessage.h\
+	DHTAnnouncePeerMessage.cc DHTAnnouncePeerMessage.h\
+	DHTAnnouncePeerReplyMessage.cc DHTAnnouncePeerReplyMessage.h\
+	DHTUnknownMessage.cc DHTUnknownMessage.h\
+	DHTMessageFactory.h\
+	DHTMessageFactoryImpl.cc DHTMessageFactoryImpl.h\
+	DHTNodeLookupTask.cc DHTNodeLookupTask.h\
+	DHTNodeLookupEntry.cc DHTNodeLookupEntry.h\
+	BNode.cc BNode.h\
+	DHTMessageCallback.h\
+	DHTMessageCallbackImpl.cc DHTMessageCallbackImpl.h\
+	DHTMessageCallbackListener.h\
+	DHTAbstractTask.cc DHTAbstractTask.h\
+	DHTTask.h\
+	DHTPingTask.cc DHTPingTask.h\
+	DHTTaskQueue.h\
+	DHTTaskQueueImpl.cc DHTTaskQueueImpl.h\
+	DHTBucketRefreshTask.cc DHTBucketRefreshTask.h\
+	DHTAbstractNodeLookupTask.cc DHTAbstractNodeLookupTask.h\
+	DHTPeerLookupTask.cc DHTPeerLookupTask.h\
+	DHTSetup.cc DHTSetup.h\
+	DHTTaskFactory.h\
+	DHTTaskFactoryImpl.cc DHTTaskFactoryImpl.h\
+	DHTInteractionCommand.cc DHTInteractionCommand.h\
+	DHTPeerAnnounceEntry.cc DHTPeerAnnounceEntry.h\
+	DHTPeerAnnounceStorage.cc DHTPeerAnnounceStorage.h\
+	DHTTokenTracker.cc DHTTokenTracker.h\
+	DHTGetPeersCommand.cc DHTGetPeersCommand.h\
+	DHTTokenUpdateCommand.cc DHTTokenUpdateCommand.h\
+	DHTBucketRefreshCommand.cc DHTBucketRefreshCommand.h\
+	DHTPeerAnnounceCommand.cc DHTPeerAnnounceCommand.h\
+	DHTReplaceNodeTask.cc DHTReplaceNodeTask.h\
+	DHTEntryPointNameResolveCommand.cc DHTEntryPointNameResolveCommand.h\
+	DHTRoutingTableSerializer.cc DHTRoutingTableSerializer.h\
+	DHTRoutingTableDeserializer.cc DHTRoutingTableDeserializer.h\
+	DHTAutoSaveCommand.cc DHTAutoSaveCommand.h\
+	DHTRegistry.cc DHTRegistry.h\
+	DHTIDCloser.h\
+	DHTConstants.h\
+	XORCloser.h\
+	PeerAddrEntry.h\
+	InitiatorMSEHandshakeCommand.cc InitiatorMSEHandshakeCommand.h\
+	ReceiverMSEHandshakeCommand.cc ReceiverMSEHandshakeCommand.h\
+	MSEHandshake.cc MSEHandshake.h\
+	ARC4Decryptor.h\
+	ARC4Encryptor.h\
+	DHKeyExchange.h\
+	LibgcryptARC4Context.h\
+	LibgcryptARC4Decryptor.h\
+	LibgcryptARC4Encryptor.h\
+	LibgcryptDHKeyExchange.h\
+	LibsslARC4Context.h\
+	LibsslARC4Decryptor.h\
+	LibsslARC4Encryptor.h\
+	LibsslDHKeyExchange.h\
+	BtConstants.h
 endif # ENABLE_BITTORRENT

 if ENABLE_METALINK
@ -319,36 +375,37 @@ SRCS += Metalinker.cc Metalinker.h\
 	MetalinkEntry.cc MetalinkEntry.h\
 	MetalinkResource.cc MetalinkResource.h\
 	MetalinkProcessor.h\
-	MetalinkProcessorFactory.cc\
-	MetalinkParserController.cc\
-	MetalinkParserStateMachine.cc\
-	InitialMetalinkParserState.cc\
-	MetalinkMetalinkParserState.cc\
-	FilesMetalinkParserState.cc\
-	FileMetalinkParserState.cc\
-	SizeMetalinkParserState.cc\
-	VersionMetalinkParserState.cc\
-	LanguageMetalinkParserState.cc\
-	OSMetalinkParserState.cc\
-	VerificationMetalinkParserState.cc\
-	HashMetalinkParserState.cc\
-	PiecesMetalinkParserState.cc\
-	PieceHashMetalinkParserState.cc\
-	ResourcesMetalinkParserState.cc\
-	URLMetalinkParserState.cc\
-	FinMetalinkParserState.cc\
-	SkipTagMetalinkParserState.cc\
+	MetalinkProcessorFactory.cc MetalinkProcessorFactory.h\
+	MetalinkParserController.cc MetalinkParserController.h\
+	MetalinkParserStateMachine.cc MetalinkParserStateMachine.h\
+	MetalinkParserState.h\
+	InitialMetalinkParserState.cc InitialMetalinkParserState.h\
+	MetalinkMetalinkParserState.cc MetalinkMetalinkParserState.h\
+	FilesMetalinkParserState.cc FilesMetalinkParserState.h\
+	FileMetalinkParserState.cc FileMetalinkParserState.h\
+	SizeMetalinkParserState.cc SizeMetalinkParserState.h\
+	VersionMetalinkParserState.cc VersionMetalinkParserState.h\
+	LanguageMetalinkParserState.cc LanguageMetalinkParserState.h\
+	OSMetalinkParserState.cc OSMetalinkParserState.h\
+	VerificationMetalinkParserState.cc VerificationMetalinkParserState.h\
+	HashMetalinkParserState.cc HashMetalinkParserState.h\
+	PiecesMetalinkParserState.cc PiecesMetalinkParserState.h\
+	PieceHashMetalinkParserState.cc PieceHashMetalinkParserState.h\
+	ResourcesMetalinkParserState.cc ResourcesMetalinkParserState.h\
+	URLMetalinkParserState.cc URLMetalinkParserState.h\
+	FinMetalinkParserState.cc FinMetalinkParserState.h\
+	SkipTagMetalinkParserState.cc SkipTagMetalinkParserState.h\
 	Metalink2RequestGroup.cc Metalink2RequestGroup.h\
 	MetalinkPostDownloadHandler.cc MetalinkPostDownloadHandler.h\
 	MetalinkHelper.cc MetalinkHelper.h
 endif # ENABLE_METALINK

 if ENABLE_LIBXML2
-SRCS += XML2SAXMetalinkProcessor.cc
+SRCS += XML2SAXMetalinkProcessor.cc XML2SAXMetalinkProcessor.h
 endif # ENABLE_LIBXML2

 if ENABLE_LIBEXPAT
-SRCS += ExpatMetalinkProcessor.cc
+SRCS += ExpatMetalinkProcessor.cc ExpatMetalinkProcessor.h
 endif # ENABLE_LIBEXPAT

 if !HAVE_BASENAME
@ -397,4 +454,4 @@ AM_CPPFLAGS =  -Wall\
 	-I../lib -I../intl -I$(top_srcdir)/intl\
 	@LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\
 	@LIBARES_CPPFLAGS@ @LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\
-	-D_FILE_OFFSET_BITS=64 -DLOCALEDIR=\"$(localedir)\" @DEFS@ #-pg
+	-DLOCALEDIR=\"$(localedir)\" @DEFS@ #-pg
--- a/src/Makefile.in
+++ b/src/Makefile.in
@ -39,13 +39,14 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 bin_PROGRAMS = aria2c$(EXEEXT)
-#	debug_new.cpp
@ENABLE_MESSAGE_DIGEST_TRUE@am__append_1 = IteratableChunkChecksumValidator.cc IteratableChunkChecksumValidator.h\
@ENABLE_MESSAGE_DIGEST_TRUE@	IteratableChecksumValidator.cc IteratableChecksumValidator.h\
@ENABLE_MESSAGE_DIGEST_TRUE@	CheckIntegrityCommand.cc CheckIntegrityCommand.h\
@ENABLE_MESSAGE_DIGEST_TRUE@	ChecksumCheckIntegrityEntry.cc ChecksumCheckIntegrityEntry.h\
@ENABLE_MESSAGE_DIGEST_TRUE@	messageDigest.cc messageDigest.h\
-@ENABLE_MESSAGE_DIGEST_TRUE@	MessageDigestHelper.cc MessageDigestHelper.h
+@ENABLE_MESSAGE_DIGEST_TRUE@	MessageDigestHelper.cc MessageDigestHelper.h\
+@ENABLE_MESSAGE_DIGEST_TRUE@	Checksum.h\
+@ENABLE_MESSAGE_DIGEST_TRUE@	ChunkChecksum.h

@ENABLE_BITTORRENT_TRUE@am__append_2 = MetaEntry.h\
@ENABLE_BITTORRENT_TRUE@	Data.cc Data.h\
@ -53,7 +54,7 @@ bin_PROGRAMS = aria2c$(EXEEXT)
@ENABLE_BITTORRENT_TRUE@	List.cc List.h\
@ENABLE_BITTORRENT_TRUE@	MetaFileUtil.cc MetaFileUtil.h\
@ENABLE_BITTORRENT_TRUE@	MetaEntryVisitor.h\
-@ENABLE_BITTORRENT_TRUE@	BencodeVisitor.cc\
+@ENABLE_BITTORRENT_TRUE@	BencodeVisitor.cc BencodeVisitor.h\
@ENABLE_BITTORRENT_TRUE@	PeerMessageUtil.cc PeerMessageUtil.h\
@ENABLE_BITTORRENT_TRUE@	PeerAbstractCommand.cc PeerAbstractCommand.h\
@ENABLE_BITTORRENT_TRUE@	PeerInitiateConnectionCommand.cc PeerInitiateConnectionCommand.h\
@ -76,13 +77,14 @@ bin_PROGRAMS = aria2c$(EXEEXT)
@ENABLE_BITTORRENT_TRUE@	AnnounceList.h AnnounceList.cc\
@ENABLE_BITTORRENT_TRUE@	BtContext.h\
@ENABLE_BITTORRENT_TRUE@	DefaultBtContext.cc DefaultBtContext.h\
+@ENABLE_BITTORRENT_TRUE@	PeerStorage.h\
@ENABLE_BITTORRENT_TRUE@	DefaultPeerStorage.cc DefaultPeerStorage.h\
@ENABLE_BITTORRENT_TRUE@	BtAnnounce.h\
@ENABLE_BITTORRENT_TRUE@	DefaultBtAnnounce.cc DefaultBtAnnounce.h\
@ENABLE_BITTORRENT_TRUE@	BtRuntime.h\
@ENABLE_BITTORRENT_TRUE@	BtContextAwareCommand.cc BtContextAwareCommand.h\
@ENABLE_BITTORRENT_TRUE@	BtMessage.h\
-@ENABLE_BITTORRENT_TRUE@	AbstractBtMessage.cc\
+@ENABLE_BITTORRENT_TRUE@	AbstractBtMessage.cc AbstractBtMessage.h\
@ENABLE_BITTORRENT_TRUE@	SimpleBtMessage.cc SimpleBtMessage.h\
@ENABLE_BITTORRENT_TRUE@	BtAllowedFastMessage.cc BtAllowedFastMessage.h\
@ENABLE_BITTORRENT_TRUE@	BtBitfieldMessage.cc BtBitfieldMessage.h\
@ -121,6 +123,7 @@ bin_PROGRAMS = aria2c$(EXEEXT)
@ENABLE_BITTORRENT_TRUE@	DefaultBtRequestFactory.cc DefaultBtRequestFactory.h\
@ENABLE_BITTORRENT_TRUE@	BtEvent.h\
@ENABLE_BITTORRENT_TRUE@	BtEventListener.h\
+@ENABLE_BITTORRENT_TRUE@	AbstractBtEventListener.h\
@ENABLE_BITTORRENT_TRUE@	BtCancelSendingPieceEvent.h\
@ENABLE_BITTORRENT_TRUE@	BtAbortOutstandingRequestEvent.h\
@ENABLE_BITTORRENT_TRUE@	BtChokedEvent.h\
@ -135,93 +138,121 @@ bin_PROGRAMS = aria2c$(EXEEXT)
@ENABLE_BITTORRENT_TRUE@	BtFileAllocationEntry.cc BtFileAllocationEntry.h\
@ENABLE_BITTORRENT_TRUE@	BtPostDownloadHandler.cc BtPostDownloadHandler.h\
@ENABLE_BITTORRENT_TRUE@	BtCheckIntegrityEntry.cc BtCheckIntegrityEntry.h\
-@ENABLE_BITTORRENT_TRUE@	BtExtendedMessage.cc\
-@ENABLE_BITTORRENT_TRUE@	DefaultExtensionMessageFactory.cc\
-@ENABLE_BITTORRENT_TRUE@	HandshakeExtensionMessage.cc\
-@ENABLE_BITTORRENT_TRUE@	UTPexExtensionMessage.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTNode.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTUtil.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTBucket.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTRoutingTable.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTMessageEntry.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTMessageDispatcherImpl.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTMessageReceiver.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTMessageTracker.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTMessageTrackerEntry.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTMessage.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTConnectionImpl.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTAbstractMessage.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTQueryMessage.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTResponseMessage.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTPingMessage.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTPingReplyMessage.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTFindNodeMessage.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTFindNodeReplyMessage.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTGetPeersMessage.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTGetPeersReplyMessage.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTAnnouncePeerMessage.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTAnnouncePeerReplyMessage.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTUnknownMessage.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTMessageFactoryImpl.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTNodeLookupTask.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTNodeLookupEntry.cc\
-@ENABLE_BITTORRENT_TRUE@	BNode.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTMessageCallbackImpl.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTAbstractTask.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTPingTask.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTTaskQueueImpl.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTBucketRefreshTask.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTAbstractNodeLookupTask.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTPeerLookupTask.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTSetup.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTTaskFactoryImpl.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTInteractionCommand.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTPeerAnnounceEntry.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTPeerAnnounceStorage.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTTokenTracker.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTGetPeersCommand.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTTokenUpdateCommand.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTBucketRefreshCommand.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTPeerAnnounceCommand.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTReplaceNodeTask.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTEntryPointNameResolveCommand.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTRoutingTableSerializer.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTRoutingTableDeserializer.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTAutoSaveCommand.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTRegistry.cc\
-@ENABLE_BITTORRENT_TRUE@	InitiatorMSEHandshakeCommand.cc\
-@ENABLE_BITTORRENT_TRUE@	ReceiverMSEHandshakeCommand.cc\
-@ENABLE_BITTORRENT_TRUE@	MSEHandshake.cc
+@ENABLE_BITTORRENT_TRUE@	BtExtendedMessage.cc BtExtendedMessage.h\
+@ENABLE_BITTORRENT_TRUE@	ExtensionMessage.h\
+@ENABLE_BITTORRENT_TRUE@	ExtensionMessageFactory.h\
+@ENABLE_BITTORRENT_TRUE@	DefaultExtensionMessageFactory.cc DefaultExtensionMessageFactory.h\
+@ENABLE_BITTORRENT_TRUE@	HandshakeExtensionMessage.cc HandshakeExtensionMessage.h\
+@ENABLE_BITTORRENT_TRUE@	UTPexExtensionMessage.cc UTPexExtensionMessage.h\
+@ENABLE_BITTORRENT_TRUE@	ExtendedMessagingAware.h\
+@ENABLE_BITTORRENT_TRUE@	DHTNode.cc DHTNode.h\
+@ENABLE_BITTORRENT_TRUE@	DHTUtil.cc DHTUtil.h\
+@ENABLE_BITTORRENT_TRUE@	DHTBucket.cc DHTBucket.h\
+@ENABLE_BITTORRENT_TRUE@	DHTRoutingTable.cc DHTRoutingTable.h\
+@ENABLE_BITTORRENT_TRUE@	DHTMessageEntry.cc DHTMessageEntry.h\
+@ENABLE_BITTORRENT_TRUE@	DHTMessageDispatcher.h\
+@ENABLE_BITTORRENT_TRUE@	DHTMessageDispatcherImpl.cc DHTMessageDispatcherImpl.h\
+@ENABLE_BITTORRENT_TRUE@	DHTMessageReceiver.cc DHTMessageReceiver.h\
+@ENABLE_BITTORRENT_TRUE@	DHTMessageTracker.cc DHTMessageTracker.h\
+@ENABLE_BITTORRENT_TRUE@	DHTMessageTrackerEntry.cc DHTMessageTrackerEntry.h\
+@ENABLE_BITTORRENT_TRUE@	DHTMessage.cc DHTMessage.h\
+@ENABLE_BITTORRENT_TRUE@	DHTConnection.h\
+@ENABLE_BITTORRENT_TRUE@	DHTConnectionImpl.cc DHTConnectionImpl.h\
+@ENABLE_BITTORRENT_TRUE@	DHTAbstractMessage.cc DHTAbstractMessage.h\
+@ENABLE_BITTORRENT_TRUE@	DHTQueryMessage.cc DHTQueryMessage.h\
+@ENABLE_BITTORRENT_TRUE@	DHTResponseMessage.cc DHTResponseMessage.h\
+@ENABLE_BITTORRENT_TRUE@	DHTPingMessage.cc DHTPingMessage.h\
+@ENABLE_BITTORRENT_TRUE@	DHTPingReplyMessage.cc DHTPingReplyMessage.h\
+@ENABLE_BITTORRENT_TRUE@	DHTFindNodeMessage.cc DHTFindNodeMessage.h\
+@ENABLE_BITTORRENT_TRUE@	DHTFindNodeReplyMessage.cc DHTFindNodeReplyMessage.h\
+@ENABLE_BITTORRENT_TRUE@	DHTGetPeersMessage.cc DHTGetPeersMessage.h\
+@ENABLE_BITTORRENT_TRUE@	DHTGetPeersReplyMessage.cc DHTGetPeersReplyMessage.h\
+@ENABLE_BITTORRENT_TRUE@	DHTAnnouncePeerMessage.cc DHTAnnouncePeerMessage.h\
+@ENABLE_BITTORRENT_TRUE@	DHTAnnouncePeerReplyMessage.cc DHTAnnouncePeerReplyMessage.h\
+@ENABLE_BITTORRENT_TRUE@	DHTUnknownMessage.cc DHTUnknownMessage.h\
+@ENABLE_BITTORRENT_TRUE@	DHTMessageFactory.h\
+@ENABLE_BITTORRENT_TRUE@	DHTMessageFactoryImpl.cc DHTMessageFactoryImpl.h\
+@ENABLE_BITTORRENT_TRUE@	DHTNodeLookupTask.cc DHTNodeLookupTask.h\
+@ENABLE_BITTORRENT_TRUE@	DHTNodeLookupEntry.cc DHTNodeLookupEntry.h\
+@ENABLE_BITTORRENT_TRUE@	BNode.cc BNode.h\
+@ENABLE_BITTORRENT_TRUE@	DHTMessageCallback.h\
+@ENABLE_BITTORRENT_TRUE@	DHTMessageCallbackImpl.cc DHTMessageCallbackImpl.h\
+@ENABLE_BITTORRENT_TRUE@	DHTMessageCallbackListener.h\
+@ENABLE_BITTORRENT_TRUE@	DHTAbstractTask.cc DHTAbstractTask.h\
+@ENABLE_BITTORRENT_TRUE@	DHTTask.h\
+@ENABLE_BITTORRENT_TRUE@	DHTPingTask.cc DHTPingTask.h\
+@ENABLE_BITTORRENT_TRUE@	DHTTaskQueue.h\
+@ENABLE_BITTORRENT_TRUE@	DHTTaskQueueImpl.cc DHTTaskQueueImpl.h\
+@ENABLE_BITTORRENT_TRUE@	DHTBucketRefreshTask.cc DHTBucketRefreshTask.h\
+@ENABLE_BITTORRENT_TRUE@	DHTAbstractNodeLookupTask.cc DHTAbstractNodeLookupTask.h\
+@ENABLE_BITTORRENT_TRUE@	DHTPeerLookupTask.cc DHTPeerLookupTask.h\
+@ENABLE_BITTORRENT_TRUE@	DHTSetup.cc DHTSetup.h\
+@ENABLE_BITTORRENT_TRUE@	DHTTaskFactory.h\
+@ENABLE_BITTORRENT_TRUE@	DHTTaskFactoryImpl.cc DHTTaskFactoryImpl.h\
+@ENABLE_BITTORRENT_TRUE@	DHTInteractionCommand.cc DHTInteractionCommand.h\
+@ENABLE_BITTORRENT_TRUE@	DHTPeerAnnounceEntry.cc DHTPeerAnnounceEntry.h\
+@ENABLE_BITTORRENT_TRUE@	DHTPeerAnnounceStorage.cc DHTPeerAnnounceStorage.h\
+@ENABLE_BITTORRENT_TRUE@	DHTTokenTracker.cc DHTTokenTracker.h\
+@ENABLE_BITTORRENT_TRUE@	DHTGetPeersCommand.cc DHTGetPeersCommand.h\
+@ENABLE_BITTORRENT_TRUE@	DHTTokenUpdateCommand.cc DHTTokenUpdateCommand.h\
+@ENABLE_BITTORRENT_TRUE@	DHTBucketRefreshCommand.cc DHTBucketRefreshCommand.h\
+@ENABLE_BITTORRENT_TRUE@	DHTPeerAnnounceCommand.cc DHTPeerAnnounceCommand.h\
+@ENABLE_BITTORRENT_TRUE@	DHTReplaceNodeTask.cc DHTReplaceNodeTask.h\
+@ENABLE_BITTORRENT_TRUE@	DHTEntryPointNameResolveCommand.cc DHTEntryPointNameResolveCommand.h\
+@ENABLE_BITTORRENT_TRUE@	DHTRoutingTableSerializer.cc DHTRoutingTableSerializer.h\
+@ENABLE_BITTORRENT_TRUE@	DHTRoutingTableDeserializer.cc DHTRoutingTableDeserializer.h\
+@ENABLE_BITTORRENT_TRUE@	DHTAutoSaveCommand.cc DHTAutoSaveCommand.h\
+@ENABLE_BITTORRENT_TRUE@	DHTRegistry.cc DHTRegistry.h\
+@ENABLE_BITTORRENT_TRUE@	DHTIDCloser.h\
+@ENABLE_BITTORRENT_TRUE@	DHTConstants.h\
+@ENABLE_BITTORRENT_TRUE@	XORCloser.h\
+@ENABLE_BITTORRENT_TRUE@	PeerAddrEntry.h\
+@ENABLE_BITTORRENT_TRUE@	InitiatorMSEHandshakeCommand.cc InitiatorMSEHandshakeCommand.h\
+@ENABLE_BITTORRENT_TRUE@	ReceiverMSEHandshakeCommand.cc ReceiverMSEHandshakeCommand.h\
+@ENABLE_BITTORRENT_TRUE@	MSEHandshake.cc MSEHandshake.h\
+@ENABLE_BITTORRENT_TRUE@	ARC4Decryptor.h\
+@ENABLE_BITTORRENT_TRUE@	ARC4Encryptor.h\
+@ENABLE_BITTORRENT_TRUE@	DHKeyExchange.h\
+@ENABLE_BITTORRENT_TRUE@	LibgcryptARC4Context.h\
+@ENABLE_BITTORRENT_TRUE@	LibgcryptARC4Decryptor.h\
+@ENABLE_BITTORRENT_TRUE@	LibgcryptARC4Encryptor.h\
+@ENABLE_BITTORRENT_TRUE@	LibgcryptDHKeyExchange.h\
+@ENABLE_BITTORRENT_TRUE@	LibsslARC4Context.h\
+@ENABLE_BITTORRENT_TRUE@	LibsslARC4Decryptor.h\
+@ENABLE_BITTORRENT_TRUE@	LibsslARC4Encryptor.h\
+@ENABLE_BITTORRENT_TRUE@	LibsslDHKeyExchange.h\
+@ENABLE_BITTORRENT_TRUE@	BtConstants.h

@ENABLE_METALINK_TRUE@am__append_3 = Metalinker.cc Metalinker.h\
@ENABLE_METALINK_TRUE@	MetalinkEntry.cc MetalinkEntry.h\
@ENABLE_METALINK_TRUE@	MetalinkResource.cc MetalinkResource.h\
@ENABLE_METALINK_TRUE@	MetalinkProcessor.h\
-@ENABLE_METALINK_TRUE@	MetalinkProcessorFactory.cc\
-@ENABLE_METALINK_TRUE@	MetalinkParserController.cc\
-@ENABLE_METALINK_TRUE@	MetalinkParserStateMachine.cc\
-@ENABLE_METALINK_TRUE@	InitialMetalinkParserState.cc\
-@ENABLE_METALINK_TRUE@	MetalinkMetalinkParserState.cc\
-@ENABLE_METALINK_TRUE@	FilesMetalinkParserState.cc\
-@ENABLE_METALINK_TRUE@	FileMetalinkParserState.cc\
-@ENABLE_METALINK_TRUE@	SizeMetalinkParserState.cc\
-@ENABLE_METALINK_TRUE@	VersionMetalinkParserState.cc\
-@ENABLE_METALINK_TRUE@	LanguageMetalinkParserState.cc\
-@ENABLE_METALINK_TRUE@	OSMetalinkParserState.cc\
-@ENABLE_METALINK_TRUE@	VerificationMetalinkParserState.cc\
-@ENABLE_METALINK_TRUE@	HashMetalinkParserState.cc\
-@ENABLE_METALINK_TRUE@	PiecesMetalinkParserState.cc\
-@ENABLE_METALINK_TRUE@	PieceHashMetalinkParserState.cc\
-@ENABLE_METALINK_TRUE@	ResourcesMetalinkParserState.cc\
-@ENABLE_METALINK_TRUE@	URLMetalinkParserState.cc\
-@ENABLE_METALINK_TRUE@	FinMetalinkParserState.cc\
-@ENABLE_METALINK_TRUE@	SkipTagMetalinkParserState.cc\
+@ENABLE_METALINK_TRUE@	MetalinkProcessorFactory.cc MetalinkProcessorFactory.h\
+@ENABLE_METALINK_TRUE@	MetalinkParserController.cc MetalinkParserController.h\
+@ENABLE_METALINK_TRUE@	MetalinkParserStateMachine.cc MetalinkParserStateMachine.h\
+@ENABLE_METALINK_TRUE@	MetalinkParserState.h\
+@ENABLE_METALINK_TRUE@	InitialMetalinkParserState.cc InitialMetalinkParserState.h\
+@ENABLE_METALINK_TRUE@	MetalinkMetalinkParserState.cc MetalinkMetalinkParserState.h\
+@ENABLE_METALINK_TRUE@	FilesMetalinkParserState.cc FilesMetalinkParserState.h\
+@ENABLE_METALINK_TRUE@	FileMetalinkParserState.cc FileMetalinkParserState.h\
+@ENABLE_METALINK_TRUE@	SizeMetalinkParserState.cc SizeMetalinkParserState.h\
+@ENABLE_METALINK_TRUE@	VersionMetalinkParserState.cc VersionMetalinkParserState.h\
+@ENABLE_METALINK_TRUE@	LanguageMetalinkParserState.cc LanguageMetalinkParserState.h\
+@ENABLE_METALINK_TRUE@	OSMetalinkParserState.cc OSMetalinkParserState.h\
+@ENABLE_METALINK_TRUE@	VerificationMetalinkParserState.cc VerificationMetalinkParserState.h\
+@ENABLE_METALINK_TRUE@	HashMetalinkParserState.cc HashMetalinkParserState.h\
+@ENABLE_METALINK_TRUE@	PiecesMetalinkParserState.cc PiecesMetalinkParserState.h\
+@ENABLE_METALINK_TRUE@	PieceHashMetalinkParserState.cc PieceHashMetalinkParserState.h\
+@ENABLE_METALINK_TRUE@	ResourcesMetalinkParserState.cc ResourcesMetalinkParserState.h\
+@ENABLE_METALINK_TRUE@	URLMetalinkParserState.cc URLMetalinkParserState.h\
+@ENABLE_METALINK_TRUE@	FinMetalinkParserState.cc FinMetalinkParserState.h\
+@ENABLE_METALINK_TRUE@	SkipTagMetalinkParserState.cc SkipTagMetalinkParserState.h\
@ENABLE_METALINK_TRUE@	Metalink2RequestGroup.cc Metalink2RequestGroup.h\
@ENABLE_METALINK_TRUE@	MetalinkPostDownloadHandler.cc MetalinkPostDownloadHandler.h\
@ENABLE_METALINK_TRUE@	MetalinkHelper.cc MetalinkHelper.h

-@ENABLE_LIBXML2_TRUE@am__append_4 = XML2SAXMetalinkProcessor.cc
-@ENABLE_LIBEXPAT_TRUE@am__append_5 = ExpatMetalinkProcessor.cc
+@ENABLE_LIBXML2_TRUE@am__append_4 = XML2SAXMetalinkProcessor.cc XML2SAXMetalinkProcessor.h
+@ENABLE_LIBEXPAT_TRUE@am__append_5 = ExpatMetalinkProcessor.cc ExpatMetalinkProcessor.h
@HAVE_BASENAME_FALSE@am__append_6 = libgen.c libgen.h
@HAVE_GETADDRINFO_FALSE@am__append_7 = getaddrinfo.c getaddrinfo.h
@HAVE_GAI_STRERROR_FALSE@am__append_8 = gai_strerror.c gai_strerror.h
@ -263,8 +294,8 @@ ARFLAGS = cru
 libaria2c_a_AR = $(AR) $(ARFLAGS)
 libaria2c_a_LIBADD =
 am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
-	Command.cc Command.h AbstractCommand.cc AbstractCommand.h \
-	InitiateConnectionCommandFactory.cc \
+	BinaryStream.h Command.cc Command.h AbstractCommand.cc \
+	AbstractCommand.h InitiateConnectionCommandFactory.cc \
 	InitiateConnectionCommandFactory.h DownloadCommand.cc \
 	DownloadCommand.h HttpInitiateConnectionCommand.cc \
 	HttpInitiateConnectionCommand.h HttpRequestCommand.cc \
@ -284,28 +315,32 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
 	GrowSegment.h PiecedSegment.cc PiecedSegment.h SegmentMan.cc \
 	SegmentMan.h Util.cc Util.h Request.cc Request.h common.h \
 	message.h Exception.cc Exception.h FatalException.h \
-	RecoverableException.h DlAbortEx.h DlRetryEx.h Logger.h \
-	SimpleLogger.cc SimpleLogger.h TransferEncoding.h \
-	ChunkedEncoding.cc ChunkedEncoding.h DiskWriter.h \
+	RecoverableException.h DlAbortEx.h DlRetryEx.h \
+	DownloadFailureException.h Logger.h SimpleLogger.cc \
+	SimpleLogger.h TransferEncoding.h ChunkedEncoding.cc \
+	ChunkedEncoding.h DiskWriter.h DiskWriterFactory.h \
 	AbstractDiskWriter.cc AbstractDiskWriter.h \
 	DefaultDiskWriter.cc DefaultDiskWriter.h \
-	DefaultDiskWriterFactory.cc File.cc File.h Option.cc Option.h \
-	Base64.cc CookieBox.cc CookieBox.h LogFactory.cc LogFactory.h \
-	NullLogger.h TimeA2.cc TimeA2.h SharedHandle.h \
-	HandleRegistry.h FeatureConfig.cc FeatureConfig.h \
-	DownloadEngineFactory.cc DownloadEngineFactory.h SpeedCalc.cc \
-	SpeedCalc.h PeerStat.h BitfieldMan.cc BitfieldMan.h \
-	BitfieldManFactory.cc BitfieldManFactory.h Randomizer.h \
-	SimpleRandomizer.cc SimpleRandomizer.h HttpResponse.cc \
-	HttpResponse.h HttpRequest.cc HttpRequest.h Range.h \
+	DefaultDiskWriterFactory.cc DefaultDiskWriterFactory.h File.cc \
+	File.h Option.cc Option.h Base64.cc Base64.h CookieBox.cc \
+	CookieBox.h LogFactory.cc LogFactory.h NullLogger.h TimeA2.cc \
+	TimeA2.h SharedHandle.h HandleRegistry.h FeatureConfig.cc \
+	FeatureConfig.h DownloadEngineFactory.cc \
+	DownloadEngineFactory.h SpeedCalc.cc SpeedCalc.h PeerStat.h \
+	BitfieldMan.cc BitfieldMan.h BitfieldManFactory.cc \
+	BitfieldManFactory.h Randomizer.h SimpleRandomizer.cc \
+	SimpleRandomizer.h HttpResponse.cc HttpResponse.h \
+	HttpRequest.cc HttpRequest.h Range.h \
 	AbstractProxyRequestCommand.cc AbstractProxyRequestCommand.h \
 	AbstractProxyResponseCommand.cc AbstractProxyResponseCommand.h \
 	Netrc.cc Netrc.h AuthConfig.cc AuthConfig.h AuthResolver.h \
-	AbstractAuthResolver.cc DefaultAuthResolver.cc \
-	DefaultAuthResolver.h NetrcAuthResolver.cc NetrcAuthResolver.h \
-	AuthConfigFactory.cc AuthConfigFactory.h OptionParser.cc \
-	OptionParser.h OptionHandlerFactory.cc OptionHandlerFactory.h \
-	NameResolver.cc NameResolver.h RequestGroup.cc RequestGroup.h \
+	AbstractAuthResolver.cc AbstractAuthResolver.h \
+	DefaultAuthResolver.cc DefaultAuthResolver.h \
+	NetrcAuthResolver.cc NetrcAuthResolver.h AuthConfigFactory.cc \
+	AuthConfigFactory.h OptionParser.cc OptionParser.h \
+	OptionHandlerFactory.cc OptionHandlerFactory.h OptionHandler.h \
+	OptionHandlerImpl.h NameMatchOptionHandler.h NameResolver.cc \
+	NameResolver.h RequestGroup.cc RequestGroup.h \
 	RequestGroupAware.cc RequestGroupAware.h RequestGroupMan.cc \
 	RequestGroupMan.h FileAllocationMan.cc FileAllocationMan.h \
 	FileAllocationCommand.cc FileAllocationCommand.h \
@ -336,7 +371,7 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
 	BtProgressInfoFile.h DefaultBtProgressInfoFile.cc \
 	DefaultBtProgressInfoFile.h NullProgressInfoFile.h \
 	FileAllocationIterator.h SingleFileAllocationIterator.cc \
-	SingleFileAllocationIterator.h \
+	SingleFileAllocationIterator.h RequestGroupCriteria.h \
 	ContentTypeRequestGroupCriteria.cc \
 	ContentTypeRequestGroupCriteria.h DownloadHandler.cc \
 	DownloadHandler.h DownloadHandlerConstants.cc \
@ -352,21 +387,30 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
 	AbstractSingleDiskAdaptor.h CopyDiskAdaptor.cc \
 	CopyDiskAdaptor.h DirectDiskAdaptor.cc DirectDiskAdaptor.h \
 	MultiDiskAdaptor.cc MultiDiskAdaptor.h Peer.cc \
-	PeerSessionResource.cc BtRegistry.cc BtRegistry.h \
-	MultiFileAllocationIterator.cc MultiFileAllocationIterator.h \
-	PeerConnection.cc PeerConnection.h ByteArrayDiskWriter.cc \
-	ByteArrayDiskWriter.h ByteArrayDiskWriterFactory.cc \
-	ServerHost.cc HelpItem.cc TaggedItem.cc TagContainer.cc \
-	HelpItemFactory.cc SingleFileDownloadContext.cc \
-	TimedHaltCommand.cc IteratableChunkChecksumValidator.cc \
+	PeerSessionResource.cc PeerSessionResource.h BtRegistry.cc \
+	BtRegistry.h MultiFileAllocationIterator.cc \
+	MultiFileAllocationIterator.h PeerConnection.cc \
+	PeerConnection.h ByteArrayDiskWriter.cc ByteArrayDiskWriter.h \
+	ByteArrayDiskWriterFactory.cc ByteArrayDiskWriterFactory.h \
+	ServerHost.cc ServerHost.h HelpItem.cc HelpItem.h \
+	TaggedItem.cc TaggedItem.h TagContainer.cc TagContainer.h \
+	HelpItemFactory.cc HelpItemFactory.h DownloadContext.h \
+	SingleFileDownloadContext.cc SingleFileDownloadContext.h \
+	TimedHaltCommand.cc TimedHaltCommand.h CUIDCounter.h \
+	DNSCache.h DownloadResult.h Sequence.h IntSequence.h \
+	PostDownloadHandler.h PreDownloadHandler.h SingletonHolder.h \
+	TrueRequestGroupCriteria.h a2algo.h a2functional.h a2io.h \
+	a2netcompat.h a2time.h array_fun.h help_tags.h prefs.h \
+	usage_text.h IteratableChunkChecksumValidator.cc \
 	IteratableChunkChecksumValidator.h \
 	IteratableChecksumValidator.cc IteratableChecksumValidator.h \
 	CheckIntegrityCommand.cc CheckIntegrityCommand.h \
 	ChecksumCheckIntegrityEntry.cc ChecksumCheckIntegrityEntry.h \
 	messageDigest.cc messageDigest.h MessageDigestHelper.cc \
-	MessageDigestHelper.h MetaEntry.h Data.cc Data.h Dictionary.cc \
-	Dictionary.h List.cc List.h MetaFileUtil.cc MetaFileUtil.h \
-	MetaEntryVisitor.h BencodeVisitor.cc PeerMessageUtil.cc \
+	MessageDigestHelper.h Checksum.h ChunkChecksum.h MetaEntry.h \
+	Data.cc Data.h Dictionary.cc Dictionary.h List.cc List.h \
+	MetaFileUtil.cc MetaFileUtil.h MetaEntryVisitor.h \
+	BencodeVisitor.cc BencodeVisitor.h PeerMessageUtil.cc \
 	PeerMessageUtil.h PeerAbstractCommand.cc PeerAbstractCommand.h \
 	PeerInitiateConnectionCommand.cc \
 	PeerInitiateConnectionCommand.h PeerInteractionCommand.cc \
@ -381,16 +425,16 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
 	CompactPeerListProcessor.h DelegatingPeerListProcessor.cc \
 	DelegatingPeerListProcessor.h AnnounceTier.h AnnounceList.h \
 	AnnounceList.cc BtContext.h DefaultBtContext.cc \
-	DefaultBtContext.h DefaultPeerStorage.cc DefaultPeerStorage.h \
-	BtAnnounce.h DefaultBtAnnounce.cc DefaultBtAnnounce.h \
-	BtRuntime.h BtContextAwareCommand.cc BtContextAwareCommand.h \
-	BtMessage.h AbstractBtMessage.cc SimpleBtMessage.cc \
-	SimpleBtMessage.h BtAllowedFastMessage.cc \
-	BtAllowedFastMessage.h BtBitfieldMessage.cc \
-	BtBitfieldMessage.h BtCancelMessage.cc BtCancelMessage.h \
-	BtChokeMessage.cc BtChokeMessage.h BtHaveAllMessage.cc \
-	BtHaveAllMessage.h BtHaveMessage.cc BtHaveMessage.h \
-	BtHaveNoneMessage.cc BtHaveNoneMessage.h \
+	DefaultBtContext.h PeerStorage.h DefaultPeerStorage.cc \
+	DefaultPeerStorage.h BtAnnounce.h DefaultBtAnnounce.cc \
+	DefaultBtAnnounce.h BtRuntime.h BtContextAwareCommand.cc \
+	BtContextAwareCommand.h BtMessage.h AbstractBtMessage.cc \
+	AbstractBtMessage.h SimpleBtMessage.cc SimpleBtMessage.h \
+	BtAllowedFastMessage.cc BtAllowedFastMessage.h \
+	BtBitfieldMessage.cc BtBitfieldMessage.h BtCancelMessage.cc \
+	BtCancelMessage.h BtChokeMessage.cc BtChokeMessage.h \
+	BtHaveAllMessage.cc BtHaveAllMessage.h BtHaveMessage.cc \
+	BtHaveMessage.h BtHaveNoneMessage.cc BtHaveNoneMessage.h \
 	BtInterestedMessage.cc BtInterestedMessage.h \
 	BtKeepAliveMessage.cc BtKeepAliveMessage.h \
 	BtNotInterestedMessage.cc BtNotInterestedMessage.h \
@ -411,55 +455,101 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
 	DefaultBtMessageReceiver.cc DefaultBtMessageReceiver.h \
 	BtRequestFactory.h DefaultBtRequestFactory.cc \
 	DefaultBtRequestFactory.h BtEvent.h BtEventListener.h \
-	BtCancelSendingPieceEvent.h BtAbortOutstandingRequestEvent.h \
-	BtChokedEvent.h BtChokingEvent.h BtInteractive.h \
-	DefaultBtInteractive.cc DefaultBtInteractive.h PeerObject.h \
+	AbstractBtEventListener.h BtCancelSendingPieceEvent.h \
+	BtAbortOutstandingRequestEvent.h BtChokedEvent.h \
+	BtChokingEvent.h BtInteractive.h DefaultBtInteractive.cc \
+	DefaultBtInteractive.h PeerObject.h \
 	ActivePeerConnectionCommand.cc ActivePeerConnectionCommand.h \
 	BtDependency.cc BtDependency.h PeerReceiveHandshakeCommand.cc \
 	PeerReceiveHandshakeCommand.h BtSetup.cc BtSetup.h \
 	BtFileAllocationEntry.cc BtFileAllocationEntry.h \
 	BtPostDownloadHandler.cc BtPostDownloadHandler.h \
 	BtCheckIntegrityEntry.cc BtCheckIntegrityEntry.h \
-	BtExtendedMessage.cc DefaultExtensionMessageFactory.cc \
-	HandshakeExtensionMessage.cc UTPexExtensionMessage.cc \
-	DHTNode.cc DHTUtil.cc DHTBucket.cc DHTRoutingTable.cc \
-	DHTMessageEntry.cc DHTMessageDispatcherImpl.cc \
-	DHTMessageReceiver.cc DHTMessageTracker.cc \
-	DHTMessageTrackerEntry.cc DHTMessage.cc DHTConnectionImpl.cc \
-	DHTAbstractMessage.cc DHTQueryMessage.cc DHTResponseMessage.cc \
-	DHTPingMessage.cc DHTPingReplyMessage.cc DHTFindNodeMessage.cc \
-	DHTFindNodeReplyMessage.cc DHTGetPeersMessage.cc \
-	DHTGetPeersReplyMessage.cc DHTAnnouncePeerMessage.cc \
-	DHTAnnouncePeerReplyMessage.cc DHTUnknownMessage.cc \
-	DHTMessageFactoryImpl.cc DHTNodeLookupTask.cc \
-	DHTNodeLookupEntry.cc BNode.cc DHTMessageCallbackImpl.cc \
-	DHTAbstractTask.cc DHTPingTask.cc DHTTaskQueueImpl.cc \
-	DHTBucketRefreshTask.cc DHTAbstractNodeLookupTask.cc \
-	DHTPeerLookupTask.cc DHTSetup.cc DHTTaskFactoryImpl.cc \
-	DHTInteractionCommand.cc DHTPeerAnnounceEntry.cc \
-	DHTPeerAnnounceStorage.cc DHTTokenTracker.cc \
-	DHTGetPeersCommand.cc DHTTokenUpdateCommand.cc \
-	DHTBucketRefreshCommand.cc DHTPeerAnnounceCommand.cc \
-	DHTReplaceNodeTask.cc DHTEntryPointNameResolveCommand.cc \
-	DHTRoutingTableSerializer.cc DHTRoutingTableDeserializer.cc \
-	DHTAutoSaveCommand.cc DHTRegistry.cc \
-	InitiatorMSEHandshakeCommand.cc ReceiverMSEHandshakeCommand.cc \
-	MSEHandshake.cc Metalinker.cc Metalinker.h MetalinkEntry.cc \
-	MetalinkEntry.h MetalinkResource.cc MetalinkResource.h \
-	MetalinkProcessor.h MetalinkProcessorFactory.cc \
-	MetalinkParserController.cc MetalinkParserStateMachine.cc \
-	InitialMetalinkParserState.cc MetalinkMetalinkParserState.cc \
-	FilesMetalinkParserState.cc FileMetalinkParserState.cc \
-	SizeMetalinkParserState.cc VersionMetalinkParserState.cc \
-	LanguageMetalinkParserState.cc OSMetalinkParserState.cc \
-	VerificationMetalinkParserState.cc HashMetalinkParserState.cc \
-	PiecesMetalinkParserState.cc PieceHashMetalinkParserState.cc \
-	ResourcesMetalinkParserState.cc URLMetalinkParserState.cc \
-	FinMetalinkParserState.cc SkipTagMetalinkParserState.cc \
-	Metalink2RequestGroup.cc Metalink2RequestGroup.h \
-	MetalinkPostDownloadHandler.cc MetalinkPostDownloadHandler.h \
-	MetalinkHelper.cc MetalinkHelper.h XML2SAXMetalinkProcessor.cc \
-	ExpatMetalinkProcessor.cc libgen.c libgen.h getaddrinfo.c \
+	BtExtendedMessage.cc BtExtendedMessage.h ExtensionMessage.h \
+	ExtensionMessageFactory.h DefaultExtensionMessageFactory.cc \
+	DefaultExtensionMessageFactory.h HandshakeExtensionMessage.cc \
+	HandshakeExtensionMessage.h UTPexExtensionMessage.cc \
+	UTPexExtensionMessage.h ExtendedMessagingAware.h DHTNode.cc \
+	DHTNode.h DHTUtil.cc DHTUtil.h DHTBucket.cc DHTBucket.h \
+	DHTRoutingTable.cc DHTRoutingTable.h DHTMessageEntry.cc \
+	DHTMessageEntry.h DHTMessageDispatcher.h \
+	DHTMessageDispatcherImpl.cc DHTMessageDispatcherImpl.h \
+	DHTMessageReceiver.cc DHTMessageReceiver.h \
+	DHTMessageTracker.cc DHTMessageTracker.h \
+	DHTMessageTrackerEntry.cc DHTMessageTrackerEntry.h \
+	DHTMessage.cc DHTMessage.h DHTConnection.h \
+	DHTConnectionImpl.cc DHTConnectionImpl.h DHTAbstractMessage.cc \
+	DHTAbstractMessage.h DHTQueryMessage.cc DHTQueryMessage.h \
+	DHTResponseMessage.cc DHTResponseMessage.h DHTPingMessage.cc \
+	DHTPingMessage.h DHTPingReplyMessage.cc DHTPingReplyMessage.h \
+	DHTFindNodeMessage.cc DHTFindNodeMessage.h \
+	DHTFindNodeReplyMessage.cc DHTFindNodeReplyMessage.h \
+	DHTGetPeersMessage.cc DHTGetPeersMessage.h \
+	DHTGetPeersReplyMessage.cc DHTGetPeersReplyMessage.h \
+	DHTAnnouncePeerMessage.cc DHTAnnouncePeerMessage.h \
+	DHTAnnouncePeerReplyMessage.cc DHTAnnouncePeerReplyMessage.h \
+	DHTUnknownMessage.cc DHTUnknownMessage.h DHTMessageFactory.h \
+	DHTMessageFactoryImpl.cc DHTMessageFactoryImpl.h \
+	DHTNodeLookupTask.cc DHTNodeLookupTask.h DHTNodeLookupEntry.cc \
+	DHTNodeLookupEntry.h BNode.cc BNode.h DHTMessageCallback.h \
+	DHTMessageCallbackImpl.cc DHTMessageCallbackImpl.h \
+	DHTMessageCallbackListener.h DHTAbstractTask.cc \
+	DHTAbstractTask.h DHTTask.h DHTPingTask.cc DHTPingTask.h \
+	DHTTaskQueue.h DHTTaskQueueImpl.cc DHTTaskQueueImpl.h \
+	DHTBucketRefreshTask.cc DHTBucketRefreshTask.h \
+	DHTAbstractNodeLookupTask.cc DHTAbstractNodeLookupTask.h \
+	DHTPeerLookupTask.cc DHTPeerLookupTask.h DHTSetup.cc \
+	DHTSetup.h DHTTaskFactory.h DHTTaskFactoryImpl.cc \
+	DHTTaskFactoryImpl.h DHTInteractionCommand.cc \
+	DHTInteractionCommand.h DHTPeerAnnounceEntry.cc \
+	DHTPeerAnnounceEntry.h DHTPeerAnnounceStorage.cc \
+	DHTPeerAnnounceStorage.h DHTTokenTracker.cc DHTTokenTracker.h \
+	DHTGetPeersCommand.cc DHTGetPeersCommand.h \
+	DHTTokenUpdateCommand.cc DHTTokenUpdateCommand.h \
+	DHTBucketRefreshCommand.cc DHTBucketRefreshCommand.h \
+	DHTPeerAnnounceCommand.cc DHTPeerAnnounceCommand.h \
+	DHTReplaceNodeTask.cc DHTReplaceNodeTask.h \
+	DHTEntryPointNameResolveCommand.cc \
+	DHTEntryPointNameResolveCommand.h DHTRoutingTableSerializer.cc \
+	DHTRoutingTableSerializer.h DHTRoutingTableDeserializer.cc \
+	DHTRoutingTableDeserializer.h DHTAutoSaveCommand.cc \
+	DHTAutoSaveCommand.h DHTRegistry.cc DHTRegistry.h \
+	DHTIDCloser.h DHTConstants.h XORCloser.h PeerAddrEntry.h \
+	InitiatorMSEHandshakeCommand.cc InitiatorMSEHandshakeCommand.h \
+	ReceiverMSEHandshakeCommand.cc ReceiverMSEHandshakeCommand.h \
+	MSEHandshake.cc MSEHandshake.h ARC4Decryptor.h ARC4Encryptor.h \
+	DHKeyExchange.h LibgcryptARC4Context.h \
+	LibgcryptARC4Decryptor.h LibgcryptARC4Encryptor.h \
+	LibgcryptDHKeyExchange.h LibsslARC4Context.h \
+	LibsslARC4Decryptor.h LibsslARC4Encryptor.h \
+	LibsslDHKeyExchange.h BtConstants.h Metalinker.cc Metalinker.h \
+	MetalinkEntry.cc MetalinkEntry.h MetalinkResource.cc \
+	MetalinkResource.h MetalinkProcessor.h \
+	MetalinkProcessorFactory.cc MetalinkProcessorFactory.h \
+	MetalinkParserController.cc MetalinkParserController.h \
+	MetalinkParserStateMachine.cc MetalinkParserStateMachine.h \
+	MetalinkParserState.h InitialMetalinkParserState.cc \
+	InitialMetalinkParserState.h MetalinkMetalinkParserState.cc \
+	MetalinkMetalinkParserState.h FilesMetalinkParserState.cc \
+	FilesMetalinkParserState.h FileMetalinkParserState.cc \
+	FileMetalinkParserState.h SizeMetalinkParserState.cc \
+	SizeMetalinkParserState.h VersionMetalinkParserState.cc \
+	VersionMetalinkParserState.h LanguageMetalinkParserState.cc \
+	LanguageMetalinkParserState.h OSMetalinkParserState.cc \
+	OSMetalinkParserState.h VerificationMetalinkParserState.cc \
+	VerificationMetalinkParserState.h HashMetalinkParserState.cc \
+	HashMetalinkParserState.h PiecesMetalinkParserState.cc \
+	PiecesMetalinkParserState.h PieceHashMetalinkParserState.cc \
+	PieceHashMetalinkParserState.h ResourcesMetalinkParserState.cc \
+	ResourcesMetalinkParserState.h URLMetalinkParserState.cc \
+	URLMetalinkParserState.h FinMetalinkParserState.cc \
+	FinMetalinkParserState.h SkipTagMetalinkParserState.cc \
+	SkipTagMetalinkParserState.h Metalink2RequestGroup.cc \
+	Metalink2RequestGroup.h MetalinkPostDownloadHandler.cc \
+	MetalinkPostDownloadHandler.h MetalinkHelper.cc \
+	MetalinkHelper.h XML2SAXMetalinkProcessor.cc \
+	XML2SAXMetalinkProcessor.h ExpatMetalinkProcessor.cc \
+	ExpatMetalinkProcessor.h libgen.c libgen.h getaddrinfo.c \
 	getaddrinfo.h gai_strerror.c gai_strerror.h gettimeofday.c \
 	gettimeofday.h inet_aton.c inet_aton.h localtime_r.c \
 	localtime_r.h strptime.c strptime.h timegm.c timegm.h
@ -912,8 +1002,8 @@ aria2c_SOURCES = main.cc\
 	option_processing.cc\
 	version_usage.cc

-SRCS = Socket.h SocketCore.cc SocketCore.h Command.cc Command.h \
-	AbstractCommand.cc AbstractCommand.h \
+SRCS = Socket.h SocketCore.cc SocketCore.h BinaryStream.h Command.cc \
+	Command.h AbstractCommand.cc AbstractCommand.h \
 	InitiateConnectionCommandFactory.cc \
 	InitiateConnectionCommandFactory.h DownloadCommand.cc \
 	DownloadCommand.h HttpInitiateConnectionCommand.cc \
@ -934,28 +1024,32 @@ SRCS = Socket.h SocketCore.cc SocketCore.h Command.cc Command.h \
 	GrowSegment.h PiecedSegment.cc PiecedSegment.h SegmentMan.cc \
 	SegmentMan.h Util.cc Util.h Request.cc Request.h common.h \
 	message.h Exception.cc Exception.h FatalException.h \
-	RecoverableException.h DlAbortEx.h DlRetryEx.h Logger.h \
-	SimpleLogger.cc SimpleLogger.h TransferEncoding.h \
-	ChunkedEncoding.cc ChunkedEncoding.h DiskWriter.h \
+	RecoverableException.h DlAbortEx.h DlRetryEx.h \
+	DownloadFailureException.h Logger.h SimpleLogger.cc \
+	SimpleLogger.h TransferEncoding.h ChunkedEncoding.cc \
+	ChunkedEncoding.h DiskWriter.h DiskWriterFactory.h \
 	AbstractDiskWriter.cc AbstractDiskWriter.h \
 	DefaultDiskWriter.cc DefaultDiskWriter.h \
-	DefaultDiskWriterFactory.cc File.cc File.h Option.cc Option.h \
-	Base64.cc CookieBox.cc CookieBox.h LogFactory.cc LogFactory.h \
-	NullLogger.h TimeA2.cc TimeA2.h SharedHandle.h \
-	HandleRegistry.h FeatureConfig.cc FeatureConfig.h \
-	DownloadEngineFactory.cc DownloadEngineFactory.h SpeedCalc.cc \
-	SpeedCalc.h PeerStat.h BitfieldMan.cc BitfieldMan.h \
-	BitfieldManFactory.cc BitfieldManFactory.h Randomizer.h \
-	SimpleRandomizer.cc SimpleRandomizer.h HttpResponse.cc \
-	HttpResponse.h HttpRequest.cc HttpRequest.h Range.h \
+	DefaultDiskWriterFactory.cc DefaultDiskWriterFactory.h File.cc \
+	File.h Option.cc Option.h Base64.cc Base64.h CookieBox.cc \
+	CookieBox.h LogFactory.cc LogFactory.h NullLogger.h TimeA2.cc \
+	TimeA2.h SharedHandle.h HandleRegistry.h FeatureConfig.cc \
+	FeatureConfig.h DownloadEngineFactory.cc \
+	DownloadEngineFactory.h SpeedCalc.cc SpeedCalc.h PeerStat.h \
+	BitfieldMan.cc BitfieldMan.h BitfieldManFactory.cc \
+	BitfieldManFactory.h Randomizer.h SimpleRandomizer.cc \
+	SimpleRandomizer.h HttpResponse.cc HttpResponse.h \
+	HttpRequest.cc HttpRequest.h Range.h \
 	AbstractProxyRequestCommand.cc AbstractProxyRequestCommand.h \
 	AbstractProxyResponseCommand.cc AbstractProxyResponseCommand.h \
 	Netrc.cc Netrc.h AuthConfig.cc AuthConfig.h AuthResolver.h \
-	AbstractAuthResolver.cc DefaultAuthResolver.cc \
-	DefaultAuthResolver.h NetrcAuthResolver.cc NetrcAuthResolver.h \
-	AuthConfigFactory.cc AuthConfigFactory.h OptionParser.cc \
-	OptionParser.h OptionHandlerFactory.cc OptionHandlerFactory.h \
-	NameResolver.cc NameResolver.h RequestGroup.cc RequestGroup.h \
+	AbstractAuthResolver.cc AbstractAuthResolver.h \
+	DefaultAuthResolver.cc DefaultAuthResolver.h \
+	NetrcAuthResolver.cc NetrcAuthResolver.h AuthConfigFactory.cc \
+	AuthConfigFactory.h OptionParser.cc OptionParser.h \
+	OptionHandlerFactory.cc OptionHandlerFactory.h OptionHandler.h \
+	OptionHandlerImpl.h NameMatchOptionHandler.h NameResolver.cc \
+	NameResolver.h RequestGroup.cc RequestGroup.h \
 	RequestGroupAware.cc RequestGroupAware.h RequestGroupMan.cc \
 	RequestGroupMan.h FileAllocationMan.cc FileAllocationMan.h \
 	FileAllocationCommand.cc FileAllocationCommand.h \
@ -986,7 +1080,7 @@ SRCS = Socket.h SocketCore.cc SocketCore.h Command.cc Command.h \
 	BtProgressInfoFile.h DefaultBtProgressInfoFile.cc \
 	DefaultBtProgressInfoFile.h NullProgressInfoFile.h \
 	FileAllocationIterator.h SingleFileAllocationIterator.cc \
-	SingleFileAllocationIterator.h \
+	SingleFileAllocationIterator.h RequestGroupCriteria.h \
 	ContentTypeRequestGroupCriteria.cc \
 	ContentTypeRequestGroupCriteria.h DownloadHandler.cc \
 	DownloadHandler.h DownloadHandlerConstants.cc \
@ -1002,17 +1096,25 @@ SRCS = Socket.h SocketCore.cc SocketCore.h Command.cc Command.h \
 	AbstractSingleDiskAdaptor.h CopyDiskAdaptor.cc \
 	CopyDiskAdaptor.h DirectDiskAdaptor.cc DirectDiskAdaptor.h \
 	MultiDiskAdaptor.cc MultiDiskAdaptor.h Peer.cc \
-	PeerSessionResource.cc BtRegistry.cc BtRegistry.h \
-	MultiFileAllocationIterator.cc MultiFileAllocationIterator.h \
-	PeerConnection.cc PeerConnection.h ByteArrayDiskWriter.cc \
-	ByteArrayDiskWriter.h ByteArrayDiskWriterFactory.cc \
-	ServerHost.cc HelpItem.cc TaggedItem.cc TagContainer.cc \
-	HelpItemFactory.cc SingleFileDownloadContext.cc \
-	TimedHaltCommand.cc $(am__append_1) $(am__append_2) \
-	$(am__append_3) $(am__append_4) $(am__append_5) \
-	$(am__append_6) $(am__append_7) $(am__append_8) \
-	$(am__append_9) $(am__append_10) $(am__append_11) \
-	$(am__append_12) $(am__append_13)
+	PeerSessionResource.cc PeerSessionResource.h BtRegistry.cc \
+	BtRegistry.h MultiFileAllocationIterator.cc \
+	MultiFileAllocationIterator.h PeerConnection.cc \
+	PeerConnection.h ByteArrayDiskWriter.cc ByteArrayDiskWriter.h \
+	ByteArrayDiskWriterFactory.cc ByteArrayDiskWriterFactory.h \
+	ServerHost.cc ServerHost.h HelpItem.cc HelpItem.h \
+	TaggedItem.cc TaggedItem.h TagContainer.cc TagContainer.h \
+	HelpItemFactory.cc HelpItemFactory.h DownloadContext.h \
+	SingleFileDownloadContext.cc SingleFileDownloadContext.h \
+	TimedHaltCommand.cc TimedHaltCommand.h CUIDCounter.h \
+	DNSCache.h DownloadResult.h Sequence.h IntSequence.h \
+	PostDownloadHandler.h PreDownloadHandler.h SingletonHolder.h \
+	TrueRequestGroupCriteria.h a2algo.h a2functional.h a2io.h \
+	a2netcompat.h a2time.h array_fun.h help_tags.h prefs.h \
+	usage_text.h $(am__append_1) $(am__append_2) $(am__append_3) \
+	$(am__append_4) $(am__append_5) $(am__append_6) \
+	$(am__append_7) $(am__append_8) $(am__append_9) \
+	$(am__append_10) $(am__append_11) $(am__append_12) \
+	$(am__append_13)
 noinst_LIBRARIES = libaria2c.a
 libaria2c_a_SOURCES = $(SRCS)
 aria2c_LDADD = libaria2c.a @LIBINTL@ @ALLOCA@ @LIBGNUTLS_LIBS@\
@ -1024,7 +1126,7 @@ AM_CPPFLAGS = -Wall\
 	-I../lib -I../intl -I$(top_srcdir)/intl\
 	@LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\
 	@LIBARES_CPPFLAGS@ @LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\
-	-D_FILE_OFFSET_BITS=64 -DLOCALEDIR=\"$(localedir)\" @DEFS@ #-pg
+	-DLOCALEDIR=\"$(localedir)\" @DEFS@ #-pg

 all: all-am

--- a/src/NullFileAllocationMonitor.h
+++ b/src/NullFileAllocationMonitor.h
@ -1,58 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#ifndef _D_NULL_FILE_ALLOCATION_MONITOR_H_
-#define _D_NULL_FILE_ALLOCATION_MONITOR_H_
-
-#include "FileAllocationMonitor.h"
-
-class NullFileAllocationMonitor : public FileAllocationMonitor {
-public:
-  NullFileAllocationMonitor() {}
-  
-  virtual ~NullFileAllocationMonitor() {}
-
-  virtual void setFilename(const string& filename) {}
-
-  virtual void setMinValue(const int64_t& min) {}
-  
-  virtual void setMaxValue(const int64_t& max) {}
-
-  virtual void setCurrentValue(const int64_t& current) {}
-
-  virtual void showProgress() {}
-
-};
-
-#endif // _D_NULL_FILE_ALLOCATION_MONITOR_H_
--- a/src/Peer.h
+++ b/src/Peer.h
@ -36,7 +36,7 @@
 #define _D_PEER_H_

 #include "common.h"
-#include "PeerDecl.h"
+#include "SharedHandle.h"
 #include "TimeA2.h"
 #include "BtConstants.h"
 #include "PeerStat.h"
@ -233,6 +233,9 @@ public:
  void setExtension(const std::string& name, uint8_t id);
 };

+typedef SharedHandle<Peer> PeerHandle;
+typedef std::deque<PeerHandle> Peers;
+
 } // namespace aria2

 #endif // _D_PEER_H_
--- a/src/PeerDecl.h
+++ b/src/PeerDecl.h
@ -1,49 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#ifndef _D_PEER_DECL_H_
-#define _D_PEER_DECL_H_
-
-#include "SharedHandle.h"
-#include <deque>
-
-namespace aria2 {
-
-class Peer;
-typedef SharedHandle<Peer> PeerHandle;
-typedef std::deque<PeerHandle> Peers;
-
-} // namespace aria2
-
-#endif // _D_PEER_DECL_H_
--- a/src/PostDownloadHandler.cc
+++ b/src/PostDownloadHandler.cc
@ -1,40 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#include "PostDownloadHandler.h"
-#include "RequestGroupCriteria.h"
-
-PostDownloadHandler::PostDownloadHandler(const RequestGroupCriteriaHandle& criteria):DownloadHandler(criteria) {}
-
-PostDownloadHandler::~PostDownloadHandler() {}
--- a/src/PreAllocationDiskWriter.cc
+++ b/src/PreAllocationDiskWriter.cc
@ -1,70 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#include "PreAllocationDiskWriter.h"
-#include "DlAbortEx.h"
-#include "message.h"
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-
-PreAllocationDiskWriter::PreAllocationDiskWriter(uint64_t totalLength)
-  :AbstractDiskWriter(totalLength) {}
-
-PreAllocationDiskWriter::~PreAllocationDiskWriter() {}
-
-void PreAllocationDiskWriter::initAndOpenFile(const string& filename)
-{
-  createFile(filename);
-  int bufSize = 4096;
-  char buf[4096];
-
-  memset(buf, 0, bufSize);
-  long long int x = totalLength/bufSize;
-  int r = totalLength%bufSize;
-  for(long long int i = 0; i < x; i++) {
-    if(write(fd, buf, bufSize) < 0) {
-      throw new DlAbortEx(EX_FILE_WRITE, filename.c_str(), strerror(errno));
-    }
-  }
-  if(r > 0) {
-    seek(totalLength-r);
-    if(write(fd, buf, r) < 0) {
-	throw new DlAbortEx(EX_FILE_WRITE, filename.c_str(), strerror(errno));
-    }
-  }
-}
--- a/src/PreAllocationDiskWriter.h
+++ b/src/PreAllocationDiskWriter.h
@ -1,50 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#ifndef _D_PRE_ALLOCATION_DISK_WRITER_H_
-#define _D_PRE_ALLOCATION_DISK_WRITER_H_
-
-#include "AbstractDiskWriter.h"
-
-class PreAllocationDiskWriter:public AbstractDiskWriter {
-public:
-  PreAllocationDiskWriter(uint64_t totalLength);
-
-  virtual ~PreAllocationDiskWriter();
-
-  virtual void initAndOpenFile(const string& filename);
-};
-
-#endif // _D_PRE_ALLOCATION_DISK_WRITER_H_
-
--- a/src/PreDownloadHandler.cc
+++ b/src/PreDownloadHandler.cc
@ -1,40 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#include "PreDownloadHandler.h"
-#include "RequestGroupCriteria.h"
-
-PreDownloadHandler::PreDownloadHandler(const RequestGroupCriteriaHandle& criteria):DownloadHandler(criteria) {}
-
-PreDownloadHandler::~PreDownloadHandler() {}
--- a/src/Segment.cc
+++ b/src/Segment.cc
@ -1,48 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-
-#include "Segment.h"
-
-ostream& operator<<(ostream& o, const Segment& segment) {
-  o << "index = " << segment._piece->getIndex() << ", ";
-  o << "length = " << segment._piece->getLength() << ", ";
-  o << "segmentLength = " << segment._pieceLength << ", ";
-  if(segment.complete()) {
-    o << "writtenLength = " << segment._piece->getLength();
-  } else {
-    o << "writtenLength = " << (segment._piece->getMissingUnusedBlockIndex()-1)*segment._piece->getBlockLength();
-  }
-  return o;
-}
--- a/src/SocketIOException.h
+++ b/src/SocketIOException.h
@ -1,46 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#ifndef _D_SOCKET_IO_EXCEPTION_H_
-#define _D_SOCKET_IO_EXCEPTION_H_
-
-#include "DlRetryEx.h"
-
-class SocketIOException:public DlRetryEx {
-public:
-  SocketIOException():DlRetryEx() {};
-  SocketIOException(string msg):DlRetryEx(msg) {};
-};
-
-#endif // _D_SOCKET_IO_EXCEPTION_H_
--- a/src/SplitFirstSegmentSplitter.cc
+++ b/src/SplitFirstSegmentSplitter.cc
@ -1,50 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#include "SplitFirstSegmentSplitter.h"
-
-bool SplitFirstSegmentSplitter::splitSegment(Segment& seg, int cuid, Segments& segments) {
-  for(Segments::iterator itr = segments.begin(); itr != segments.end(); itr++) {
-    Segment& s = *itr;
-    if(s.finish) {
-      continue;
-    }
-    if(s.ep-(s.sp+s.ds) > minSegmentSize) {
-      split(seg, cuid,  s);
-      segments.push_back(seg);
-      return true;
-    }
-  }
-  return false;
-}
--- a/src/SplitFirstSegmentSplitter.h
+++ b/src/SplitFirstSegmentSplitter.h
@ -1,47 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#ifndef _D_SPLIT_FIRST_SEGMENT_SPLITTER_H_
-#define _D_SPLIT_FIRST_SEGMENT_SPLITTER_H_
-
-#include "SegmentSplitter.h"
-
-class SplitFirstSegmentSplitter : public SegmentSplitter {
-public:
-  SplitFirstSegmentSplitter() {}
-  ~SplitFirstSegmentSplitter() {}
-  bool splitSegment(Segment& newSegment, int cuid, Segments& segments);
-};
-
-#endif // _D_SPLIT_FIRST_SEGMENT_SPLITTER_H_
--- a/src/SplitSlowestSegmentSplitter.cc
+++ b/src/SplitSlowestSegmentSplitter.cc
@ -1,63 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#include "SplitSlowestSegmentSplitter.h"
-
-bool SplitSlowestSegmentSplitter::splitSegment(Segment& seg, int cuid, Segments& segments) {
-  Segments::iterator slowest = segments.end();;
-  for(Segments::iterator itr = segments.begin(); itr != segments.end(); itr++) {
-    Segment& s = *itr;
-    if(s.finish) {
-      continue;
-    }
-    if(s.ep-(s.sp+s.ds) <= minSegmentSize) {
-      continue;
-    }
-    if(slowest == segments.end()) {
-      slowest = itr;
-    } else {
-      Segment sl = *slowest;
-      if((sl.ep-(sl.sp+sl.ds))/(sl.speed+1) < (s.ep-(s.sp+s.ds))/(s.speed+1)) {
-	slowest = itr;
-      }
-    }
-  }
-  if(slowest == segments.end()) {
-    return false;
-  } else {
-    split(seg, cuid, *slowest);
-    segments.push_back(seg);
-    return true;
-  }
-}
--- a/src/SplitSlowestSegmentSplitter.h
+++ b/src/SplitSlowestSegmentSplitter.h
@ -1,48 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#ifndef _D_SPLIT_SLOWEST_SEGMENT_SPLITTER_H_
-#define _D_SPLIT_SLOWEST_SEGMENT_SPLITTER_H_
-
-#include "SegmentSplitter.h"
-
-class SplitSlowestSegmentSplitter : public SegmentSplitter {
-public:
-  SplitSlowestSegmentSplitter() {}
-  ~SplitSlowestSegmentSplitter() {}
-
-  bool splitSegment(Segment& segment, int cuid, Segments& segments);
-};
-
-#endif // _D_SPLIT_SLOWEST_SEGMENT_SPLITTER_H_
--- a/src/TimeoutException.h
+++ b/src/TimeoutException.h
@ -1,49 +0,0 @@
-/* <!-- copyright */
-/*
- * aria2 - The high speed download utility
- *
- * Copyright (C) 2006 Tatsuhiro Tsujikawa
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-/* copyright --> */
-#ifndef _D_TIMEOUT_EXCEPTION_H_
-#define _D_TIMEOUT_EXCEPTION_H_
-
-class TimeoutException {
-public:
-  int32_t err;
-  string msg;
-public:
-  TimeoutException():err(0), msg("") {};
-  TimeoutException(int32_t err):err(err), msg("") {};
-  TimeoutException(string msg):err(0), msg(msg) {};
-  TimeoutException(int32_t err, string msg):err(err), msg(msg) {}
-};
-
-#endif // _D_TIMEOUT_EXCEPTION_H_
--- a/1
+++ b/1
@ -1 +0,0 @@
-timestamp
--- a/stamp-h.in
+++ b/stamp-h.in
@ -1 +0,0 @@
-timestamp
--- a/test/ChunkChecksumValidatorTest.cc
+++ b/test/ChunkChecksumValidatorTest.cc
@ -1,171 +0,0 @@
-#include "ChunkChecksumValidator.h"
-#include "DefaultDiskWriter.h"
-#include <cppunit/extensions/HelperMacros.h>
-
-using namespace std;
-
-class ChunkChecksumValidatorTest:public CppUnit::TestFixture {
-
-  CPPUNIT_TEST_SUITE(ChunkChecksumValidatorTest);
-  CPPUNIT_TEST(testValidate);
-  CPPUNIT_TEST(testValidate2);
-  CPPUNIT_TEST(testValidate3);
-  CPPUNIT_TEST(testValidate4);
-  CPPUNIT_TEST_SUITE_END();
-private:
-
-  static const char* csArray[];// = { "29b0e7878271645fffb7eec7db4a7473a1c00bc1",
-  //  "4df75a661cb7eb2733d9cdaa7f772eae3a4e2976",
-  //			   "0a4ea2f7dd7c52ddf2099a444ab2184b4d341bdb" };
-
-public:
-  void setUp() {
-  }
-
-
-  ChunkChecksumValidatorHandle
-  createChunkChecksumValidator(const string& filename, BitfieldMan* bitfield, const ChunkChecksumHandle& chunkChecksum)
-  {
-    IteratableChunkChecksumValidatorHandle iv = new IteratableChunkChecksumValidator();
-    DefaultDiskWriterHandle dw = new DefaultDiskWriter();
-    dw->openExistingFile(filename);
-    iv->setDiskWriter(dw);
-    iv->setBitfield(bitfield);
-    iv->setChunkChecksum(chunkChecksum);
-
-    return new ChunkChecksumValidator(iv);
-  } 
-
-  void testValidate();
-  void testValidate2();
-  void testValidate3();
-  void testValidate4();
-};
-
-
-CPPUNIT_TEST_SUITE_REGISTRATION( ChunkChecksumValidatorTest );
-
-const char* ChunkChecksumValidatorTest::csArray[] =
-  { "29b0e7878271645fffb7eec7db4a7473a1c00bc1",
-    "4df75a661cb7eb2733d9cdaa7f772eae3a4e2976",
-    "0a4ea2f7dd7c52ddf2099a444ab2184b4d341bdb" };
-
-void ChunkChecksumValidatorTest::testValidate() {
-  BitfieldMan bitfieldMan(100, 250);
-  bitfieldMan.setAllBit();
-  Strings checksums(&csArray[0], &csArray[3]);
-
-  ChunkChecksumValidatorHandle validator =
-    createChunkChecksumValidator("chunkChecksumTestFile250.txt",
-				 &bitfieldMan, new ChunkChecksum("sha1",
-								 checksums,
-								 100));
-  validator->validate();
-
-  CPPUNIT_ASSERT(bitfieldMan.isAllBitSet());
-
-  checksums[1] = "ffffffffffffffffffffffffffffffffffffffff";
-
-  validator = 
-    createChunkChecksumValidator("chunkChecksumTestFile250.txt",
-				 &bitfieldMan, new ChunkChecksum("sha1",
-								 checksums,
-								 100));
-
-  validator->validate();
-
-  CPPUNIT_ASSERT(bitfieldMan.isBitSet(0));
-  CPPUNIT_ASSERT(!bitfieldMan.isBitSet(1));
-  CPPUNIT_ASSERT(bitfieldMan.isBitSet(2));
-}
-
-void ChunkChecksumValidatorTest::testValidate2() {
-  BitfieldMan bitfieldMan(50, 250);
-  bitfieldMan.setAllBit();
-  Strings checksums(&csArray[0], &csArray[3]);
-
-  ChunkChecksumValidatorHandle validator =
-    createChunkChecksumValidator("chunkChecksumTestFile250.txt",
-				 &bitfieldMan, new ChunkChecksum("sha1",
-								 checksums,
-								 100));
-  validator->validate();
-
-  CPPUNIT_ASSERT(bitfieldMan.isAllBitSet());
-
-  checksums[1] = "ffffffffffffffffffffffffffffffffffffffff";
-  validator = 
-    createChunkChecksumValidator("chunkChecksumTestFile250.txt",
-				 &bitfieldMan, new ChunkChecksum("sha1",
-								 checksums,
-								 100));
-  validator->validate();
-
-  CPPUNIT_ASSERT(bitfieldMan.isBitSet(0));
-  CPPUNIT_ASSERT(bitfieldMan.isBitSet(1));
-  CPPUNIT_ASSERT(!bitfieldMan.isBitSet(2));
-  CPPUNIT_ASSERT(!bitfieldMan.isBitSet(3));
-  CPPUNIT_ASSERT(bitfieldMan.isBitSet(4));
-}
-
-void ChunkChecksumValidatorTest::testValidate3() {
-  BitfieldMan bitfieldMan(50, 250);
-  bitfieldMan.setAllBit();
-  Strings checksums;
-  checksums.push_back("898a81b8e0181280ae2ee1b81e269196d91e869a");
-
-  ChunkChecksumValidatorHandle validator =
-    createChunkChecksumValidator("chunkChecksumTestFile250.txt",
-				 &bitfieldMan, new ChunkChecksum("sha1",
-								 checksums,
-								 250));
-  validator->validate();
-
-  CPPUNIT_ASSERT(bitfieldMan.isAllBitSet());
-
-  checksums[0] = "ffffffffffffffffffffffffffffffffffffffff";
-
-  validator =
-    createChunkChecksumValidator("chunkChecksumTestFile250.txt",
-				 &bitfieldMan, new ChunkChecksum("sha1",
-								 checksums,
-								 250));
-  validator->validate();
-
-  CPPUNIT_ASSERT(!bitfieldMan.isBitSet(0));
-  CPPUNIT_ASSERT(!bitfieldMan.isBitSet(1));
-  CPPUNIT_ASSERT(!bitfieldMan.isBitSet(2));
-  CPPUNIT_ASSERT(!bitfieldMan.isBitSet(3));
-  CPPUNIT_ASSERT(!bitfieldMan.isBitSet(4));
-}
-
-void ChunkChecksumValidatorTest::testValidate4() {
-  BitfieldMan bitfieldMan(70, 250);
-  bitfieldMan.setAllBit();
-  Strings checksums(&csArray[0], &csArray[3]);
-
-  ChunkChecksumValidatorHandle validator =
-    createChunkChecksumValidator("chunkChecksumTestFile250.txt",
-				 &bitfieldMan, new ChunkChecksum("sha1",
-								 checksums,
-								 100));
-  validator->validate();
-
-  CPPUNIT_ASSERT(bitfieldMan.isAllBitSet());
-
-  checksums[1] = "ffffffffffffffffffffffffffffffffffffffff";
-
-  validator =
-    createChunkChecksumValidator("chunkChecksumTestFile250.txt",
-				 &bitfieldMan, new ChunkChecksum("sha1",
-								 checksums,
-								 100));
-
-  validator->validate();
-
-  CPPUNIT_ASSERT(bitfieldMan.isBitSet(0));
-  CPPUNIT_ASSERT(!bitfieldMan.isBitSet(1));
-  CPPUNIT_ASSERT(!bitfieldMan.isBitSet(2));
-  CPPUNIT_ASSERT(bitfieldMan.isBitSet(3));
-}
-
--- a/test/ConsoleFileAllocationMonitorTest.cc
+++ b/test/ConsoleFileAllocationMonitorTest.cc
@ -1,37 +0,0 @@
-#include "ConsoleFileAllocationMonitor.h"
-#include <string>
-#include <cppunit/extensions/HelperMacros.h>
-
-using namespace std;
-
-class ConsoleFileAllocationMonitorTest:public CppUnit::TestFixture {
-
-  CPPUNIT_TEST_SUITE(ConsoleFileAllocationMonitorTest);
-  CPPUNIT_TEST(testShowProgress);
-  CPPUNIT_TEST_SUITE_END();
-private:
-
-public:
-  void setUp() {
-  }
-
-  void testShowProgress();
-};
-
-
-CPPUNIT_TEST_SUITE_REGISTRATION( ConsoleFileAllocationMonitorTest );
-
-void ConsoleFileAllocationMonitorTest::testShowProgress() {
-  ConsoleFileAllocationMonitor monitor;
-  monitor.setMinValue(0);
-  monitor.setMaxValue(1000000000);
-  monitor.setCurrentValue(0);
-
-  cout << endl;
-  for(int64_t i = monitor.getMinValue(); i <= monitor.getMaxValue(); i += 1234343) {
-    monitor.setCurrentValue(i);
-    monitor.showProgress();
-  }
-  monitor.setCurrentValue(monitor.getMaxValue());
-  monitor.showProgress();
-}
--- a/test/GlowFileAllocatorTest.cc
+++ b/test/GlowFileAllocatorTest.cc
@ -1,58 +0,0 @@
-#include "GlowFileAllocator.h"
-#include "File.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <fstream>
-#include <iomanip>
-#include <cppunit/extensions/HelperMacros.h>
-
-class GlowFileAllocatorTest:public CppUnit::TestFixture {
-
-  CPPUNIT_TEST_SUITE(GlowFileAllocatorTest);
-  CPPUNIT_TEST(testAllocate);
-  CPPUNIT_TEST_SUITE_END();
-private:
-
-public:
-  void setUp() {}
-
-  void testAllocate();
-};
-
-
-CPPUNIT_TEST_SUITE_REGISTRATION( GlowFileAllocatorTest );
-
-void GlowFileAllocatorTest::testAllocate()
-{
-  std::stringfn = "/tmp/aria2_GlowFileAllocatorTest_testAllocate";
-  ofstream of(fn.c_str());
-
-  of << "0123456789";
-
-  of.close();
-
-  File x("/tmp/aria2_GlowFileAllocatorTest_testAllocate");
-  CPPUNIT_ASSERT_EQUAL((int64_t)10, x.size());
-
-  int fd;
-  if((fd = open(fn.c_str(), O_RDWR, S_IRUSR|S_IWUSR)) < 0) {
-    CPPUNIT_FAIL("cannot open file");
-  }
-  GlowFileAllocator allocator;
-  allocator.allocate(fd, 4097);
-
-  if(close(fd) < 0) {
-    CPPUNIT_FAIL("cannot close file");
-  }
-
-  ifstream is(fn.c_str());
-
-  char buf[11];
-  is >> std::setw(sizeof(buf)) >> buf;
-
-  CPPUNIT_ASSERT(strcmp("0123456789", buf) == 0);
-
-  File f(fn);
-  CPPUNIT_ASSERT_EQUAL((int64_t)4097, f.size());
-}
--- a/test/Makefile.am
+++ b/test/Makefile.am
@ -47,7 +47,8 @@ aria2c_SOURCES = AllTest.cc\
 	FeatureConfigTest.cc\
 	SpeedCalcTest.cc\
 	MultiDiskAdaptorTest.cc\
-	MultiFileAllocationIteratorTest.cc
+	MultiFileAllocationIteratorTest.cc\
+	FixedNumberRandomizer.h

 if ENABLE_MESSAGE_DIGEST
 aria2c_SOURCES += MessageDigestHelperTest.cc\
@ -132,7 +133,21 @@ aria2c_SOURCES += BtAllowedFastMessageTest.cc\
 	DHKeyExchangeTest.cc\
 	ARC4Test.cc\
 	MSEHandshakeTest.cc\
-	DHTUtilTest.cc
+	DHTUtilTest.cc\
+	MockBtAnnounce.h\
+	MockBtContext.h\
+	MockBtProgressInfoFile.h\
+	MockBtRequestFactory.h\
+	MockDHTMessage.h\
+	MockDHTMessageCallback.h\
+	MockDHTMessageDispatcher.h\
+	MockDHTMessageFactory.h\
+	MockDHTTask.h\
+	MockDHTTaskFactory.h\
+	MockDHTTaskQueue.h\
+	MockExtensionMessage.h\
+	MockExtensionMessageFactory.h\
+	MockPieceStorage.h
 endif # ENABLE_BITTORRENT

 if ENABLE_METALINK
@ -159,4 +174,23 @@ AM_CPPFLAGS =  -Wall\
 	-I../lib -I../intl -I$(top_srcdir)/intl\
 	@LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\
 	@LIBARES_CPPFLAGS@ @LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\
-	-D_FILE_OFFSET_BITS=64 -DLOCALEDIR=\"$(localedir)\" @DEFS@
+	-DLOCALEDIR=\"$(localedir)\" @DEFS@
+
+EXTRA_DIST = 4096chunk.txt\
+	chunkChecksumTestFile250.txt\
+	cookietest.txt\
+	emptyfile\
+	file1r.txt\
+	file2r.txt\
+	file3r.txt\
+	filelist1.txt\
+	load-nonBt.aria2\
+	load.aria2\
+	malformed.netrc\
+	nscookietest.txt\
+	sample.netrc\
+	single.torrent\
+	test.torrent\
+	test.xml\
+	url-list-multiFile.torrent\
+	url-list-singleFile.torrent
--- a/test/Makefile.in
+++ b/test/Makefile.in
@ -117,7 +117,21 @@ check_PROGRAMS = $(am__EXEEXT_1)
@ENABLE_BITTORRENT_TRUE@	DHKeyExchangeTest.cc\
@ENABLE_BITTORRENT_TRUE@	ARC4Test.cc\
@ENABLE_BITTORRENT_TRUE@	MSEHandshakeTest.cc\
-@ENABLE_BITTORRENT_TRUE@	DHTUtilTest.cc
+@ENABLE_BITTORRENT_TRUE@	DHTUtilTest.cc\
+@ENABLE_BITTORRENT_TRUE@	MockBtAnnounce.h\
+@ENABLE_BITTORRENT_TRUE@	MockBtContext.h\
+@ENABLE_BITTORRENT_TRUE@	MockBtProgressInfoFile.h\
+@ENABLE_BITTORRENT_TRUE@	MockBtRequestFactory.h\
+@ENABLE_BITTORRENT_TRUE@	MockDHTMessage.h\
+@ENABLE_BITTORRENT_TRUE@	MockDHTMessageCallback.h\
+@ENABLE_BITTORRENT_TRUE@	MockDHTMessageDispatcher.h\
+@ENABLE_BITTORRENT_TRUE@	MockDHTMessageFactory.h\
+@ENABLE_BITTORRENT_TRUE@	MockDHTTask.h\
+@ENABLE_BITTORRENT_TRUE@	MockDHTTaskFactory.h\
+@ENABLE_BITTORRENT_TRUE@	MockDHTTaskQueue.h\
+@ENABLE_BITTORRENT_TRUE@	MockExtensionMessage.h\
+@ENABLE_BITTORRENT_TRUE@	MockExtensionMessageFactory.h\
+@ENABLE_BITTORRENT_TRUE@	MockPieceStorage.h

@ENABLE_METALINK_TRUE@am__append_3 = MetalinkerTest.cc\
@ENABLE_METALINK_TRUE@	MetalinkEntryTest.cc\
@ -173,7 +187,8 @@ am__aria2c_SOURCES_DIST = AllTest.cc SocketCoreTest.cc \
 	HttpResponseTest.cc SharedHandleTest.cc ChunkedEncodingTest.cc \
 	FileTest.cc OptionTest.cc DefaultDiskWriterTest.cc \
 	FeatureConfigTest.cc SpeedCalcTest.cc MultiDiskAdaptorTest.cc \
-	MultiFileAllocationIteratorTest.cc MessageDigestHelperTest.cc \
+	MultiFileAllocationIteratorTest.cc FixedNumberRandomizer.h \
+	MessageDigestHelperTest.cc \
 	IteratableChunkChecksumValidatorTest.cc \
 	IteratableChecksumValidatorTest.cc BtAllowedFastMessageTest.cc \
 	BtBitfieldMessageTest.cc BtCancelMessageTest.cc \
@ -213,6 +228,12 @@ am__aria2c_SOURCES_DIST = AllTest.cc SocketCoreTest.cc \
 	DHTRoutingTableSerializerTest.cc \
 	DHTRoutingTableDeserializerTest.cc DHKeyExchangeTest.cc \
 	ARC4Test.cc MSEHandshakeTest.cc DHTUtilTest.cc \
+	MockBtAnnounce.h MockBtContext.h MockBtProgressInfoFile.h \
+	MockBtRequestFactory.h MockDHTMessage.h \
+	MockDHTMessageCallback.h MockDHTMessageDispatcher.h \
+	MockDHTMessageFactory.h MockDHTTask.h MockDHTTaskFactory.h \
+	MockDHTTaskQueue.h MockExtensionMessage.h \
+	MockExtensionMessageFactory.h MockPieceStorage.h \
 	MetalinkerTest.cc MetalinkEntryTest.cc \
 	Metalink2RequestGroupTest.cc \
 	MetalinkPostDownloadHandlerTest.cc MetalinkHelperTest.cc \
@ -564,8 +585,8 @@ aria2c_SOURCES = AllTest.cc SocketCoreTest.cc array_funTest.cc \
 	HttpResponseTest.cc SharedHandleTest.cc ChunkedEncodingTest.cc \
 	FileTest.cc OptionTest.cc DefaultDiskWriterTest.cc \
 	FeatureConfigTest.cc SpeedCalcTest.cc MultiDiskAdaptorTest.cc \
-	MultiFileAllocationIteratorTest.cc $(am__append_1) \
-	$(am__append_2) $(am__append_3)
+	MultiFileAllocationIteratorTest.cc FixedNumberRandomizer.h \
+	$(am__append_1) $(am__append_2) $(am__append_3)

 #aria2c_CXXFLAGS = ${CPPUNIT_CFLAGS} -I../src -I../lib -Wall -D_FILE_OFFSET_BITS=64
 #aria2c_LDFLAGS = ${CPPUNIT_LIBS}
@ -581,7 +602,26 @@ AM_CPPFLAGS = -Wall\
 	-I../lib -I../intl -I$(top_srcdir)/intl\
 	@LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\
 	@LIBARES_CPPFLAGS@ @LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\
-	-D_FILE_OFFSET_BITS=64 -DLOCALEDIR=\"$(localedir)\" @DEFS@
+	-DLOCALEDIR=\"$(localedir)\" @DEFS@
+
+EXTRA_DIST = 4096chunk.txt\
+	chunkChecksumTestFile250.txt\
+	cookietest.txt\
+	emptyfile\
+	file1r.txt\
+	file2r.txt\
+	file3r.txt\
+	filelist1.txt\
+	load-nonBt.aria2\
+	load.aria2\
+	malformed.netrc\
+	nscookietest.txt\
+	sample.netrc\
+	single.torrent\
+	test.torrent\
+	test.xml\
+	url-list-multiFile.torrent\
+	url-list-singleFile.torrent

 all: all-am

--- a/test/MultiDiskWriterTest.cc
+++ b/test/MultiDiskWriterTest.cc
@ -1,144 +0,0 @@
-#include "common.h"
-#include "MultiDiskWriter.h"
-#include "a2io.h"
-#include <string>
-#include <cppunit/extensions/HelperMacros.h>
-
-using namespace std;
-
-class MultiDiskWriterTest:public CppUnit::TestFixture {
-
-  CPPUNIT_TEST_SUITE(MultiDiskWriterTest);
-  CPPUNIT_TEST(testWriteData);
-  CPPUNIT_TEST(testReadData);
-  CPPUNIT_TEST(testMessageDigest);
-  CPPUNIT_TEST_SUITE_END();
-private:
-
-public:
-  void setUp() {
-  }
-
-  void testWriteData();
-  void testReadData();
-  void testMessageDigest();
-};
-
-
-CPPUNIT_TEST_SUITE_REGISTRATION( MultiDiskWriterTest );
-
-FileEntries createEntries() {
-  FileEntryHandle entry1(new FileEntry("file1.txt", 15, 0));
-  FileEntryHandle entry2(new FileEntry("file2.txt", 7, 15));
-  FileEntryHandle entry3(new FileEntry("file3.txt", 3, 22));
-  unlink("file1.txt");
-  unlink("file2.txt");
-  unlink("file3.txt");
-  FileEntries entries;
-  entries.push_back(entry1);
-  entries.push_back(entry2);
-  entries.push_back(entry3);
-  return entries;
-}
-
-void readFile(const string& filename, char* buf, int bufLength) {
-  FILE* f = fopen(filename.c_str(), "r");
-  if(f == NULL) {
-    abort();
-  }
-  int retval = fread(buf, bufLength, 1, f);
-  fclose(f);
-  if(retval != 1) {
-    abort();
-  }
-}
-
-void MultiDiskWriterTest::testWriteData() {
-  MultiDiskWriter dw(2);
-  dw.setFileEntries(createEntries());
-
-  dw.openFile(".");
-  std::string msg = "12345";
-  dw.writeData(msg.c_str(), msg.size(), 0);
-  dw.closeFile();
-
-  char buf[128];
-  readFile("file1.txt", buf, 5);
-  buf[5] = '\0';
-  CPPUNIT_ASSERT_EQUAL(msg, string(buf));
-
-  dw.openFile(".");
-  std::string msg2 = "67890ABCDEF";
-  dw.writeData(msg2.c_str(), msg2.size(), 5);
-  dw.closeFile();
-
-  readFile("file1.txt", buf, 15);
-  buf[15] = '\0';
-  CPPUNIT_ASSERT_EQUAL(std::string("1234567890ABCDE"), string(buf));
-  readFile("file2.txt", buf, 1);
-  buf[1] = '\0';
-  CPPUNIT_ASSERT_EQUAL(std::string("F"), string(buf));
-
-  dw.openFile(".");
-  std::string msg3 = "12345123456712";
-  dw.writeData(msg3.c_str(), msg3.size(), 10);
-  dw.closeFile();
-
-  readFile("file1.txt", buf, 15);
-  buf[15] = '\0';
-  CPPUNIT_ASSERT_EQUAL(std::string("123456789012345"), string(buf));
-  readFile("file2.txt", buf, 7);
-  buf[7] = '\0';
-  CPPUNIT_ASSERT_EQUAL(std::string("1234567"), string(buf));
-  readFile("file3.txt", buf, 2);
-  buf[2] = '\0';
-  CPPUNIT_ASSERT_EQUAL(std::string("12"), string(buf));
-}
-
-void MultiDiskWriterTest::testReadData() {
-  FileEntryHandle entry1(new FileEntry("file1r.txt", 15, 0));
-  FileEntryHandle entry2(new FileEntry("file2r.txt", 7, 15));
-  FileEntryHandle entry3(new FileEntry("file3r.txt", 3, 22));
-  FileEntries entries;
-  entries.push_back(entry1);
-  entries.push_back(entry2);
-  entries.push_back(entry3);
-  MultiDiskWriter dw(2);
-  dw.setFileEntries(entries);
-
-  dw.openFile(".");
-  char buf[128];
-  dw.readData(buf, 15, 0);
-  buf[15] = '\0';
-  CPPUNIT_ASSERT_EQUAL(std::string("1234567890ABCDE"), string(buf));
-  dw.readData(buf, 10, 6);
-  buf[10] = '\0';
-  CPPUNIT_ASSERT_EQUAL(std::string("7890ABCDEF"), string(buf));
-  dw.readData(buf, 4, 20);
-  buf[4] = '\0';
-  CPPUNIT_ASSERT_EQUAL(std::string("KLMN"), string(buf));
-  dw.readData(buf, 25, 0);
-  buf[25] = '\0';
-  CPPUNIT_ASSERT_EQUAL(std::string("1234567890ABCDEFGHIJKLMNO"), string(buf));
-}
-
-void MultiDiskWriterTest::testMessageDigest() {
-  FileEntryHandle entry1(new FileEntry("file1r.txt", 15, 0));
-  FileEntryHandle entry2(new FileEntry("file2r.txt", 7, 15));
-  FileEntryHandle entry3(new FileEntry("file3r.txt", 3, 22));
-  FileEntries entries;
-  entries.push_back(entry1);
-  entries.push_back(entry2);
-  entries.push_back(entry3);
-  MultiDiskWriter dw(2);
-  dw.setFileEntries(entries);
-
-  dw.openFile(".");
-  std::string sha1sum = dw.messageDigest(0, 25, DIGEST_ALGO_SHA1);
-  CPPUNIT_ASSERT_EQUAL(std::string("76495faf71ca63df66dce99547d2c58da7266d9e"), sha1sum);
-  sha1sum = dw.messageDigest(15, 7, DIGEST_ALGO_SHA1);
-  CPPUNIT_ASSERT_EQUAL(std::string("737660d816fb23c2d5bc74f62d9b01b852b2aaca"), sha1sum);
-  sha1sum = dw.messageDigest(10, 14, DIGEST_ALGO_SHA1);
-  CPPUNIT_ASSERT_EQUAL(std::string("6238bf61dd8df8f77156b2378e9e39cd3939680c"), sha1sum);
-  dw.closeFile();
-}
--- a/test/RequestToString.cc
+++ b/test/RequestToString.cc
@ -1,27 +0,0 @@
-#ifndef _D_REQUEST_TO_STRING_H_
-#define _D_REQUEST_TO_STRING_H_
-#include "Util.h"
-#include "Request.h"
-#include <string>
-
-using namespace std;
-
-class RequestToString {
-private:
-  Request* req;
-public:
-  
-  RequestToString(Request* req) {
-    this->req = req;
-  }
-
-  string toString() {
-    return "url = "+req->url+"\n"+
-      "protocol = "+req->protocol+"\n"+
-      "host = "+req->host+"\n"+
-      "port = "+Util::ulitos(req->port)+"\n"+
-      "dir = "+req->dir+"\n"+
-      "file = "+req->file;
-  }
-
-#endif // _D_REQUEST_TO_STRING_H_
--- a/test/ShaVisitorTest.cc
+++ b/test/ShaVisitorTest.cc
@ -1,63 +0,0 @@
-#include "ShaVisitor.h"
-
-#include "MetaFileUtil.h"
-#include <string>
-#include <cppunit/extensions/HelperMacros.h>
-
-using namespace std;
-
-class ShaVisitorTest:public CppUnit::TestFixture {
-
-  CPPUNIT_TEST_SUITE(ShaVisitorTest);
-  CPPUNIT_TEST(testVisit);
-  CPPUNIT_TEST(testVisitCompound);
-
-  CPPUNIT_TEST_SUITE_END();
-private:
-
-public:
-  void setUp() {
-  }
-
-  void testVisit();
-  void testVisitCompound();
-};
-
-
-CPPUNIT_TEST_SUITE_REGISTRATION( ShaVisitorTest );
-
-std::stringhexHash(unsigned char* md, int len) {
-  char* temp = new char[len*2+1];
-  for(int i = 0; i < len; i++) {
-    sprintf(temp+i*2, "%02x", md[i]);
-  }
-  temp[len*2] = '\0';
-  std::stringh(temp);
-  delete [] temp;
-  return h;
-}
-
-void ShaVisitorTest::testVisit() {
-  ShaVisitor v;
-  Data d("test", 4);
-  d.accept(&v);
-  unsigned char md[20];
-  int len = 0;
-  v.getHash(md, len);
-  std::stringhashHex = hexHash(md, len);
-  CPPUNIT_ASSERT_EQUAL(std::string("20482dadd856f5ac908848f731d9235d2891c41e"),
-		       hashHex);
-}
-
-void ShaVisitorTest::testVisitCompound() {
-  ShaVisitor v;
-  std::string data = "d4:name5:aria24:listli123eee";
-  MetaEntry* e = MetaFileUtil::bdecoding(data.c_str(), data.size());
-  e->accept(&v);
-  unsigned char md[20];
-  int len = 0;
-  v.getHash(md, len);
-  std::stringhashHex = hexHash(md, len);
-  CPPUNIT_ASSERT_EQUAL(std::string("75538fbac9a074bb98c6a19b6bca3bc87ef9bf8e"),
-		       hashHex);
-}
--- a/test/TrackerWatcherCommandTest.cc
+++ b/test/TrackerWatcherCommandTest.cc
@ -1,97 +0,0 @@
-#include "TrackerWatcherCommand.h"
-#include "TorrentConsoleDownloadEngine.h"
-#include "MetaFileUtil.h"
-#include "Exception.h"
-#include "prefs.h"
-#include "HttpInitiateConnectionCommand.h"
-#include "ByteArrayDiskWriter.h"
-#include "DefaultBtContext.h"
-#include "DefaultBtAnnounce.h"
-#include "DefaultPieceStorage.h"
-#include "DefaultPeerStorage.h"
-#include "BtRegistry.h"
-#include "RequestFactory.h"
-#include "CUIDCounter.h"
-#include <cppunit/extensions/HelperMacros.h>
-
-using namespace std;
-
-class TrackerWatcherCommandTest:public CppUnit::TestFixture {
-
-  CPPUNIT_TEST_SUITE(TrackerWatcherCommandTest);
-  CPPUNIT_TEST(testCreateCommand);
-  CPPUNIT_TEST_SUITE_END();
-private:
-  Option op;
-public:
-  TrackerWatcherCommandTest()
-  {
-  }
-
-  void setUp() 
-  {
-    CUIDCounterHandle counter = new CUIDCounter();
-    CUIDCounterSingletonHolder::instance(counter);
-
-    op.put(PREF_TRACKER_MAX_TRIES, "10");
-    RequestFactoryHandle requestFactory = new RequestFactory();
-    requestFactory->setOption(&op);
-    RequestFactorySingletonHolder::instance(requestFactory);
-  }
-
-  void testCreateCommand();
-};
-
-
-CPPUNIT_TEST_SUITE_REGISTRATION( TrackerWatcherCommandTest );
-
-void TrackerWatcherCommandTest::testCreateCommand() {
-  try {
-    
-    BtContextHandle btContext(new DefaultBtContext());
-    btContext->load("test.torrent");
-    
-    SharedHandle<BtRuntime> btRuntime;
-    BtRegistry::registerBtRuntime(btContext->getInfoHashAsString(), btRuntime);
-    
-    PieceStorageHandle pieceStorage(new DefaultPieceStorage(btContext, &op));
-    BtRegistry::registerPieceStorage(btContext->getInfoHashAsString(),
-				     pieceStorage);
-
-    PeerStorageHandle peerStorage(new DefaultPeerStorage(btContext, &op));
-    BtRegistry::registerPeerStorage(btContext->getInfoHashAsString(),
-				    peerStorage);
-
-    BtAnnounceHandle btAnnounce(new DefaultBtAnnounce(btContext, &op));
-    BtRegistry::registerBtAnnounce(btContext->getInfoHashAsString(), btAnnounce);
-    TorrentConsoleDownloadEngine* te = new TorrentConsoleDownloadEngine();
-    te->option = &op;
-    te->_requestGroupMan = new RequestGroupMan();
-
-    TrackerWatcherCommand command(1, te, btContext);
-
-    RequestFactorySingletonHolder::instance()->createHttpAuthResolver();
-
-    CPPUNIT_ASSERT(dynamic_cast<HttpInitiateConnectionCommand*>(command.createCommand()));
-    //cerr << btAnnounce->getAnnounceUrl() << endl;
-    
-    btAnnounce->announceSuccess();
-    btAnnounce->resetAnnounce();
-    te->_requestGroupMan = new RequestGroupMan();
-    
-    btRuntime->setHalt(true);
-    
-    CPPUNIT_ASSERT(dynamic_cast<HttpInitiateConnectionCommand*>(command.createCommand()));
-    //cerr << btAnnounce->getAnnounceUrl() << endl;
-    
-    btAnnounce->announceSuccess();
-    btAnnounce->resetAnnounce();
-    te->_requestGroupMan = new RequestGroupMan();
-    
-    CPPUNIT_ASSERT(btAnnounce->noMoreAnnounce());
-    
-  } catch(Exception* e) {
-    cerr << e->getMsg() << endl;
-    delete e;
-  }
-}