diff options
| author | Martin Willi <martin@revosec.ch> | 2014-02-06 15:58:41 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2014-02-06 15:58:41 +0100 |
| commit | fe40c4754767bda0fadb1a83ec9ab6af0125b488 (patch) | |
| tree | f83b00cfaccca7795bf5a4bb5cca27e0c5a3cc70 /src/charon-cmd/cmd/cmd_options.c | |
| parent | 0edd13b6c85af9baa2d870e82b796f11c5020857 (diff) | |
| parent | e2de972c55c882274a826926aac414ae432740ae (diff) | |
| download | strongswan-fe40c4754767bda0fadb1a83ec9ab6af0125b488.tar.bz2 strongswan-fe40c4754767bda0fadb1a83ec9ab6af0125b488.tar.xz | |
Merge branch 'cmd-proposals'
Introduce --ike/esp/ah-proposal options to offer custom proposals, and requests
an IPv6 virtual IP if an IPv6 --remote-ts is given.
Fixes #508.
Diffstat (limited to 'src/charon-cmd/cmd/cmd_options.c')
| -rw-r--r-- | src/charon-cmd/cmd/cmd_options.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/charon-cmd/cmd/cmd_options.c b/src/charon-cmd/cmd/cmd_options.c index 597ccda1f..5428941ff 100644 --- a/src/charon-cmd/cmd/cmd_options.c +++ b/src/charon-cmd/cmd/cmd_options.c @@ -56,6 +56,12 @@ cmd_option_t cmd_options[CMD_OPT_COUNT] = { "additional traffic selector to propose for our side", {}}, { CMD_OPT_REMOTE_TS, "remote-ts", required_argument, "subnet", "traffic selector to propose for remote side", {}}, + { CMD_OPT_IKE_PROPOSAL, "ike-proposal", required_argument, "proposal", + "a single IKE proposal to offer instead of the default", {}}, + { CMD_OPT_ESP_PROPOSAL, "esp-proposal", required_argument, "proposal", + "a single ESP proposal to offer instead of the default", {}}, + { CMD_OPT_AH_PROPOSAL, "ah-proposal", required_argument, "proposal", + "a single AH proposal to offer instead of the default", {}}, { CMD_OPT_PROFILE, "profile", required_argument, "name", "authentication profile to use, where name is one of:", { " ikev2-pub, ikev2-eap, ikev2-pub-eap", |