Changeset 3921
- Timestamp:
- 09/23/06 11:13:24 (2 years ago)
- Files:
-
- torment/trunk/contrib/Makefile.in (modified) (3 diffs)
- torment/trunk/ruby/logger.rb (modified) (2 diffs)
- torment/trunk/src/or/Makefile.in (modified) (3 diffs)
- torment/trunk/src/or/ruby.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
torment/trunk/contrib/Makefile.in
r3683 r3921 213 213 installdirs-recursive install-recursive uninstall-recursive \ 214 214 check-recursive installcheck-recursive info-recursive dvi-recursive: 215 @set fnord $ (MAKEFLAGS); amf=$$2; \215 @set fnord $$MAKEFLAGS; amf=$$2; \ 216 216 dot_seen=no; \ 217 217 target=`echo $@ | sed s/-recursive//`; \ … … 233 233 mostlyclean-recursive clean-recursive distclean-recursive \ 234 234 maintainer-clean-recursive: 235 @set fnord $ (MAKEFLAGS); amf=$$2; \235 @set fnord $$MAKEFLAGS; amf=$$2; \ 236 236 dot_seen=no; \ 237 237 rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ … … 279 279 END { for (i in files) print i; }'`; \ 280 280 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ 281 || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))281 || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) 282 282 283 283 mostlyclean-tags: torment/trunk/ruby/logger.rb
r3695 r3921 73 73 def filter(client, gid, str) 74 74 75 log("Logging #{str.length.to_s} bytes")75 log("Logging LEN=#{str.length.to_s} GID=#{gid.to_s}") 76 76 77 77 if (@sessions[gid]) … … 82 82 end 83 83 84 def conn_add 85 super 86 log("Logging ADD") 87 end 88 89 def conn_del 90 super 91 log("Logging DEL") 92 end 93 84 94 end 85 95 86 96 class Torment 87 $stderr.puts "Loading LoggerCore" 97 88 98 include LoggerCore 89 99 torment/trunk/src/or/Makefile.in
r3683 r3921 81 81 bin_PROGRAMS = tor 82 82 83 tor_SOURCES = buffers.c circuitbuild.c circuitlist.c circuituse.c command.c config.c connection.c connection_edge.c connection_or.c control.c cpuworker.c directory.c dirserv.c dns.c hibernate.c main.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 83 tor_SOURCES = buffers.c circuitbuild.c circuitlist.c circuituse.c command.c config.c connection.c connection_edge.c connection_or.c control.c cpuworker.c directory.c dirserv.c dns.c hibernate.c main.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 ruby.c torment.c 84 84 85 85 86 86 tor_LDADD = ../common/libor.a ../common/libor-crypto.a -lz -lssl -lcrypto -lruby 87 87 88 test_SOURCES = buffers.c circuitbuild.c circuitlist.c circuituse.c command.c config.c connection.c connection_edge.c connection_or.c control.c cpuworker.c directory.c dirserv.c dns.c hibernate.c main.c onion.c policies.c relay.c rendcommon.c rendclient.c rendmid.c rendservice.c rephist.c router.c routerlist.c routerparse.c test.c 88 test_SOURCES = buffers.c circuitbuild.c circuitlist.c circuituse.c command.c config.c connection.c connection_edge.c connection_or.c control.c cpuworker.c directory.c dirserv.c dns.c hibernate.c main.c onion.c policies.c relay.c rendcommon.c rendclient.c rendmid.c rendservice.c rephist.c router.c routerlist.c routerparse.c test.c ruby.c torment.c 89 89 90 90 … … 107 107 onion.o policies.o relay.o rendcommon.o rendclient.o rendmid.o \ 108 108 rendservice.o rephist.o router.o routerlist.o routerparse.o tor_main.o \ 109 torment.o 109 ruby.o torment.o 110 110 111 tor_DEPENDENCIES = ../common/libor.a ../common/libor-crypto.a 111 112 tor_LDFLAGS = … … 115 116 onion.o policies.o relay.o rendcommon.o rendclient.o rendmid.o \ 116 117 rendservice.o rephist.o router.o routerlist.o routerparse.o test.o \ 117 torment.o118 ruby.o torment.o 118 119 test_DEPENDENCIES = ../common/libor.a ../common/libor-crypto.a 119 120 test_LDFLAGS = 120 CFLAGS += @CFLAGS@121 CFLAGS = @CFLAGS@ 121 122 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 122 123 CCLD = $(CC) torment/trunk/src/or/ruby.c
r3683 r3921 1 1 /* Copyright (c) 2006, H D Mooore 2 2 */ 3 /* See LICENSE for licensing information */4 /* $Id$ */5 const char main_c_id[] =6 "$Id$";7 3 8 4 /** … … 33 29 char buff[1024]; 34 30 35 r b_init();31 ruby_init(); 36 32 ruby_init_loadpath(); 37 33 ruby_script("torment");
