Move address_set to src/or

This is temporary, until src/or is split.

Putting this in containers would be another logical alternative,
except that addresses depend on containers, and we don't like
cycles.

diff --git a/src/common/include.am b/src/common/include.am
index 565482bcf91e04292e6234a83e8e5321cdb0eb74..de4ecbaeeaf0c7936c3f414e86fdbdc955010245 100644 (file)
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -18,7 +18,6 @@ libor_extra_source=
 endif
 
 LIBOR_A_SRC = \
-  src/common/address_set.c                             \
   src/common/token_bucket.c                            \
   src/common/workqueue.c                               \
   $(libor_extra_source)
@@ -49,7 +48,6 @@ src_common_libor_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 src_common_libor_event_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 
 COMMONHEADERS = \
-  src/common/address_set.h                     \
   src/common/compat_libevent.h                 \
   src/common/procmon.h                         \
   src/common/timers.h                          \

diff --git a/src/common/address_set.c b/src/or/address_set.c
similarity index 98%
rename from src/common/address_set.c
rename to src/or/address_set.c
index 1bd1462387ee32513443ae254c0dd8d7ce714b2d..927a5597c0aea5c90c03cbb9a596224838603e68 100644 (file)
--- a/src/common/address_set.c
+++ b/src/or/address_set.c
@@ -11,7 +11,7 @@
  **/
 
 #include "orconfig.h"
-#include "common/address_set.h"
+#include "or/address_set.h"
 #include "lib/net/address.h"
 #include "lib/container/bloomfilt.h"
 #include "lib/crypt_ops/crypto_rand.h"

diff --git a/src/common/address_set.h b/src/or/address_set.h
similarity index 100%
rename from src/common/address_set.h
rename to src/or/address_set.h

diff --git a/src/or/include.am b/src/or/include.am
index 9b5f7c1f60d4bb1a47ec1b6c646cecbd7db1ee5f..ad7ee69bf581e4c70f463794ce3133812d344b9f 100644 (file)
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -19,6 +19,7 @@ EXTRA_DIST+= src/or/ntmain.c src/or/Makefile.nmake
 
 LIBTOR_APP_A_SOURCES = \
        src/or/addressmap.c                             \
+       src/or/address_set.c                            \
        src/or/bridges.c                                \
        src/or/channel.c                                \
        src/or/channelpadding.c                         \
@@ -180,6 +181,7 @@ endif
 
 ORHEADERS = \
        src/or/addressmap.h                             \
+       src/or/address_set.h                            \
        src/or/addr_policy_st.h                         \
        src/or/authority_cert_st.h                      \
        src/or/auth_dirs.inc                            \

diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index bc04ab9526f4419be5cc3b78ca69ec335ac4312e..51fd0015df7fd9ae5954e9ad2db5e331bb2c5623 100644 (file)
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -42,7 +42,7 @@
 
 #include "or/or.h"
 #include "lib/net/address.h"
-#include "common/address_set.h"
+#include "or/address_set.h"
 #include "or/bridges.h"
 #include "or/config.h"
 #include "or/control.h"

diff --git a/src/test/test_address_set.c b/src/test/test_address_set.c
index 3699685848f96e97a7b6a8e7f731ccc9384b4f99..ec4e6b7e8736b3cfae7eb049d6ff31446b8b217e 100644 (file)
--- a/src/test/test_address_set.c
+++ b/src/test/test_address_set.c
@@ -3,7 +3,7 @@
 
 #include "or/or.h"
 #include "lib/crypt_ops/crypto_rand.h"
-#include "common/address_set.h"
+#include "or/address_set.h"
 #include "or/microdesc.h"
 #include "or/networkstatus.h"
 #include "or/nodelist.h"