Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13dee245 authored by San Mehat's avatar San Mehat Committed by The Android Open Source Project
Browse files

am 2fd9c589: nexus: OpenVPN: Instead of creating / using a configfile, use the... 

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

Merge commit '2fd9c589'

* commit '2fd9c589':
  nexus: OpenVPN: Instead of creating / using a configfile, use the new
parents df849ca5 2fd9c589

nexus/OpenVpnController.cpp

+8 −16
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "OpenVpnController.h"



#define DAEMON_PROP_NAME "vpn.openvpn.status"



#define DAEMON_CONFIG_FILE "/data/misc/openvpn/openvpn.conf"



OpenVpnController::OpenVpnController() :
@@ -46,13 +47,16 @@ int OpenVpnController::stop() { 
}



int OpenVpnController::enable() {

    char svc[PROPERTY_VALUE_MAX];

    char tmp[64];

    

    if (validateConfig()) {

        LOGE("Error validating configuration file");

    if (!getProperty("vpn.gateway", tmp, sizeof(tmp))) {

        LOGE("Error reading property 'vpn.gateway' (%s)", strerror(errno));

        return -1;

    }

    snprintf(svc, sizeof(svc), "openvpn:--remote %s 1194", tmp);



    if (mServiceManager->start("openvpn"))

    if (mServiceManager->start(svc))

        return -1;



    return 0;
@@ -64,15 +68,3 @@ int OpenVpnController::disable() { 
        return -1;

    return 0;

}
 


int OpenVpnController::validateConfig() {

    unlink(DAEMON_CONFIG_FILE);



    FILE *fp = fopen(DAEMON_CONFIG_FILE, "w");

    if (!fp)

        return -1;



    fprintf(fp, "remote %s 1194\n", inet_ntoa(getVpnGateway()));

    fclose(fp);

    return 0;

}

nexus/OpenVpnController.h

+0 −5
Original line number Diff line number Diff line
@@ -33,11 +33,6 @@ public: 
    int stop();

    int enable();

    int disable();



protected:



private:

    int validateConfig();

};



#endif