diff options
author | Roger Dingledine <arma@torproject.org> | 2003-10-21 09:49:39 +0000 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2003-10-21 09:49:39 +0000 |
commit | 0e137e413f48dcbd54c80b4083df75fb39068e13 (patch) | |
tree | 51fe8f0faa982c48a3d5c3e3be5d3f41f1a0b1c0 | |
parent | 069227db5b2be6af84ff2f225234f8485d2295f6 (diff) | |
download | tor-0e137e413f48dcbd54c80b4083df75fb39068e13.tar tor-0e137e413f48dcbd54c80b4083df75fb39068e13.tar.gz |
APPort is now SocksPort
svn:r644
-rw-r--r-- | doc/FAQ | 3 | ||||
-rw-r--r-- | doc/tor-spec.txt | 4 | ||||
-rw-r--r-- | src/config/moria1-orrc | 1 | ||||
-rw-r--r-- | src/config/moria2-orrc | 1 | ||||
-rw-r--r-- | src/config/moria3-orrc | 1 | ||||
-rw-r--r-- | src/config/sample-server-torrc.in | 2 | ||||
-rw-r--r-- | src/config/torrc.in | 2 |
7 files changed, 5 insertions, 9 deletions
@@ -48,9 +48,8 @@ for you.] The same executable ("or") functions as both client and server, depending on which ports are specified in the configuration file. You can specify: -* APPort: client applications (eg privoxy, Mozilla) can speak socks to +* SocksPort: client applications (eg privoxy, Mozilla) can speak socks to this port. -* OPPort: onion proxies (client onion routers) connect to this port. * ORPort: other onion routers connect to this port * DirPort: onion proxies and onion routers speak http to this port, to pull down a directory of which nodes are currently available. diff --git a/doc/tor-spec.txt b/doc/tor-spec.txt index 5536a1c76..7a0542afb 100644 --- a/doc/tor-spec.txt +++ b/doc/tor-spec.txt @@ -442,7 +442,7 @@ which reveals the downstream node. (Unless otherwise noted, tokens on the same line are space-separated.) Router ::= Router-Line Date-Line Onion-Key Link-Key Signing-Key Exit-Policy Router-Signature NL -Router-Line ::= "router" nickname address ORPort APPort DirPort bandwidth NL +Router-Line ::= "router" nickname address ORPort SocksPort DirPort bandwidth NL Date-Line ::= "published" YYYY-MM-DD HH:MM:SS NL Onion-key ::= "onion-key" NL a public key in PEM format NL Link-key ::= "link-key" NL a public key in PEM format NL @@ -454,7 +454,7 @@ Signature ::= "-----BEGIN SIGNATURE-----" NL Base-64-encoded-signature NL "-----END SIGNATURE-----" NL ORport ::= port where the router listens for routers/proxies (speaking cells) -APPort ::= where the router listens for applications (speaking socks) +SocksPort ::= where the router listens for applications (speaking socks) DirPort ::= where the router listens for directory download requests bandwidth ::= maximum bandwidth, in bytes/s diff --git a/src/config/moria1-orrc b/src/config/moria1-orrc index b4a88c690..8ba5ad45a 100644 --- a/src/config/moria1-orrc +++ b/src/config/moria1-orrc @@ -3,7 +3,6 @@ DataDirectory moria1 Nickname moria1 ORPort 9001 -APPort 9021 DirPort 9031 OnionRouter 1 diff --git a/src/config/moria2-orrc b/src/config/moria2-orrc index 33353d56d..aa956c0a1 100644 --- a/src/config/moria2-orrc +++ b/src/config/moria2-orrc @@ -3,7 +3,6 @@ DataDirectory moria2 Nickname moria2 ORPort 9002 -APPort 9022 DirPort 9032 OnionRouter 1 diff --git a/src/config/moria3-orrc b/src/config/moria3-orrc index d1e34d6e7..3610cd28a 100644 --- a/src/config/moria3-orrc +++ b/src/config/moria3-orrc @@ -3,7 +3,6 @@ DataDirectory moria3 Nickname moria3 ORPort 9003 -APPort 9023 DirPort 9033 OnionRouter 1 diff --git a/src/config/sample-server-torrc.in b/src/config/sample-server-torrc.in index a53058989..59a88460a 100644 --- a/src/config/sample-server-torrc.in +++ b/src/config/sample-server-torrc.in @@ -10,7 +10,7 @@ Address moria.seul.org # Ports for various services. Comment out or set to 0 if you're not # offering that service. ORPort 9004 # listening for cell-speaking connections -APPort 9024 # listening for socks-speaking connections +SocksPort 9024 # listening for socks-speaking connections #DirPort 0 # Leave this set, or we'll be treated like a client. diff --git a/src/config/torrc.in b/src/config/torrc.in index 361840e4e..1208a3624 100644 --- a/src/config/torrc.in +++ b/src/config/torrc.in @@ -8,5 +8,5 @@ RouterFile @CONFDIR@/dirservers # Ports for various services. Comment out if you're not running that # service. #ORPort 9001 -APPort 9050 +SocksPort 9050 |