idk/sam-forwarder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working on adding ssu to tunconf.

Browse Source
This commit is contained in:
idk
2018-08-16 16:17:41 -04:00
parent 39b670a5f8
commit cd1218c0d0
3 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
README.md.asc
View File

@ -178,12 +178,12 @@ It would be really awesome if I could make this run on Android. So I'll make
that happen eventually.
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlt12S4ACgkQ11wDs5te
FOGwiAf8CsBX0qmDw3V/xh1V576VA2DlnIWYAqXWbMZV2ITLmgxELPjFxHyltUVs
1FTHrOqvIxqqQ2JE7EaN+RUxmCz0cxaAdk61WyXqwDGcpkNkUj9y9IGbnj1ohEwj
1ZLerGthPmy1r+IBQJYLviUON0y/QSGlzGKhIEgHVgc9eYL0ySh0ZNiA0JMwAvRJ
vZ7pia8FXlW9DoTg/zk/CLxdX8r0OiE8zfmuOyyBIe8EsmikHeFPzaEOah7ZRUl+
ZDB0FJ/vQxz5enWPkbvu+9WpjYIoLSHRYYB6EFeSPW6XAdasykA5lRVpIHBRVLUi
0BOG9liveCni4yG+314soVWESxEcag==
=TjP5
iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlt12+IACgkQ11wDs5te
FOEfWggAqxM5Xz/lzP8VoKc2U6hX+Q50EsQbXPBfmDiVfGTvGyWvefJR+YtgDYSA
t0VOX+KfUSXWiXS9qWZ9Mt3ZMutv6/jLhm8qoPFpILew/UcElNmjImgklyrw6A/h
sfRYFyvHbyuONGyw5gBld8ilVGeBdeOnbtpK7jKMk8+EbufcVyEsdDqBjsdEvxwP
QEmYW3nM6rpwXmHD97UkHiEzyyG8huyyht6cUeWGPLJfNa25GNWQ1BWOAyxmXuFN
wcG6fqNxX+UkA96XN8S4ZlGo7OQOQ/IeMpY1FL/6t5wPXywyZqwJe96MtWVNFiJB
iNG5hBzCJNXlK81tYwA3fuf+D2liTg==
=5vGE
-----END PGP SIGNATURE-----

57
config/tunconf.go
View File

@ -1079,37 +1079,36 @@ func NewSAMSSUForwarderFromConf(config *Conf) (*samforwarderudp.SAMSSUForwarder,
}
// NewSAMSSUClientForwarderFromConf generates a SAMSSUforwarder from *i2ptunconf.Conf
/*func NewSAMSSUClientForwarderFromConf(config *Conf) (*samforwarderudp.SAMSSUClientForwarder, error) {
func NewSAMSSUClientForwarderFromConf(config *Conf) (*samforwarderudp.SAMSSUClientForwarder, error) {
if config != nil {
return samforwarderudp.NewSAMSSUForwarderFromOptions(
samforwarderudp.SetSaveFile(config.SaveFile),
samforwarderudp.SetFilePath(config.SaveDirectory),
samforwarderudp.SetHost(config.TargetHost),
samforwarderudp.SetPort(config.TargetPort),
samforwarderudp.SetSAMHost(config.SamHost),
samforwarderudp.SetSAMPort(config.SamPort),
samforwarderudp.SetName(config.TunName),
samforwarderudp.SetInLength(config.InLength),
samforwarderudp.SetOutLength(config.OutLength),
samforwarderudp.SetInVariance(config.InVariance),
samforwarderudp.SetOutVariance(config.OutVariance),
samforwarderudp.SetInQuantity(config.InQuantity),
samforwarderudp.SetOutQuantity(config.OutQuantity),
samforwarderudp.SetInBackups(config.InBackupQuantity),
samforwarderudp.SetOutBackups(config.OutBackupQuantity),
samforwarderudp.SetEncrypt(config.EncryptLeaseSet),
samforwarderudp.SetAllowZeroIn(config.InAllowZeroHop),
samforwarderudp.SetAllowZeroOut(config.OutAllowZeroHop),
samforwarderudp.SetCompress(config.UseCompression),
samforwarderudp.SetReduceIdle(config.ReduceIdle),
samforwarderudp.SetReduceIdleTimeMs(config.ReduceIdleTime),
samforwarderudp.SetReduceIdleQuantity(config.ReduceIdleQuantity),
samforwarderudp.SetCloseIdle(config.CloseIdle),
samforwarderudp.SetCloseIdleTimeMs(config.CloseIdleTime),
samforwarderudp.SetAccessListType(config.AccessListType),
samforwarderudp.SetAccessList(config.AccessList),
return samforwarderudp.NewSAMSSUClientForwarderFromOptions(
samforwarderudp.SetClientSaveFile(config.SaveFile),
samforwarderudp.SetClientFilePath(config.SaveDirectory),
samforwarderudp.SetClientHost(config.TargetHost),
samforwarderudp.SetClientPort(config.TargetPort),
samforwarderudp.SetClientSAMHost(config.SamHost),
samforwarderudp.SetClientSAMPort(config.SamPort),
samforwarderudp.SetClientName(config.TunName),
samforwarderudp.SetClientInLength(config.InLength),
samforwarderudp.SetClientOutLength(config.OutLength),
samforwarderudp.SetClientInVariance(config.InVariance),
samforwarderudp.SetClientOutVariance(config.OutVariance),
samforwarderudp.SetClientInQuantity(config.InQuantity),
samforwarderudp.SetClientOutQuantity(config.OutQuantity),
samforwarderudp.SetClientInBackups(config.InBackupQuantity),
samforwarderudp.SetClientOutBackups(config.OutBackupQuantity),
samforwarderudp.SetClientEncrypt(config.EncryptLeaseSet),
samforwarderudp.SetClientAllowZeroIn(config.InAllowZeroHop),
samforwarderudp.SetClientAllowZeroOut(config.OutAllowZeroHop),
samforwarderudp.SetClientCompress(config.UseCompression),
samforwarderudp.SetClientReduceIdle(config.ReduceIdle),
samforwarderudp.SetClientReduceIdleTimeMs(config.ReduceIdleTime),
samforwarderudp.SetClientReduceIdleQuantity(config.ReduceIdleQuantity),
samforwarderudp.SetClientCloseIdle(config.CloseIdle),
samforwarderudp.SetClientCloseIdleTimeMs(config.CloseIdleTime),
samforwarderudp.SetClientAccessListType(config.AccessListType),
samforwarderudp.SetClientAccessList(config.AccessList),
)
}
return nil, nil
}
*/

2
main/client.go
View File

@ -6,7 +6,7 @@ import "github.com/eyedeekay/sam-forwarder/config"
func clientMode() {
if *udpMode {
log.Fatal("UDP client mode not implemented yet.")
} else {
log.Println("Proxying tcp", *targetHost+":"+*targetPort, "to", *targetDestination)
forwarder, err := i2ptunconf.NewSAMClientForwarderFromConf(config)