From: Daniel Wagner <daniel.wag...@bmw-carit.de>
---
test/connect-vpn | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/test/connect-vpn b/test/connect-vpn
index 1575804..757491e 100755
--- a/test/connect-vpn
+++ b/test/connect-vpn
@@ -8,7 +8,8 @@ if (len(sys.argv) < 4):
print " type: openconnect"
print " <name> <host> <domain> <cookie> [cafile]"
print " type: openvpn"
- print " <name> <host> <domain> <cafile> <certfile> <keyfile>"
+ print " TLS: <name> <host> <domain> <cafile> <certfile> <keyfile>"
+ print " Static Key: <name> <host> <domain> <static_key> <ifconfig>"
sys.exit(1)
bus = dbus.SystemBus()
@@ -33,13 +34,22 @@ if sys.argv[1] == "openconnect":
"VPN.Domain": sys.argv[4],
"OpenConnect.Cookie": sys.argv[5]}))
elif sys.argv[1] == "openvpn":
- path = manager.ConnectProvider(({ "Type": "openvpn",
- "Name": sys.argv[2],
- "Host": sys.argv[3],
- "VPN.Domain": sys.argv[4],
- "OpenVPN.CACert": sys.argv[5],
- "OpenVPN.Cert": sys.argv[6],
- "OpenVPN.Key": sys.argv[7]}))
+ if (len(sys.argv) > 6):
+ path = manager.ConnectProvider(({ "Type": "openvpn",
+ "Name": sys.argv[2],
+ "Host": sys.argv[3],
+ "VPN.Domain": sys.argv[4],
+ "OpenVPN.CACert": sys.argv[5],
+ "OpenVPN.Cert": sys.argv[6],
+ "OpenVPN.Key": sys.argv[7]}))
+ else if (len(sys.argv) > 5):
+ path = manager.ConnectProvider(({ "Type": "openvpn",
+ "Name": sys.argv[2],
+ "Host": sys.argv[3],
+ "VPN.Domain": sys.argv[4],
+ "OpenVPN.StaticKey":
sys.argv[5],
+ "OpenVPN.Ifconfig":
sys.argv[6]}))
+
else:
print "Unknown VPN type"
sys.exit(1)
--
1.7.3.2
_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman
