Skip to content
Snippets Groups Projects

fix shapeshifter gomobile builds for Android...

Merged cyberta requested to merge gomobile_fix_3 into master
1 file
+ 9
9
Compare changes
  • Side-by-side
  • Inline
+ 9
9
@@ -37,17 +37,17 @@ type Logger interface {
@@ -37,17 +37,17 @@ type Logger interface {
Log(msg string)
Log(msg string)
}
}
type ShapeShifter struct {
type Shapeshifter struct {
Cert string
Cert string
IatMode int
IatMode int
Target string // remote ip:port obfs4 server
Target string // remote ip:port obfs4 server
SocksAddr string // -proxylistenaddr in shapeshifter-dispatcher
SocksAddr string // -proxylistenaddr in Shapeshifter-dispatcher
Logger Logger
Logger Logger
ln net.Listener
ln net.Listener
errChan chan error
errChan chan error
}
}
func (ss *ShapeShifter) Open() error {
func (ss *Shapeshifter) Open() error {
err := ss.checkOptions()
err := ss.checkOptions()
if err != nil {
if err != nil {
return err
return err
@@ -62,7 +62,7 @@ func (ss *ShapeShifter) Open() error {
@@ -62,7 +62,7 @@ func (ss *ShapeShifter) Open() error {
return nil
return nil
}
}
func (ss *ShapeShifter) Close() error {
func (ss *Shapeshifter) Close() error {
var err error
var err error
if ss.ln != nil {
if ss.ln != nil {
err = ss.ln.Close()
err = ss.ln.Close()
@@ -73,14 +73,14 @@ func (ss *ShapeShifter) Close() error {
@@ -73,14 +73,14 @@ func (ss *ShapeShifter) Close() error {
return err
return err
}
}
func (ss *ShapeShifter) GetErrorChannel() chan error {
func (ss *Shapeshifter) GetErrorChannel() chan error {
if ss.errChan == nil {
if ss.errChan == nil {
ss.errChan = make(chan error, 2)
ss.errChan = make(chan error, 2)
}
}
return ss.errChan
return ss.errChan
}
}
func (ss ShapeShifter) clientAcceptLoop() error {
func (ss Shapeshifter) clientAcceptLoop() error {
for {
for {
conn, err := ss.ln.Accept()
conn, err := ss.ln.Accept()
if err != nil {
if err != nil {
@@ -94,7 +94,7 @@ func (ss ShapeShifter) clientAcceptLoop() error {
@@ -94,7 +94,7 @@ func (ss ShapeShifter) clientAcceptLoop() error {
}
}
}
}
func (ss ShapeShifter) clientHandler(conn net.Conn) {
func (ss Shapeshifter) clientHandler(conn net.Conn) {
defer conn.Close()
defer conn.Close()
dialer := proxy.Direct
dialer := proxy.Direct
@@ -177,7 +177,7 @@ func copyLoop(a net.Conn, b net.Conn) error {
@@ -177,7 +177,7 @@ func copyLoop(a net.Conn, b net.Conn) error {
return nil
return nil
}
}
func (ss *ShapeShifter) checkOptions() error {
func (ss *Shapeshifter) checkOptions() error {
if ss.SocksAddr == "" {
if ss.SocksAddr == "" {
ss.SocksAddr = "127.0.0.1:0"
ss.SocksAddr = "127.0.0.1:0"
}
}
@@ -185,7 +185,7 @@ func (ss *ShapeShifter) checkOptions() error {
@@ -185,7 +185,7 @@ func (ss *ShapeShifter) checkOptions() error {
return err
return err
}
}
func (ss *ShapeShifter) sendError(format string, a ...interface{}) {
func (ss *Shapeshifter) sendError(format string, a ...interface{}) {
if ss.Logger != nil {
if ss.Logger != nil {
ss.Logger.Log(fmt.Sprintf(format, a...))
ss.Logger.Log(fmt.Sprintf(format, a...))
return
return
Loading