The proxy did not survive the dual stack migration, might be resurrected in v1.1.0

1 files changed, 12 insertions, 28 deletions

diff --git a/Makefile b/Makefile
index a4fe92f..587af67 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,6 @@
 # $Id$
 
-# Linux flavour
-# PREFIX?=/opt/diet
-# LIBOWFAT_HEADERS=$(PREFIX)/include
-# LIBOWFAT_LIBRARY=$(PREFIX)/lib
-
-# BSD flavour
-# PREFIX?=/usr/local
-# LIBOWFAT_HEADERS=$(PREFIX)/include/libowfat
-# LIBOWFAT_LIBRARY=$(PREFIX)/lib
-
-# Debug flavour
 PREFIX?=..
-LIBOWFAT_HEADERS=$(PREFIX)/libowfat
-LIBOWFAT_LIBRARY=$(PREFIX)/libowfat
-
 BINDIR?=$(PREFIX)/bin
 STRIP?=strip
 
@@ -62,11 +48,6 @@ OPTS_production=-O3
 CFLAGS+=-DOT_VERSION=\"$(VERSION)\" -DGIT_VERSION=\"$(GIT_VERSION)\" -Wall -pipe -pthread -Wextra -Wwrite-strings #-ansi -pedantic
 LDFLAGS+=-pthread
 
-# Only the proxy, which has not been ported since the tracker went dual stack,
-# still wants libowfat.
-CFLAGS_libowfat=-I$(LIBOWFAT_HEADERS)
-LDFLAGS_libowfat=-L$(LIBOWFAT_LIBRARY) -lowfat
-
 # Record feature flags as a dep to allow rebuild when they change
 BUILDSTAMP=.buildstamp
 BUILDDEPS=Makefile $(BUILDSTAMP)
@@ -79,25 +60,28 @@ FORCE:
 BINARY =opentracker
 HEADERS=trackerlogic.h ot_urlencoded.h ot_batch.h ot_buf.h ot_event.h ot_fdstate.h ot_fmt.h ot_hex.h ot_ip.h ot_config.h ot_scan.h ot_socket.h ot_tcp.h ot_worker.h ot_workqueue.h ot_mutex.h ot_random.h ot_stats.h ot_vector.h ot_clean.h ot_udp.h ot_iovec.h ot_fullscrape.h ot_accesslist.h ot_http.h ot_livesync.h ot_rijndael.h
 SOURCES=opentracker.c trackerlogic.c ot_urlencoded.c ot_batch.c ot_buf.c ot_event.c ot_fdstate.c ot_fmt.c ot_hex.c ot_ip.c ot_config.c ot_scan.c ot_socket.c ot_tcp.c ot_worker.c ot_workqueue.c ot_mutex.c ot_random.c ot_stats.c ot_vector.c ot_clean.c ot_udp.c ot_iovec.c ot_fullscrape.c ot_accesslist.c ot_http.c ot_livesync.c ot_rijndael.c
-SOURCES_proxy=proxy.c ot_batch.c ot_fdstate.c ot_vector.c ot_mutex.c ot_random.c ot_scan.c ot_ip.c ot_socket.c
 
 all: $(BINARY) $(BINARY).debug
 
 CFLAGS_production = $(CFLAGS) $(OPTS_production) $(FEATURES)
 CFLAGS_debug = $(CFLAGS) $(OPTS_debug) $(FEATURES)
 
-CFLAGS_proxy = $(CFLAGS_production) $(CFLAGS_libowfat) -DWANT_SYNC_LIVE
-CFLAGS_proxy_debug = $(CFLAGS_debug) $(CFLAGS_libowfat) -DWANT_SYNC_LIVE
-
 $(BINARY): $(SOURCES) $(HEADERS) $(BUILDDEPS)
         $(CC) -o $@ $(CFLAGS_production) $(SOURCES) $(LDFLAGS)
         $(STRIP) $@
 $(BINARY).debug: $(SOURCES) $(HEADERS) $(BUILDDEPS)
         $(CC) -o $@ $(CFLAGS_debug) $(SOURCES) $(LDFLAGS)
-proxy: $(SOURCES_proxy) $(HEADERS) $(BUILDDEPS)
-        $(CC) -o $@ $(CFLAGS_proxy) $(SOURCES_proxy) $(LDFLAGS) $(LDFLAGS_libowfat)
-proxy.debug: $(SOURCES_proxy) $(HEADERS) $(BUILDDEPS)
-        $(CC) -o $@ $(CFLAGS_proxy_debug) $(SOURCES_proxy) $(LDFLAGS) $(LDFLAGS_libowfat)
+
+# The proxy is out of service
+#
+# SOURCES_proxy=proxy.c ot_batch.c ot_fdstate.c ot_vector.c ot_mutex.c ot_random.c ot_scan.c ot_ip.c ot_socket.c
+# CFLAGS_proxy = $(CFLAGS_production) -DWANT_SYNC_LIVE
+# CFLAGS_proxy_debug = $(CFLAGS_debug) -DWANT_SYNC_LIVE
+#
+# proxy: $(SOURCES_proxy) $(HEADERS) $(BUILDDEPS)
+#       $(CC) -o $@ $(CFLAGS_proxy) $(SOURCES_proxy) $(LDFLAGS)
+# proxy.debug: $(SOURCES_proxy) $(HEADERS) $(BUILDDEPS)
+#       $(CC) -o $@ $(CFLAGS_proxy_debug) $(SOURCES_proxy) $(LDFLAGS)
 
 # Unit tests. The modules under test are compiled straight into the test
 # binary, so a test may reach a static function by including the source if it
@@ -174,7 +158,7 @@ check-all:
 
 .PHONY: all FORCE dist check check-poll check-sanitize check-integration check-tsan check-all clean install
 
-BINARIES=opentracker opentracker.debug opentracker.integration opentracker.tsan proxy proxy.debug $(TESTBIN) $(TESTBIN).sanitize $(TESTBIN).poll
+BINARIES=opentracker opentracker.debug opentracker.integration opentracker.tsan $(TESTBIN) $(TESTBIN).sanitize $(TESTBIN).poll
 
 clean:
         rm -rf $(BINARIES) $(BINARIES:=.dSYM) $(BUILDSTAMP) *.o *~