Mercurial > hg > anonet-resdb
changeset 208:75f00d7147fb draft
Merge branch 'master' of git://git1.somerandomnick.ano
| author | Ivo Smits <Ivo@UCIS.nl> |
|---|---|
| date | Fri, 15 Oct 2010 17:30:05 +0200 |
| parents | 4c10fc3cdffc (current diff) bb91561cd116 (diff) |
| children | 4d124cf937b2 |
| files | |
| diffstat | 2 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/www.anonet2.org/public_pod/faq.pod Fri Oct 15 15:00:09 2010 +0200 +++ b/doc/www.anonet2.org/public_pod/faq.pod Fri Oct 15 17:30:05 2010 +0200 @@ -76,17 +76,18 @@ =item What is peering all about? -AnoNet is an internet. An internet means an internetwork, or a network -that connects between networks. An internetwork is normally constructed -by making links between the different networks, and then carrying -internetwork traffic along those links. (If network A has a link to -network B, then traffic from A to B or from B to A should probably pass -through that link.) Such a link is called a "peering," and the two -sides of that link are called "peers." On the IcannNet, peerings are -normally done over leased lines, but due to the nature of AnoNet, using -leased lines isn't much of an option for most peerings. Therefore, most -peerings are done over tunnels on the IcannNet. The most common software -for AnoNet tunnels is OpenVPN, although tinc and quicktuns are also used. +AnoNet is an internet. An internet means an internetwork, or a +network that connects between networks. An internetwork is normally +constructed by making links between the different networks, and then +carrying internetwork traffic along those links. (If network A has +a link to network B, then traffic from A to B or from B to A should +probably pass through that link.) Such a link is called a "peering," +and the two sides of that link are called "peers." On the IcannNet, +peerings are normally done over leased lines, but due to the nature of +AnoNet, using leased lines isn't much of an option for most peerings. +Therefore, most peerings are done over tunnels on the IcannNet. +The most common software for AnoNet tunnels is OpenVPN, although +tinc and L<quicktun|http://wiki.qontrol.nl/QuickTun> are also used. (tinc in particular deserves special attention: it can create a mesh between participants, sacrificing anonymity to achieve lower latency.)
--- a/doc/www.anonet2.org/public_pod/index.pod Fri Oct 15 15:00:09 2010 +0200 +++ b/doc/www.anonet2.org/public_pod/index.pod Fri Oct 15 17:30:05 2010 +0200 @@ -41,8 +41,7 @@ =back -If you're feeling adventurous enough to connect, L<UFO has a client -port|http://ix.ucis.nl/clientport.php>. +If you're feeling adventurous enough to connect at the IP level, L<UFO has a client port|http://ix.ucis.nl/clientport.php>. Once you're online, you can reconnect to IRC from inside AnoNet: