summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/afclient.117
-rw-r--r--doc/afclient.conf.517
-rw-r--r--doc/afclient_example.conf6
-rw-r--r--doc/afserver.15
-rw-r--r--doc/afserver.conf.53
-rw-r--r--doc/afserver_example.conf1
-rw-r--r--doc/en/README56
7 files changed, 15 insertions, 90 deletions
diff --git a/doc/afclient.1 b/doc/afclient.1
index 677ec7a..fc3fa7d 100644
--- a/doc/afclient.1
+++ b/doc/afclient.1
@@ -140,23 +140,6 @@ is running (required)
.B -L, --Load
load a module for service's packets filtering
-.I HTTP/HTTPS PROXY
-
-.B -S, --use-https
- use https proxy instead of http proxy
-
-.B -P, --proxyname
- the name of the machine with proxy server
-
-.B -X, --proxyport
- the port used by proxy server (default: 8080)
-
-.B -C, --pa-cred U:P
- the user (U) and password (P) used in proxy authorization
-
-.B -B, --pa-t-basic
- the Basic type of proxy authorization (default)
-
.SH "REMOTE ADMINISTRATION"
Remote administration mode is enabled by
diff --git a/doc/afclient.conf.5 b/doc/afclient.conf.5
index 4f8a5c6..903be32 100644
--- a/doc/afclient.conf.5
+++ b/doc/afclient.conf.5
@@ -20,7 +20,7 @@ are ignored. Options from configuration file are taken before values from comman
.IR --storefile ,
.IR --dateformat ,
.IR --ignorepkeys
-and the options connected with http proxy and auto-reconnect support). When something is not declared, hard-coded values are used.
+and the options connected with auto-reconnect support). When something is not declared, hard-coded values are used.
.SH DESCRIPTION
.B Afclient
@@ -118,21 +118,6 @@ is running
.B Load FILE
load a module for service's packets filtering
-.B use-https
- use https proxy instead of http proxy
-
-.B proxyname NAME
- the name of the machine with proxy server
-
-.B proxyport PORT
- the port used by proxy server (default: 8080)
-
-.B pa-cred U:P
- the user (U) and password (P) used in proxy authorization
-
-.B pa-t-basic
- the Basic type of proxy authorization (default)
-
.SH "SEE ALSO"
.BR afserver.conf (5),
diff --git a/doc/afclient_example.conf b/doc/afclient_example.conf
index d336ce3..aef4078 100644
--- a/doc/afclient_example.conf
+++ b/doc/afclient_example.conf
@@ -46,9 +46,3 @@
#load usermodule #load a module for user's packets filtering
#Load servicemodule #load a module for service's packets filtering
-
-#use-https #use https proxy instead of http proxy
-#proxyname httpproxy #the name of the machine with proxy server
-#proxyport 8080 #the port used by proxy server (default: 8080)
-#pa-cred user:password #the user (U) and password (P) used in proxy authorization
-#pa-t-basic #the Basic type of proxy authorization (default)
diff --git a/doc/afserver.1 b/doc/afserver.1
index 887d79b..a4fa66e 100644
--- a/doc/afserver.1
+++ b/doc/afserver.1
@@ -129,11 +129,6 @@ connects to it (default: 50126)
.B -6, --ipv6
use ipv6 only
-.I HTTP PROXY
-
-.B -P, --enableproxy
- enable http proxy mode
-
.SH "REMOTE ADMINISTRATION"
Currently available commands are:
diff --git a/doc/afserver.conf.5 b/doc/afserver.conf.5
index c62e105..51090c1 100644
--- a/doc/afserver.conf.5
+++ b/doc/afserver.conf.5
@@ -116,9 +116,6 @@ commands.
.B ipv6
use ipv6 only
-.B enableproxy
- enable http proxy mode
-
.SH "SEE ALSO"
.BR afclient.conf (5),
diff --git a/doc/afserver_example.conf b/doc/afserver_example.conf
index 8bdafa6..02f920d 100644
--- a/doc/afserver_example.conf
+++ b/doc/afserver_example.conf
@@ -46,7 +46,6 @@ manageport 50126 #portnumber on which server is listening for afclient
#dnslookups #try to obtain dns names of the computers
#ipv4 #use ipv4 only
#ipv6 #use ipv6 only
-#enableproxy #enable http proxy mode
#cacerfile filename #the name of the file with CA certificates
# (if used, require clients to have valid certificates)
#cerdepth #the maximum depth of valid certificate-chains
diff --git a/doc/en/README b/doc/en/README
index e9f5b20..a1952f4 100644
--- a/doc/en/README
+++ b/doc/en/README
@@ -36,14 +36,13 @@ INTRO
3.3.1 Users
3.3.2 Clients
3.4 Relay mode
-4. HTTP PROXY TUNNELS
-5. LOGGING
-6. MODULES
-7. MULTI TUNNELS
-8. EXAMPLES
- 8.1 tcp mode
- 8.2 reverse udp mode
-9. BUGS/PROBLEMS
+4. LOGGING
+5. MODULES
+6. MULTI TUNNELS
+7. EXAMPLES
+ 7.1 tcp mode
+ 7.2 reverse udp mode
+8. BUGS/PROBLEMS
NOTES
@@ -177,10 +176,6 @@ Multiple clients allow to create more sophisticated tunneling scheme.
-4, --ipv4 - use ipv4 only
-6, --ipv6 - use ipv6 only
- HTTP PROXY:
-
- -P, --enableproxy - enable http proxy mode
-
2.2 afclient
------------
@@ -261,15 +256,6 @@ Multiple clients allow to create more sophisticated tunneling scheme.
-l, --load - load a module for user's packets filtering
-L, --Load - load a module for service's packets filtering
- HTTP/HTTPS PROXY:
-
- -S, --use-https - use https proxy instead of http proxy
- -P, --proxyname - the name of the machine with proxy server
- -X, --proxyport - the port used by proxy server (default: 8080)
- -C, --pa-cred U:P - the user (U) and password (P) used in proxy
- authorization
- -B, --pa-t-basic - the Basic type of proxy authorization (default)
-
================================================================================
@@ -397,22 +383,8 @@ When user quits (close the connection or send 'quit' command), afclient exits.
================================================================================
-=====================
-4. HTTP PROXY TUNNELS
-=====================
-
-Afclient can communicate with afserver via HTTP proxy. In order to use this
-feature, afserver must be started with '-P, --enableproxy' option. Afclient must
-specify the proxy host ('-P, --proxyname' option) and port ('-X, --proxyport'
-option).
-
-Afclient with HTTP proxy mode enabled can still accept connections from
-afclients, which don't use HTTP proxy mode.
-
-================================================================================
-
==========
-5. LOGGING
+4. LOGGING
==========
Logging can be enabled by '-o, --log' option. The argument to this option must
@@ -448,7 +420,7 @@ Where
================================================================================
==========
-6. MODULES
+5. MODULES
==========
Afclient can use external modules for user's packets filtering ('-l, --load')
@@ -525,7 +497,7 @@ Modules have to be compiled with '-fPIC -shared' options.
================================================================================
================
-7. MULTI TUNNELS
+6. MULTI TUNNELS
================
Since version 0.8 it's possible to transfer multiple tunnels in the one
@@ -542,10 +514,10 @@ transferred to the destination pointed by the second '-p' option.
================================================================================
===========
-8. EXAMPLES
+7. EXAMPLES
===========
- 8.1 tcp mode
+ 7.1 tcp mode
------------
local network |FireWall| Internet
@@ -594,7 +566,7 @@ on our computer and we are behind a masquerade or a firewall:
6) We can now enter with a web-browser to: <name of the server>:50127 and we
will enter to our computer in the fact.
- 8.2 reverse udp mode
+ 7.2 reverse udp mode
--------------------
local network |FireWall| Internet
@@ -633,7 +605,7 @@ server on our computer (udp port 27960 on our machine):
================================================================================
================
-9. BUGS/PROBLEMS
+8. BUGS/PROBLEMS
================
There are no known/open bugs at the moment.