more integration of vpn

This commit is contained in:
idk
2018-12-03 17:13:36 -05:00
parent 7ae14054a5
commit 298df15b2e
2 changed files with 24 additions and 8 deletions

View File

@ -102,12 +102,12 @@ Donate
BTC:159M8MEUwhTzE9RXmcZxtigKaEjgfwRbHt
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlwFqb8ACgkQ11wDs5te
FOG9eQf+I9SnYvPaJ85etID9F2Dlmx3XAMAHRaGj2++zfdxAiTdc3JnFLIEzhhFs
rF2m+2iGRukDQfPK4QwIhAYD2cgGTsMI0hrD3KpZ2fcfjpKFO0d3rBex3MBR+5OY
C3lt7cVkGowcx8lYlo8qv0yGzaip0oY4hupbMXU+50p0AezOBgKrVirH43GeyhU7
5rLCyuo1e1fOlItgIJM47vNXJgNGMUj0LwOazpeYjQ2OL5CTsEX+JIkurox9P7dS
Y+a/glnSMFAvkVhvlgDSnzgY5KDhdBhDx95hDY5W22M3tMjlt/+yyJuVKplBfDmT
rqFK2kRrkQnxAtkh4V4B55IUctlmEA==
=Xqb6
iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlwFqpAACgkQ11wDs5te
FOFR8AgApatOR6ESXBJF0z96GfAr0uDQplFAXVemI1g3Rq9nqhMUPLvS8zQnD0x0
WIkCE1KRHgQ7cp39F3U7xe4ONc5V4K3ixn91ynNqAjYT0ACpGoEIHHnKawkZ07VF
0imJWbauwmzcTvAcj3vEGFRH0+G2TjZ8jBQpOUlKqcEEkZ4ZQubkUPri+jnpfH7L
sP0+kg6l3oWNEVP0jA2xhyY3Kb4c7tXRYvz2uIvMYGCbDw8kSdoFOct9bnKEp00Y
1sRFk6uIy0gcg0/vLR7offVaN8nhzvwf2F10WDGkWMXKk8DO3BjuAdw+aBjuzKFD
LEzMxzBGH5ijeeTwCEBUI+63USv81g==
=jqod
-----END PGP SIGNATURE-----

View File

@ -477,3 +477,19 @@ func NewSAMSSUClientForwarderFromConf(config *Conf) (*samforwarderudp.SAMSSUClie
return nil, nil
}
func NewSAMSSUClientForwarderFromConfig(iniFile, SamHost, SamPort string, label ...string) (*samforwarderudp.SAMSSUClientForwarder, error) {
if iniFile != "none" {
config, err := NewI2PTunConf(iniFile, label...)
if err != nil {
return nil, err
}
if SamHost != "" && SamHost != "127.0.0.1" && SamHost != "localhost" {
config.SamHost = config.GetSAMHost(SamHost, config.SamHost)
}
if SamPort != "" && SamPort != "7656" {
config.SamPort = config.GetSAMPort(SamPort, config.SamPort)
}
return NewSAMSSUClientForwarderFromConf(config)
}
return nil, nil
}