doesnm/eeProxy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

get ready for saving the keys

Browse source
This commit is contained in:
idk 2018-12-25 01:55:24 -05:00
parent 75d32ae82d
commit 842be5eadd
No known key found for this signature in database
GPG key ID: D75C03B39B5E14E1
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
main.go
View file

@ -8,9 +8,8 @@ import (
)
import (
"github.com/eyedeekay/sam-forwarder/config"
//"github.com/eyedeekay/samcatd-web"
"github.com/eyedeekay/eeproxy/socks"
"github.com/eyedeekay/sam-forwarder/config"
)
type flagOpts []string
@ -138,7 +137,7 @@ func main() {
c := make(chan os.Signal, 1)
signal.Notify(c, os.Interrupt)
if tunsocks, tunerr := tunmanager.NewManager(config.SamHost, config.SamPort, config.Print(), config.SaveDirectory); tunerr == nil {
if tunsocks, tunerr := tunmanager.NewManager(config.SamHost, config.SamPort, config.SaveDirectory, config.Print()); tunerr == nil {
go func() {
for sig := range c {
if sig == os.Interrupt {

4
socks/manager.go
View file

@ -53,12 +53,12 @@ func (m Manager) Dial(ctx context.Context, network, addr string) (net.Conn, erro
return m.DialI2P(ctx, addr)
}
func NewManager(samhost, samport, samopts, datadir string) (*Manager, error) {
func NewManager(samhost, samport, datadir string, samopts []string) (*Manager, error) {
return NewManagerFromOptions(
SetHost(samhost),
SetPort(samport),
SetSAMOpts(samopts),
SetDataDir(datadir),
SetSAMOpts(samopts),
)
}

6
socks/manager_options.go
View file

@ -40,9 +40,11 @@ func SetPort(v string) func(*Manager) error {
}
//SetSAMOpts sets the SAM options
func SetSAMOpts(s string) func(*Manager) error {
func SetSAMOpts(s []string) func(*Manager) error {
return func(c *Manager) error {
c.samopts = s
for _, i := range s {
c.samopts += i + " "
}
return nil
}
}