Commit a6b67331 authored by rakshasa's avatar rakshasa

Moved network related headers to torrent/net.

parent 1711b35c
......@@ -125,9 +125,10 @@ AC_OUTPUT([
Makefile
src/Makefile
src/torrent/Makefile
src/torrent/peer/Makefile
src/torrent/data/Makefile
src/torrent/download/Makefile
src/torrent/net/Makefile
src/torrent/peer/Makefile
src/torrent/utils/Makefile
src/data/Makefile
src/dht/Makefile
......
......@@ -15,6 +15,7 @@ libtorrent_la_LIBADD = \
torrent/libsub_torrent.la \
torrent/data/libsub_torrentdata.la \
torrent/download/libsub_torrentdownload.la \
torrent/net/libsub_torrentnet.la \
torrent/peer/libsub_torrentpeer.la \
torrent/utils/libsub_torrentutils.la \
data/libsub_data.la \
......
SUBDIRS = \
data \
download \
net \
peer \
utils
......
noinst_LTLIBRARIES = libsub_torrentnet.la
libsub_torrentnet_la_SOURCES = \
socket_address_key.cc \
socket_address_key.h
AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. -I$(top_srcdir)
libtorrentincludedir = $(includedir)/torrent/net
libtorrentinclude_HEADERS = \
socket_address_key.h
// Copyright (C) 2005-2014, Jari Sundell
// All rights reserved.
#include "config.h"
......@@ -39,8 +39,8 @@
#include <map>
#include <torrent/common.h>
#include <torrent/net/socket_address_key.h>
#include <torrent/utils/extents.h>
#include <torrent/utils/socket_address_key.h>
namespace torrent {
......
......@@ -17,7 +17,6 @@ libsub_torrentutils_la_SOURCES = \
resume.h \
signal_bitfield.cc \
signal_bitfield.h \
socket_address_key.h \
thread_base.cc \
thread_base.h \
thread_interrupt.cc \
......@@ -38,7 +37,6 @@ libtorrentinclude_HEADERS = \
ranges.h \
resume.h \
signal_bitfield.h \
socket_address_key.h \
thread_base.h \
thread_interrupt.h \
uri_parser.h
......@@ -33,6 +33,29 @@ LibTorrentTest_SOURCES = \
data/hash_queue_test.h \
protocol/test_request_list.cc \
protocol/test_request_list.h \
\
torrent/net/test_socket_address_key.cc \
torrent/net/test_socket_address_key.h \
\
torrent/utils/log_test.cc \
torrent/utils/log_test.h \
torrent/utils/log_buffer_test.cc \
torrent/utils/log_buffer_test.h \
torrent/utils/net_test.cc \
torrent/utils/net_test.h \
torrent/utils/option_strings_test.cc \
torrent/utils/option_strings_test.h \
torrent/utils/test_extents.cc \
torrent/utils/test_extents.h \
torrent/utils/test_queue_buckets.cc \
torrent/utils/test_queue_buckets.h \
torrent/utils/test_uri_parser.cc \
torrent/utils/test_uri_parser.h \
torrent/utils/signal_bitfield_test.cc \
torrent/utils/signal_bitfield_test.h \
torrent/utils/thread_base_test.cc \
torrent/utils/thread_base_test.h \
\
torrent/http_test.cc \
torrent/http_test.h \
torrent/object_test.cc \
......@@ -55,26 +78,6 @@ LibTorrentTest_SOURCES = \
torrent/tracker_list_features_test.h \
torrent/tracker_timeout_test.cc \
torrent/tracker_timeout_test.h \
torrent/utils/log_test.cc \
torrent/utils/log_test.h \
torrent/utils/log_buffer_test.cc \
torrent/utils/log_buffer_test.h \
torrent/utils/net_test.cc \
torrent/utils/net_test.h \
torrent/utils/option_strings_test.cc \
torrent/utils/option_strings_test.h \
torrent/utils/test_extents.cc \
torrent/utils/test_extents.h \
torrent/utils/test_queue_buckets.cc \
torrent/utils/test_queue_buckets.h \
torrent/utils/test_socket_address_key.cc \
torrent/utils/test_socket_address_key.h \
torrent/utils/test_uri_parser.cc \
torrent/utils/test_uri_parser.h \
torrent/utils/signal_bitfield_test.cc \
torrent/utils/signal_bitfield_test.h \
torrent/utils/thread_base_test.cc \
torrent/utils/thread_base_test.h \
tracker/tracker_http_test.cc \
tracker/tracker_http_test.h \
main.cc
......
......@@ -7,7 +7,7 @@
#include "test_socket_address_key.h"
#include "torrent/utils/net.h"
#include "torrent/utils/socket_address_key.h"
#include "torrent/net/socket_address_key.h"
CPPUNIT_TEST_SUITE_REGISTRATION(test_socket_address_key);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment