APPort is now SocksPort

svn:r644

diff --git a/doc/FAQ b/doc/FAQ
index 87a70719d1f144bb44f0b27a51f686af909ac0c4..e0bf40a6c2f2adda595a5ed685a899d2c6e1bf94 100644 (file)
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -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 5536a1c76b49a2cf135ce3d6ad71ed1cd1531ccf..7a0542afb5f1d17efba595eb5a9865cf084a79da 100644 (file)
--- 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 b4a88c6902400e1c4a6396b17614abcf75eb6f8f..8ba5ad45a41f9defee0baa6c58a735a22ce0c2b8 100644 (file)
--- 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 33353d56dce602679e4f25d6ce74017c5744e7d5..aa956c0a122f0e89fe8b6e11f2cceed0787399c3 100644 (file)
--- 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 d1e34d6e797b99e848e90e6d6bf54c49f0984083..3610cd28a5cb06ac400d52c835db42ef3145e415 100644 (file)
--- 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 a53058989883cea8c7709c2521c97ff5bcbd4667..59a88460a1fa9d7c15e5e1db2b563017c965582f 100644 (file)
--- 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 361840e4e5a3cf7dc57997c7d9ecd330b9535d29..1208a36248e17e1903c96f38e5e90cbd27b5a117 100644 (file)
--- 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