admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Maint: make VPN connection not specific to OpenVPN

Browse Source 
- Add VPN field to ServerSelection struct
- Set VPN type to server selection at start using VPN_TYPE
- Change OpenVPNConnection to Connection with Type field
- Rename Provider GetOpenVPNConnection to GetConnection
- Rename GetTargetIPOpenVPNConnection to GetTargetIPConnection
- Rename PickRandomOpenVPNConnection to PickRandomConnection
- Add 'OpenVPN' prefix to OpenVPN specific methods on connection
This commit is contained in:
Quentin McGaw (desktop)
2021-08-19 14:09:41 +00:00
parent 105d81c018
commit 3d8e61900b
54 changed files with 283 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/openvpn/custom/extract_test.go
View File

@@ -16,12 +16,12 @@ func Test_extractConnectionFromLines(t *testing.T) {
testCases := map[string]struct {
lines []string
connection models.OpenVPNConnection
connection models.Connection
err error
}{
"success": {
lines: []string{"bla bla", "proto tcp", "remote 1.2.3.4 1194 tcp"},
connection: models.OpenVPNConnection{
connection: models.Connection{
IP: net.IPv4(1, 2, 3, 4),
Port: 1194,
Protocol: constants.TCP,
@@ -33,7 +33,7 @@ func Test_extractConnectionFromLines(t *testing.T) {
},
"only use first values found": {
lines: []string{"proto udp", "proto tcp", "remote 1.2.3.4 443 tcp", "remote 5.2.3.4 1194 udp"},
connection: models.OpenVPNConnection{
connection: models.Connection{
IP: net.IPv4(1, 2, 3, 4),
Port: 443,
Protocol: constants.UDP,
@@ -41,14 +41,14 @@ func Test_extractConnectionFromLines(t *testing.T) {
},
"no IP found": {
lines: []string{"proto tcp"},
connection: models.OpenVPNConnection{
connection: models.Connection{
Protocol: constants.TCP,
},
err: errRemoteLineNotFound,
},
"default TCP port": {
lines: []string{"remote 1.2.3.4", "proto tcp"},
connection: models.OpenVPNConnection{
connection: models.Connection{
IP: net.IPv4(1, 2, 3, 4),
Port: 443,
Protocol: constants.TCP,
@@ -56,7 +56,7 @@ func Test_extractConnectionFromLines(t *testing.T) {
},
"default UDP port": {
lines: []string{"remote 1.2.3.4", "proto udp"},
connection: models.OpenVPNConnection{
connection: models.Connection{
IP: net.IPv4(1, 2, 3, 4),
Port: 1194,
Protocol: constants.UDP,
@@ -88,7 +88,7 @@ func Test_extractConnectionFromLine(t *testing.T) {
testCases := map[string]struct {
line string
connection models.OpenVPNConnection
connection models.Connection
isErr error
}{
"irrelevant line": {
@@ -100,7 +100,7 @@ func Test_extractConnectionFromLine(t *testing.T) {
},
"extract proto success": {
line: "proto tcp",
connection: models.OpenVPNConnection{
connection: models.Connection{
Protocol: constants.TCP,
},
},
@@ -110,7 +110,7 @@ func Test_extractConnectionFromLine(t *testing.T) {
},
"extract remote success": {
line: "remote 1.2.3.4 1194 udp",
connection: models.OpenVPNConnection{
connection: models.Connection{
IP: net.IPv4(1, 2, 3, 4),
Port: 1194,
Protocol: constants.UDP,