Commit 0adcfbc7 authored by Nick Mathewson's avatar Nick Mathewson
Browse files

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.
parent 24c0f831
......@@ -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 \
......
......@@ -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"
......
......@@ -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 \
......
......@@ -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"
......
......@@ -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"
......
Supports Markdown
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