summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2008-04-15 16:57:30 +0000
committerChristian Pointner <equinox@anytun.org>2008-04-15 16:57:30 +0000
commit0ce5ffab5fb24d136053f5c72ce7b6def91439e8 (patch)
treeb01452da1932eb9b256d7cd1dcd63d3fe13cd67e /src
parentfixed Makefile for man (diff)
fixed some typos @ print help
added
Diffstat (limited to 'src')
-rw-r--r--src/anyConfOptions.cpp19
-rw-r--r--src/anyCtrOptions.cpp14
-rw-r--r--src/man/Makefile11
-rw-r--r--src/man/anytun.8.txt2
-rw-r--r--src/options.cpp4
5 files changed, 29 insertions, 21 deletions
diff --git a/src/anyConfOptions.cpp b/src/anyConfOptions.cpp
index bde873a..88c70f9 100644
--- a/src/anyConfOptions.cpp
+++ b/src/anyConfOptions.cpp
@@ -169,16 +169,15 @@ bool Options::parse(int argc, char* argv[])
void Options::printUsage()
{
std::cout << "USAGE:" << std::endl;
- std::cout << "anytun-config" << std::endl;
- std::cout << " [-h|--help] prints this..." << std::endl;
- std::cout << " [-r|--remote-host] <hostname|ip> remote host" << std::endl;
- std::cout << " [-o|--remote-port] <port> remote port" << std::endl;
- std::cout << " [-w|--window-size] <window size> seqence number window size" << std::endl;
- std::cout << " [-m|--mux] <mux-id> the multiplex id to use" << std::endl;
- std::cout << " [-K|--key] <master key> master key to use for encryption" << std::endl;
- std::cout << " [-A|--salt] <master salt> master salt to use for encryption" << std::endl;
-// std::cout << " [-k|--kd-prf] <kd-prf type> key derivation pseudo random function" << std::endl;
- std::cout << " [-R|--route] <net/prefix length> add a route to connection, can be invoked several times" << std::endl;
+ std::cout << "anytun-config [-h|--help] prints this..." << std::endl;
+ std::cout << " [-r|--remote-host] <hostname|ip> remote host" << std::endl;
+ std::cout << " [-o|--remote-port] <port> remote port" << std::endl;
+ std::cout << " [-w|--window-size] <window size> seqence number window size" << std::endl;
+ std::cout << " [-m|--mux] <mux-id> the multiplex id to use" << std::endl;
+ std::cout << " [-K|--key] <master key> master key to use for encryption" << std::endl;
+ std::cout << " [-A|--salt] <master salt> master salt to use for encryption" << std::endl;
+// std::cout << " [-k|--kd-prf] <kd-prf type> key derivation pseudo random function" << std::endl;
+ std::cout << " [-R|--route] <net>/<prefix length> add a route to connection, can be invoked several times" << std::endl;
}
void Options::printOptions()
diff --git a/src/anyCtrOptions.cpp b/src/anyCtrOptions.cpp
index 4f03031..70568a5 100644
--- a/src/anyCtrOptions.cpp
+++ b/src/anyCtrOptions.cpp
@@ -169,13 +169,13 @@ bool Options::parse(int argc, char* argv[])
void Options::printUsage()
{
std::cout << "USAGE:" << std::endl;
- std::cout << "anytun-controld [-h|--help] prints this..." << std::endl;
- std::cout << " [-D|--nodaemonize] don't run in background" << std::endl;
- std::cout << " [-C|--chroot] chroot and drop privileges" << std::endl;
- std::cout << " [-u|--username] if chroot change to this user" << std::endl;
- std::cout << " [-H|--chroot-dir] chroot to this directory" << std::endl;
- std::cout << " [-P|--write-pid] write pid to this file" << std::endl;
- std::cout << " [-f|--file] <path> path to file" << std::endl;
+ std::cout << "anytun-controld [-h|--help] prints this..." << std::endl;
+ std::cout << " [-D|--nodaemonize] don't run in background" << std::endl;
+ std::cout << " [-C|--chroot] chroot and drop privileges" << std::endl;
+ std::cout << " [-u|--username] <username> if chroot change to this user" << std::endl;
+ std::cout << " [-H|--chroot-dir] <path> chroot to this directory" << std::endl;
+ std::cout << " [-P|--write-pid] <path> write pid to this file" << std::endl;
+ std::cout << " [-f|--file] <path> path to file" << std::endl;
}
diff --git a/src/man/Makefile b/src/man/Makefile
index 3a1bc4c..ad5c5d5 100644
--- a/src/man/Makefile
+++ b/src/man/Makefile
@@ -3,7 +3,16 @@ all: manpage
anytun.8: anytun.8.txt
a2x -f manpage anytun.8.txt
-manpage: anytun.8
+anytun-controld.8: anytun-controld.8.txt
+ a2x -f manpage anytun-controld.8.txt
+
+anytun-config.8: anytun-config.8.txt
+ a2x -f manpage anytun-config.8.txt
+
+
+manpage: anytun.8 anytun-controld.8 anytun-config.8
clean:
rm -f anytun.8 anytun.8.xml
+ rm -f anytun-controld.8 anytun-controld.8.xml
+ rm -f anytun-config.8 anytun-config.8.xml \ No newline at end of file
diff --git a/src/man/anytun.8.txt b/src/man/anytun.8.txt
index 1de30bf..27a0a3d 100644
--- a/src/man/anytun.8.txt
+++ b/src/man/anytun.8.txt
@@ -316,7 +316,7 @@ the developers know at satp@anytun.org. Of course, patches are preferred.
SEE ALSO
--------
-anytun-config(8), anytun-controld(8), anytun-showtables(8)
+anytun-config(8), anytun-controld(8)
AUTHORS
-------
diff --git a/src/options.cpp b/src/options.cpp
index 809dee1..3b7e468 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -216,8 +216,8 @@ void Options::printUsage()
std::cout << " [-D|--nodaemonize] don't run in background" << std::endl;
std::cout << " [-C|--chroot] chroot and drop privileges" << std::endl;
std::cout << " [-u|--username] <username> if chroot change to this user" << std::endl;
- std::cout << " [-H|--chroot-dir] <directory> chroot to this directory" << std::endl;
- std::cout << " [-P|--write-pid] <filename> write pid to this file" << std::endl;
+ std::cout << " [-H|--chroot-dir] <path> chroot to this directory" << std::endl;
+ std::cout << " [-P|--write-pid] <path> write pid to this file" << std::endl;
std::cout << " [-s|--sender-id ] <sender id> the sender id to use" << std::endl;
std::cout << " [-i|--interface] <ip-address> local anycast ip address to bind to" << std::endl;
std::cout << " [-p|--port] <port> local anycast(data) port to bind to" << std::endl;