diff options
author | Christian Pointner <equinox@anytun.org> | 2009-01-02 14:53:30 +0000 |
---|---|---|
committer | Christian Pointner <equinox@anytun.org> | 2009-01-02 14:53:30 +0000 |
commit | 1eb9f3816376de7959e2ac7bd526510da4033b3d (patch) | |
tree | 33b28579054970e8d6c1e0ccc4f960efc6be605b | |
parent | allways write exceptions to log (diff) |
changed -R|--route to -T|--route because -R was already taken
added a file containing all used letters for command line
-rw-r--r-- | cmd-option-letters | 53 | ||||
-rw-r--r-- | src/anyConfOptions.cpp | 4 | ||||
-rw-r--r-- | src/man/anytun-config.8.txt | 4 | ||||
-rw-r--r-- | src/man/anytun.8.txt | 4 | ||||
-rw-r--r-- | src/options.cpp | 4 |
5 files changed, 61 insertions, 8 deletions
diff --git a/cmd-option-letters b/cmd-option-letters new file mode 100644 index 0000000..0d3b89c --- /dev/null +++ b/cmd-option-letters @@ -0,0 +1,53 @@ +a: auth algo +b: +c: cipher +d: device name +e: +f: +g: +h: print help text +i: local interface +j: +k: kd prf +l: ld_kdr +m: mux +n: ifconfig +o: remote port +p: local port +q: +r: remote host +s: sender id +t: device type +u: username when chroot +v: +w: window size +x: post up script +y: +z: + +A: master salt +B: +C: run in chroot +D: do not daemonize +E: +F: +G: +H: chroot direcotry +I: local sync interface +J: +K: master key +L: +M: sync hosts +N: +O: remote sync port +P: write pid file +Q: +R: remote sync host +S: local sync port +T: route +U: +V: +W: +X: control host +Y: +Z: diff --git a/src/anyConfOptions.cpp b/src/anyConfOptions.cpp index f768e54..0cc0c7c 100644 --- a/src/anyConfOptions.cpp +++ b/src/anyConfOptions.cpp @@ -149,7 +149,7 @@ bool Options::parse(int argc, char* argv[]) PARSE_HEXSTRING_PARAM_SEC("-K","--key", key_) PARSE_HEXSTRING_PARAM_SEC("-A","--salt", salt_) PARSE_SCALAR_PARAM("-k","--kd-prf", kd_prf_) - PARSE_CSLIST_PARAM("-R","--route", route_queue) + PARSE_CSLIST_PARAM("-T","--route", route_queue) else return false; } @@ -179,7 +179,7 @@ void Options::printUsage() 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 << " [-T|--route] <net>/<prefix length> add a route to connection, can be invoked several times" << std::endl; } void Options::printOptions() diff --git a/src/man/anytun-config.8.txt b/src/man/anytun-config.8.txt index 5f0f2db..258bec8 100644 --- a/src/man/anytun-config.8.txt +++ b/src/man/anytun-config.8.txt @@ -16,7 +16,7 @@ SYNOPSIS [ *-m|--mux* <mux-id> ] [ *-K|--key* <master key> ] [ *-A|--salt* <master salt> ] -[ *-R|--route* <net>/<prefix length> ] +[ *-T|--route* <net>/<prefix length> ] DESCRIPTION ----------- @@ -86,7 +86,7 @@ Master salt in hexadecimal notation, eg 01a2b3c4d5e6f708a9b0cadbecfd, with a mandatory length of 28 characters (14 bytes). --R|--route <net>/<prefix length> +-T|--route <net>/<prefix length> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ add a route to connection. This can be invoked several times. diff --git a/src/man/anytun.8.txt b/src/man/anytun.8.txt index 76c274d..2dd0a11 100644 --- a/src/man/anytun.8.txt +++ b/src/man/anytun.8.txt @@ -30,7 +30,7 @@ SYNOPSIS [ *-x|--post-up-script* <script> ] [ *-w|--window-size* <window size> ] [ *-m|--mux* <mux-id> ] -[ *-R|--route* <net>/<prefix length> ] +[ *-T|--route* <net>/<prefix length> ] [ *-c|--cipher* <cipher type> ] [ *-K|--key* <master key> ] [ *-A|--salt* <master salt> ] @@ -246,7 +246,7 @@ window size of 0 is used. the multiplex id to use. default: 0 --R|--route <net>/<prefix length> +-T|--route <net>/<prefix length> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ add a route to connection. This can be invoked several times. diff --git a/src/options.cpp b/src/options.cpp index ff09229..9c3c9ea 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -188,7 +188,7 @@ bool Options::parse(int argc, char* argv[]) PARSE_SCALAR_PARAM("-a","--auth-algo", auth_algo_) PARSE_CSLIST_PARAM("-M","--sync-hosts", host_port_queue) PARSE_CSLIST_PARAM("-X","--control-host", host_port_queue) - PARSE_CSLIST_PARAM("-R","--route", route_queue) + PARSE_CSLIST_PARAM("-T","--route", route_queue) else return false; } @@ -309,7 +309,7 @@ void Options::printUsage() 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 << " [-a|--auth-algo] <algo type> message authentication algorithm" << std::endl; - std::cout << " [-R|--route] <net>/<prefix length> add a route to connection, can be invoked several times" << std::endl; + std::cout << " [-T|--route] <net>/<prefix length> add a route to connection, can be invoked several times" << std::endl; } void Options::printOptions() |