Commit 155c9b80 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

onion proxy now speaks socks4a 

httpap is obsolete; we support privoxy directly now!

smtpap is obsolete; need to find a good socks4a-enabled smtp proxy/client

I dub thee 0.0.1.


svn:r107
parent 8d1aa27c

HACKING

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ a type, or "command", which indicates what it's for. 
3.1. Role.





3. Robustness features.

4. Robustness features.



4.1. Bandwidth throttling. Each cell-speaking connection has a maximum

bandwidth it can use, as specified in the routers.or file. Bandwidth

README

+23 −22
Original line number Diff line number Diff line 


Dependencies:



  You're going to need openssl (0.9.5 or later) and popt (1.6 or later).

  If you're on Linux, everything will probably work fine. OS X and BSD

  (but see below under troubleshooting) now work too. Let us know if

  you get it working elsewhere.

  You're going to need Privoxy (www.privoxy.org) installed, and configured

  to point at a socks4a proxy -- see below.



  For tor itself, you're going to need openssl (0.9.5 or later) and popt

  (1.6 or later). If you're on Linux, everything will probably work

  fine. OS X and BSD (but see below under troubleshooting) now work

  too. Let us know if you get it working elsewhere.



If you got the source from cvs:
@@ -31,11 +34,9 @@ If this doesn't work for you / troubleshooting: 


Once you've got it compiled:



  It's a bit hard to figure out what to do with the binaries. If you

  want to run a local onion proxy (that is, you're a user, not a node

  operator), go into src/config and look at the oprc file. You can run an

  onion proxy by "../or/or -f oprc". In another window, run something like

  "../httpap/httpap -f httpaprc2 -p 9051". See below for how to use it.

  If you want to run a local onion proxy (that is, you're a user, not a

  node operator), go into src/config and look at the oprc file. You can

  run an onion proxy by "../or/or -f oprc". See below for how to use it.



  If you want to set up your own test network (that is, act like you're

  a full set of node operators), go into src/config/ and look at the
@@ -48,24 +49,24 @@ Once you've got it compiled: 
  network. I recommend using a screen session (man screen), or some

  other way to handle many windows at once. I open a window for each

  onion router, go into the src/config directory, and run something like

  "../or/or -f moria2-orrc". In yet another window, I run something like

  "../httpap/httpap -f httpaprc -p 9051". 

  "../or/or -f moria2-orrc".



How to use it:



  From here, you can point your browser/etc at localhost:9051 and treat

  it as a web proxy. As a first test, you might telnet to it and enter

  "GET http://seul.org/ HTTP/1.0" (without the quotes), followed by a pair

  of carriage returns (one to separate your request from the headers,

  and another to indicate that you're providing no headers). For more

  convenient command-line use, I recommend making a ~/.wgetrc with

  the line

    http_proxy=localhost:9051

  Download privoxy (www.privoxy.org). Install it. Add the following

  line to your 'config' file:

    forward-socks4a / localhost:9050 .

  Don't forget the . at the end.



  From here, you can point your browser/etc at localhost:8118 and your

  traffic will go through Privoxy, then through the onion proxy, to the

  onion routing network.



  For more convenient command-line use, I recommend making a ~/.wgetrc

  with the line

    http_proxy=localhost:8118

  Then you can do things like "wget seul.org" and watch as it downloads

  from the onion routing network.

  (You can set your Mozilla/etc to use localhost:9051 as a proxy, and it

  will work -- but it will work even better if you tell your Mozilla to

  speak only HTTP 1.0 (the http proxy we include doesn't do 1.1 yet.))



  For fun, you can wget a very large file (a megabyte or more), and

  then ^z the wget a little bit in. The onion routers will continue

configure.in

+2 −2
Original line number Diff line number Diff line 


AC_INIT

AM_INIT_AUTOMAKE(tor, 0.0.0)

AM_INIT_AUTOMAKE(tor, 0.0.1)

AM_CONFIG_HEADER(orconfig.h)



CFLAGS="-Wall -O2"
@@ -143,5 +143,5 @@ dnl The warning message here is no longer strictly accurate. 


AC_CHECK_HEADERS(unistd.h string.h signal.h netdb.h ctype.h poll.h sys/poll.h sys/types.h sys/fcntl.h sys/ioctl.h sys/socket.h sys/time.h netinet/in.h arpa/inet.h errno.h assert.h stdint.h, , AC_MSG_WARN(some headers were not found, compilation may fail))



AC_OUTPUT(Makefile src/Makefile src/common/Makefile src/smtpap/Makefile src/orkeygen/Makefile src/httpap/Makefile src/or/Makefile)

AC_OUTPUT(Makefile src/Makefile src/common/Makefile src/orkeygen/Makefile src/or/Makefile)

src/Makefile.am

+2 −2
Original line number Diff line number Diff line 


# leave in dependency order, since common must be built first



SUBDIRS =      common smtpap orkeygen httpap or

DIST_SUBDIRS = common smtpap orkeygen httpap or

SUBDIRS =      common orkeygen or

DIST_SUBDIRS = common orkeygen or

EXTRA_DIST = config

src/or/connection.c

+0 −2
Original line number Diff line number Diff line
@@ -117,8 +117,6 @@ void connection_free(connection_t *conn) { 
    free(conn->address);

  if(conn->dest_addr)

    free(conn->dest_addr);

  if(conn->dest_port)

    free(conn->dest_port);



  if(connection_speaks_cells(conn)) {

    if (conn->f_crypto)