OSDN > Developer > lafekasloan101 > Chamber > system-coremmmm > 提交

system-corennnn
Fork

提交

nexus: OpenVPN: Instead of creating / using a configfile, use the new
dynamic service argument support so we don't need one :)

Signed-off-by: San Mehat <san@google.com>

nexus: fix property max

--- a/nexus/OpenVpnController.cpp

+++ b/nexus/OpenVpnController.cpp

		@@ -26,6 +26,7 @@
26	26	#include "OpenVpnController.h"
27	27
28	28	#define DAEMON_PROP_NAME "vpn.openvpn.status"
	29	+
29	30	#define DAEMON_CONFIG_FILE "/data/misc/openvpn/openvpn.conf"
30	31
31	32	OpenVpnController::OpenVpnController() :

		@@ -46,13 +47,16 @@ int OpenVpnController::stop() {
46	47	}
47	48
48	49	int OpenVpnController::enable() {
49		-
50		- if (validateConfig()) {
51		- LOGE("Error validating configuration file");
	50	+ char svc[PROPERTY_VALUE_MAX];
	51	+ char tmp[64];
	52	+
	53	+ if (!getProperty("vpn.gateway", tmp, sizeof(tmp))) {
	54	+ LOGE("Error reading property 'vpn.gateway' (%s)", strerror(errno));
52	55	return -1;
53	56	}
	57	+ snprintf(svc, sizeof(svc), "openvpn:--remote %s 1194", tmp);
54	58
55		- if (mServiceManager->start("openvpn"))
	59	+ if (mServiceManager->start(svc))
56	60	return -1;
57	61
58	62	return 0;

		@@ -64,15 +68,3 @@ int OpenVpnController::disable() {
64	68	return -1;
65	69	return 0;
66	70	}
67		-
68		-int OpenVpnController::validateConfig() {
69		- unlink(DAEMON_CONFIG_FILE);
70		-
71		- FILE *fp = fopen(DAEMON_CONFIG_FILE, "w");
72		- if (!fp)
73		- return -1;
74		-
75		- fprintf(fp, "remote %s 1194\n", inet_ntoa(getVpnGateway()));
76		- fclose(fp);
77		- return 0;
78		-}

--- a/nexus/OpenVpnController.h

+++ b/nexus/OpenVpnController.h