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

Commit 549cd9a4 authored by Steve Kondik's avatar Steve Kondik
Browse files

Add redirect-gateway option, cleanup formatting.

parent 4c4ab382

packages/VpnServices/src/com/android/server/vpn/OpenvpnService.java

+3 −0
Original line number Diff line number Diff line
@@ -97,6 +97,9 @@ class OpenvpnService extends VpnService<OpenvpnProfile> { 
        if (p.getUseCompLzo()) {

            args.add("--comp-lzo");

        }

        if (p.getRedirectGateway()) {

            args.add("--redirect-gateway def1");

        }

        if (p.getUserAuth()) {

            args.add("--auth-user-pass");

            args.add("--management-query-passwords");

vpn/java/android/net/vpn/OpenvpnProfile.java

+65 −44
Original line number Diff line number Diff line
@@ -24,19 +24,31 @@ import android.os.Parcel; 
 */

public class OpenvpnProfile extends VpnProfile {

    private static final long serialVersionUID = 1L;



    private static final String PROTO_UDP = "udp";



    private static final String PROTO_TCP = "tcp";



    // Standard Settings

    private boolean mUserAuth = false;



    private String mCA;



    private String mCert;



    // Advanced Settings

    private int mPort = 1194;



    private String mProto = PROTO_UDP;



    private boolean mUseCompLzo = false;



    private boolean mSupplyAddr = false;



    private boolean mRedirectGateway = false;



    private String mLocalAddr;



    private String mRemoteAddr;



    @Override
@@ -74,7 +86,6 @@ public class OpenvpnProfile extends VpnProfile { 
            mProto = PROTO_UDP;

    }





    public boolean getUserAuth() {

        return mUserAuth;

    }
@@ -107,6 +118,14 @@ public class OpenvpnProfile extends VpnProfile { 
        return mUseCompLzo;

    }



    public void setRedirectGateway(boolean b) {

        mRedirectGateway = b;

    }

    

    public boolean getRedirectGateway() {

        return mRedirectGateway;

    }

    

    public void setSupplyAddr(boolean b) {

        mSupplyAddr = b;

    }
@@ -140,6 +159,7 @@ public class OpenvpnProfile extends VpnProfile { 
        mCA = in.readString();

        mCert = in.readString();

        mUseCompLzo = in.readInt() == 1;

        mRedirectGateway = in.readInt() == 1;

        mSupplyAddr = in.readInt() == 1;

        mLocalAddr = in.readString();

        mRemoteAddr = in.readString();
@@ -154,6 +174,7 @@ public class OpenvpnProfile extends VpnProfile { 
        parcel.writeString(mCA);

        parcel.writeString(mCert);

        parcel.writeInt(mUseCompLzo ? 1 : 0);

        parcel.writeInt(mRedirectGateway ? 1 : 0);

        parcel.writeInt(mSupplyAddr ? 1 : 0);

        parcel.writeString(mLocalAddr);

        parcel.writeString(mRemoteAddr);