Attachment #180119 for bug #206969

View | Details | Raw Unified | Return to bug 206969
Collapse All | Expand All

Lines 16-22 Link Here

(-)src/or.orig/dns.c (-1 / +1 lines)
16		16
17	#include "or.h"	17	#include "or.h"
18	#include "ht.h"	18	#include "ht.h"
19	#include "eventdns.h"	19	#include <evdns.h>
20		20
21	/** Longest hostname we're willing to resolve. */	21	/** Longest hostname we're willing to resolve. */
22	#define MAX_ADDRESSLEN 256	22	#define MAX_ADDRESSLEN 256

Lines 12-18 Link Here

(-)src/or.orig/dnsserv.c (-1 / +1 lines)
12	**/	12	**/
13		13
14	#include "or.h"	14	#include "or.h"
15	#include "eventdns.h"	15	#include <evdns.h>
16		16
17	/* Helper function: called by evdns whenever the client sends a request to our	17	/* Helper function: called by evdns whenever the client sends a request to our
18	* DNSPort. We need to eventually answer the request <b>req</b>.	18	* DNSPort. We need to eventually answer the request <b>req</b>.




	networkstatus.c \
	onion.c policies.c relay.c rendcommon.c rendclient.c rendmid.c \
	rendservice.c rephist.c router.c routerlist.c routerparse.c \
	eventdns.c \
	tor_main.c

AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \

	networkstatus.c \
	onion.c policies.c relay.c rendcommon.c rendclient.c rendmid.c \
	rendservice.c rephist.c router.c routerlist.c routerparse.c \
	eventdns.c \
	test_data.c test.c

test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \

test_LDADD = ../common/libor.a ../common/libor-crypto.a \
        -lz -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@

noinst_HEADERS = or.h micro-revision.i

tor_main.o: micro-revision.i





	dirvote.c dns.c dnsserv.c geoip.c hibernate.c main.c ntmain.c \
	networkstatus.c onion.c policies.c relay.c rendcommon.c \
	rendclient.c rendmid.c rendservice.c rephist.c router.c \
	routerlist.c routerparse.c test_data.c test.c
@BUILD_NT_SERVICES_TRUE@am__objects_1 = ntmain.$(OBJEXT)
am_test_OBJECTS = buffers.$(OBJEXT) circuitbuild.$(OBJEXT) \
	circuitlist.$(OBJEXT) circuituse.$(OBJEXT) command.$(OBJEXT) \

	onion.$(OBJEXT) policies.$(OBJEXT) relay.$(OBJEXT) \
	rendcommon.$(OBJEXT) rendclient.$(OBJEXT) rendmid.$(OBJEXT) \
	rendservice.$(OBJEXT) rephist.$(OBJEXT) router.$(OBJEXT) \
	routerlist.$(OBJEXT) routerparse.$(OBJEXT) \
	test_data.$(OBJEXT) test.$(OBJEXT)
test_OBJECTS = $(am_test_OBJECTS)
test_DEPENDENCIES = ../common/libor.a ../common/libor-crypto.a

	dirvote.c dns.c dnsserv.c geoip.c hibernate.c main.c ntmain.c \
	networkstatus.c onion.c policies.c relay.c rendcommon.c \
	rendclient.c rendmid.c rendservice.c rephist.c router.c \
	routerlist.c routerparse.c tor_main.c
am_tor_OBJECTS = buffers.$(OBJEXT) circuitbuild.$(OBJEXT) \
	circuitlist.$(OBJEXT) circuituse.$(OBJEXT) command.$(OBJEXT) \
	config.$(OBJEXT) connection.$(OBJEXT) \

	onion.$(OBJEXT) policies.$(OBJEXT) relay.$(OBJEXT) \
	rendcommon.$(OBJEXT) rendclient.$(OBJEXT) rendmid.$(OBJEXT) \
	rendservice.$(OBJEXT) rephist.$(OBJEXT) router.$(OBJEXT) \
	routerlist.$(OBJEXT) routerparse.$(OBJEXT) \
	tor_main.$(OBJEXT)
tor_OBJECTS = $(am_tor_OBJECTS)
tor_DEPENDENCIES = ../common/libor.a ../common/libor-crypto.a

	networkstatus.c \
	onion.c policies.c relay.c rendcommon.c rendclient.c rendmid.c \
	rendservice.c rephist.c router.c routerlist.c routerparse.c \
	eventdns.c \
	tor_main.c

AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \

	networkstatus.c \
	onion.c policies.c relay.c rendcommon.c rendclient.c rendmid.c \
	rendservice.c rephist.c router.c routerlist.c routerparse.c \
	eventdns.c \
	test_data.c test.c

test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \

test_LDADD = ../common/libor.a ../common/libor-crypto.a \
        -lz -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@

noinst_HEADERS = or.h micro-revision.i
all: all-am

.SUFFIXES:

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirvote.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dns.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnsserv.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eventdns.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geoip.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hibernate.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@

Return to bug 206969

Lines 20-26 Link Here

(-)src/or.orig/Makefile.am (-3 / +1 lines)
20	networkstatus.c \	20	networkstatus.c \
21	onion.c policies.c relay.c rendcommon.c rendclient.c rendmid.c \	21	onion.c policies.c relay.c rendcommon.c rendclient.c rendmid.c \
22	rendservice.c rephist.c router.c routerlist.c routerparse.c \	22	rendservice.c rephist.c router.c routerlist.c routerparse.c \
23	eventdns.c \
24	tor_main.c	23	tor_main.c
25		24
26	AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \	25	AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \
Lines 42-48 Link Here
42	networkstatus.c \	41	networkstatus.c \
43	onion.c policies.c relay.c rendcommon.c rendclient.c rendmid.c \	42	onion.c policies.c relay.c rendcommon.c rendclient.c rendmid.c \
44	rendservice.c rephist.c router.c routerlist.c routerparse.c \	43	rendservice.c rephist.c router.c routerlist.c routerparse.c \
45	eventdns.c \
46	test_data.c test.c	44	test_data.c test.c
47		45
48	test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \	46	test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
Lines 50-56 Link Here
50	test_LDADD = ../common/libor.a ../common/libor-crypto.a \	48	test_LDADD = ../common/libor.a ../common/libor-crypto.a \
51	-lz -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@	49	-lz -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@
52		50
53	noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i	51	noinst_HEADERS = or.h micro-revision.i
54		52
55	tor_main.o: micro-revision.i	53	tor_main.o: micro-revision.i
56		54

Lines 56-62 Link Here

(-)src/or.orig/Makefile.in (-8 / +5 lines)
56	dirvote.c dns.c dnsserv.c geoip.c hibernate.c main.c ntmain.c \	56	dirvote.c dns.c dnsserv.c geoip.c hibernate.c main.c ntmain.c \
57	networkstatus.c onion.c policies.c relay.c rendcommon.c \	57	networkstatus.c onion.c policies.c relay.c rendcommon.c \
58	rendclient.c rendmid.c rendservice.c rephist.c router.c \	58	rendclient.c rendmid.c rendservice.c rephist.c router.c \
59	routerlist.c routerparse.c eventdns.c test_data.c test.c	59	routerlist.c routerparse.c test_data.c test.c
60	@BUILD_NT_SERVICES_TRUE@am__objects_1 = ntmain.$(OBJEXT)	60	@BUILD_NT_SERVICES_TRUE@am__objects_1 = ntmain.$(OBJEXT)
61	am_test_OBJECTS = buffers.$(OBJEXT) circuitbuild.$(OBJEXT) \	61	am_test_OBJECTS = buffers.$(OBJEXT) circuitbuild.$(OBJEXT) \
62	circuitlist.$(OBJEXT) circuituse.$(OBJEXT) command.$(OBJEXT) \	62	circuitlist.$(OBJEXT) circuituse.$(OBJEXT) command.$(OBJEXT) \
Lines 69-75 Link Here
69	onion.$(OBJEXT) policies.$(OBJEXT) relay.$(OBJEXT) \	69	onion.$(OBJEXT) policies.$(OBJEXT) relay.$(OBJEXT) \
70	rendcommon.$(OBJEXT) rendclient.$(OBJEXT) rendmid.$(OBJEXT) \	70	rendcommon.$(OBJEXT) rendclient.$(OBJEXT) rendmid.$(OBJEXT) \
71	rendservice.$(OBJEXT) rephist.$(OBJEXT) router.$(OBJEXT) \	71	rendservice.$(OBJEXT) rephist.$(OBJEXT) router.$(OBJEXT) \
72	routerlist.$(OBJEXT) routerparse.$(OBJEXT) eventdns.$(OBJEXT) \	72	routerlist.$(OBJEXT) routerparse.$(OBJEXT) \
73	test_data.$(OBJEXT) test.$(OBJEXT)	73	test_data.$(OBJEXT) test.$(OBJEXT)
74	test_OBJECTS = $(am_test_OBJECTS)	74	test_OBJECTS = $(am_test_OBJECTS)
75	test_DEPENDENCIES = ../common/libor.a ../common/libor-crypto.a	75	test_DEPENDENCIES = ../common/libor.a ../common/libor-crypto.a
Lines 81-87 Link Here
81	dirvote.c dns.c dnsserv.c geoip.c hibernate.c main.c ntmain.c \	81	dirvote.c dns.c dnsserv.c geoip.c hibernate.c main.c ntmain.c \
82	networkstatus.c onion.c policies.c relay.c rendcommon.c \	82	networkstatus.c onion.c policies.c relay.c rendcommon.c \
83	rendclient.c rendmid.c rendservice.c rephist.c router.c \	83	rendclient.c rendmid.c rendservice.c rephist.c router.c \
84	routerlist.c routerparse.c eventdns.c tor_main.c	84	routerlist.c routerparse.c tor_main.c
85	am_tor_OBJECTS = buffers.$(OBJEXT) circuitbuild.$(OBJEXT) \	85	am_tor_OBJECTS = buffers.$(OBJEXT) circuitbuild.$(OBJEXT) \
86	circuitlist.$(OBJEXT) circuituse.$(OBJEXT) command.$(OBJEXT) \	86	circuitlist.$(OBJEXT) circuituse.$(OBJEXT) command.$(OBJEXT) \
87	config.$(OBJEXT) connection.$(OBJEXT) \	87	config.$(OBJEXT) connection.$(OBJEXT) \
Lines 93-99 Link Here
93	onion.$(OBJEXT) policies.$(OBJEXT) relay.$(OBJEXT) \	93	onion.$(OBJEXT) policies.$(OBJEXT) relay.$(OBJEXT) \
94	rendcommon.$(OBJEXT) rendclient.$(OBJEXT) rendmid.$(OBJEXT) \	94	rendcommon.$(OBJEXT) rendclient.$(OBJEXT) rendmid.$(OBJEXT) \
95	rendservice.$(OBJEXT) rephist.$(OBJEXT) router.$(OBJEXT) \	95	rendservice.$(OBJEXT) rephist.$(OBJEXT) router.$(OBJEXT) \
96	routerlist.$(OBJEXT) routerparse.$(OBJEXT) eventdns.$(OBJEXT) \	96	routerlist.$(OBJEXT) routerparse.$(OBJEXT) \
97	tor_main.$(OBJEXT)	97	tor_main.$(OBJEXT)
98	tor_OBJECTS = $(am_tor_OBJECTS)	98	tor_OBJECTS = $(am_tor_OBJECTS)
99	tor_DEPENDENCIES = ../common/libor.a ../common/libor-crypto.a	99	tor_DEPENDENCIES = ../common/libor.a ../common/libor-crypto.a
Lines 230-236 Link Here
230	networkstatus.c \	230	networkstatus.c \
231	onion.c policies.c relay.c rendcommon.c rendclient.c rendmid.c \	231	onion.c policies.c relay.c rendcommon.c rendclient.c rendmid.c \
232	rendservice.c rephist.c router.c routerlist.c routerparse.c \	232	rendservice.c rephist.c router.c routerlist.c routerparse.c \
233	eventdns.c \
234	tor_main.c	233	tor_main.c
235		234
236	AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \	235	AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \
Lines 253-259 Link Here
253	networkstatus.c \	252	networkstatus.c \
254	onion.c policies.c relay.c rendcommon.c rendclient.c rendmid.c \	253	onion.c policies.c relay.c rendcommon.c rendclient.c rendmid.c \
255	rendservice.c rephist.c router.c routerlist.c routerparse.c \	254	rendservice.c rephist.c router.c routerlist.c routerparse.c \
256	eventdns.c \
257	test_data.c test.c	255	test_data.c test.c
258		256
259	test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \	257	test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
Lines 262-268 Link Here
262	test_LDADD = ../common/libor.a ../common/libor-crypto.a \	260	test_LDADD = ../common/libor.a ../common/libor-crypto.a \
263	-lz -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@	261	-lz -levent -lssl -lcrypto @TOR_LIB_WS32@ @TOR_LIB_GDI@
264		262
265	noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i	263	noinst_HEADERS = or.h micro-revision.i
266	all: all-am	264	all: all-am
267		265
268	.SUFFIXES:	266	.SUFFIXES:
Lines 351-357 Link Here
351	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirvote.Po@am__quote@	349	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirvote.Po@am__quote@
352	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dns.Po@am__quote@	350	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dns.Po@am__quote@
353	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnsserv.Po@am__quote@	351	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnsserv.Po@am__quote@
354	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eventdns.Po@am__quote@
355	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geoip.Po@am__quote@	352	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geoip.Po@am__quote@
356	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hibernate.Po@am__quote@	353	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hibernate.Po@am__quote@
357	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@	354	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@