From 958ec8d4fba8a077731baa956e45ea551e637e73 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Mon, 9 Sep 2002 04:10:58 +0000 Subject: port to actual BSD (hey nick, does this break the os x build?) you still need to add some stuff to the ./configure commandline... anybody know a better solution? svn:r101 --- HACKING | 2 +- README | 7 ++++++- configure.in | 4 ++-- src/config/routers.or | 12 ++++++------ src/httpap/http.c | 10 +++++++++- src/httpap/httpap.c | 10 +++++++++- src/or/or.h | 2 +- src/smtpap/smtpap.c | 10 +++++++++- 8 files changed, 43 insertions(+), 14 deletions(-) diff --git a/HACKING b/HACKING index d6078f33c..77f66201f 100644 --- a/HACKING +++ b/HACKING @@ -8,7 +8,7 @@ Read the README file first, so you can get familiar with the basics. 1. The pieces. -1.1. Routers. Onion routers, as far as the 'tor' program is concerned, +1.1. Routers. Onion routers, as far as the 'or' program is concerned, are a bunch of data items that are loaded into the router_array when the program starts. After it's loaded, the router information is never changed. When a new OR connection is started (see below), the relevant diff --git a/README b/README index b8f56f4d8..a53fc9c17 100644 --- a/README +++ b/README @@ -16,7 +16,12 @@ If you got the source from a tarball: Run ./configure and make as usual. There isn't much point in 'make install' yet. -If this doesn't work for you: +If this doesn't work for you / troubleshooting: + + If you couldn't find popt (eg you're on BSD), try + CPPFLAGS="-I/usr/local/include" LDFLAGS="-L/usr/local/lib" \ + ./configure + rather than simply ./configure. Check out the list archives at http://archives.seul.org/or/dev/ and see if somebody else has reported your problem. If not, please subscribe diff --git a/configure.in b/configure.in index ac1bcef04..e357b2f4e 100644 --- a/configure.in +++ b/configure.in @@ -15,8 +15,8 @@ AC_PROG_CC AC_PROG_MAKE_SET AC_PROG_RANLIB -AC_DEFINE([HAVE_OPENSSL], 0, [Define if OpenSSL was found.]) -AC_DEFINE([HAVE_POPT], 0, [Define if popt was found.]) +dnl AC_DEFINE([HAVE_OPENSSL], 0, [Define if OpenSSL was found.]) +dnl AC_DEFINE([HAVE_POPT], 0, [Define if popt was found.]) AC_CHECK_LIB(popt,poptParseArgvString, AC_DEFINE(HAVE_POPT), diff --git a/src/config/routers.or b/src/config/routers.or index 06520ce87..a9d8f3bda 100644 --- a/src/config/routers.or +++ b/src/config/routers.or @@ -4,7 +4,7 @@ # router-port is where the router is accepting connections from other routers. # Router 1 -moria.mit.edu 9001 10240 10240 +moria.mit.edu 9001 102400 10240 -----BEGIN RSA PUBLIC KEY----- MIGJAoGBAMBBuk1sYxEg5jLAJy86U3GGJ7EGMSV7yoA6mmcsEVU3pwTUrpbpCmwS 7BvovoY3z4zk63NZVBErgKQUDkn3pp8n83xZgEf4GI27gdWIIwaBjEimuJlEY+7K @@ -12,7 +12,7 @@ nZ7kVMRoiXCbjL6VAtNa4Zy1Af/GOm0iCIDpholeujQ95xew7rQnAgMA//8= -----END RSA PUBLIC KEY----- # Router 2 -moria.mit.edu 9002 10240 10240 +moria.mit.edu 9002 102400 10240 -----BEGIN RSA PUBLIC KEY----- MIGJAoGBANX/HHRuudz274MFSQ4manX8DhtsIuogNUyco9/0dr+XsfioTGd3RgMj aSWlD87arkZO4hHBPHe0q89Z3s1UtUsyQ/VmsxSv9g2OCnF/dU2Nz4h6+Al3iNJF @@ -20,28 +20,28 @@ aSWlD87arkZO4hHBPHe0q89Z3s1UtUsyQ/VmsxSv9g2OCnF/dU2Nz4h6+Al3iNJF -----END RSA PUBLIC KEY----- # Router 3 -moria.mit.edu 9003 10240 10240 +moria.mit.edu 9003 102400 10240 -----BEGIN RSA PUBLIC KEY----- MIGJAoGBAJfkNWCaNkYIRwfHT06KBU6dz8W1xDpW5ezGJwAOoxCX3/ZNoUicb/1V oB3OzW6VxWIiht3da/3K0ywiBOOCcf6BabKoMdiPpH7NIeu6XRmBYK2uqW13gBgh xJbQBb58Nx8Fr05XkvLG6i+vTDY3MZOW3E2/DwSe/jFzuHSD5b3nAgMA//8= -----END RSA PUBLIC KEY----- -town-square.reputation.com 9004 10240 10240 +town-square.reputation.com 9004 102400 10240 -----BEGIN RSA PUBLIC KEY----- MIGJAoGBAKD2BDZQpGq/aAbZ7t+/7qktZVEbhUGe097gIjWH9gXcIOIm0CJMe3rN MsBJsQMi5Uwqrz+Invb5n6bswrNlJp/bCKBhGTvUCfxg7c8xZy71PPSIPnTg1qXl p5fyAkgCYkZNgEEZzQDHv1GRvLCs92kURjSJE5y8QU0dXfbzms8PAgMA//8= -----END RSA PUBLIC KEY----- -moria.mit.edu 9004 10240 10240 +moria.mit.edu 9004 102400 10240 -----BEGIN RSA PUBLIC KEY----- MIGJAoGBAKD2BDZQpGq/aAbZ7t+/7qktZVEbhUGe097gIjWH9gXcIOIm0CJMe3rN MsBJsQMi5Uwqrz+Invb5n6bswrNlJp/bCKBhGTvUCfxg7c8xZy71PPSIPnTg1qXl p5fyAkgCYkZNgEEZzQDHv1GRvLCs92kURjSJE5y8QU0dXfbzms8PAgMA//8= -----END RSA PUBLIC KEY----- -mosg.cl.cam.ac.uk 9005 10240 10240 +mosg.cl.cam.ac.uk 9005 102400 10240 -----BEGIN RSA PUBLIC KEY----- MIGJAoGBAMMHEjhhawM6S14ETFVcvByU7D/baN2JMcCweKKJ7zcSurDnpgRH/Uo7 05+bZE3BCy4OkAqQbGlKd/ejBOuXjEtS0mJo5xwDX9StKguhgFRk60hhrF2OFJm4 diff --git a/src/httpap/http.c b/src/httpap/http.c index 9dab57aa9..a219d815c 100644 --- a/src/httpap/http.c +++ b/src/httpap/http.c @@ -8,6 +8,14 @@ /* * Changes : * $Log$ + * Revision 1.3 2002/09/09 04:10:58 arma + * port to actual BSD + * + * (hey nick, does this break the os x build?) + * + * you still need to add some stuff to the ./configure commandline... + * anybody know a better solution? + * * Revision 1.2 2002/08/24 07:56:22 arma * proxies send port in host order as ascii string * @@ -32,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/httpap/httpap.c b/src/httpap/httpap.c index 42801caef..3e5700cb8 100644 --- a/src/httpap/httpap.c +++ b/src/httpap/httpap.c @@ -8,6 +8,14 @@ /* * Changes : * $Log$ + * Revision 1.8 2002/09/09 04:10:58 arma + * port to actual BSD + * + * (hey nick, does this break the os x build?) + * + * you still need to add some stuff to the ./configure commandline... + * anybody know a better solution? + * * Revision 1.7 2002/09/03 18:44:23 nickm * Port to MacOS X * @@ -59,7 +67,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/or/or.h b/src/or/or.h index ec54c937e..6b473b7d6 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/smtpap/smtpap.c b/src/smtpap/smtpap.c index ae3ad5d1e..7efabccf2 100644 --- a/src/smtpap/smtpap.c +++ b/src/smtpap/smtpap.c @@ -8,6 +8,14 @@ /* * Changes : * $Log$ + * Revision 1.5 2002/09/09 04:10:58 arma + * port to actual BSD + * + * (hey nick, does this break the os x build?) + * + * you still need to add some stuff to the ./configure commandline... + * anybody know a better solution? + * * Revision 1.4 2002/09/03 18:44:24 nickm * Port to MacOS X * @@ -128,7 +136,7 @@ #include #include #include -#include +#include #include #include #include -- cgit v1.2.3