Skip to content
Snippets Groups Projects
Unverified Commit e26305eb authored by meskio's avatar meskio :tent:
Browse files

[feat] get the shapeshifter errors into the log

parent 46fec476
No related branches found
No related tags found
No related merge requests found
...@@ -70,6 +70,7 @@ func (b *Bitmask) startTransport() (proxy string, err error) { ...@@ -70,6 +70,7 @@ func (b *Bitmask) startTransport() (proxy string, err error) {
Target: gw.IPAddress + ":" + gw.Ports[0], Target: gw.IPAddress + ":" + gw.Ports[0],
SocksAddr: proxy, SocksAddr: proxy,
} }
go b.listenShapeErr()
if iatMode, ok := gw.Options["iat-mode"]; ok { if iatMode, ok := gw.Options["iat-mode"]; ok {
b.shapes.IatMode, err = strconv.Atoi(iatMode) b.shapes.IatMode, err = strconv.Atoi(iatMode)
if err != nil { if err != nil {
...@@ -86,6 +87,17 @@ func (b *Bitmask) startTransport() (proxy string, err error) { ...@@ -86,6 +87,17 @@ func (b *Bitmask) startTransport() (proxy string, err error) {
return "", fmt.Errorf("No working gateway for transport %s: %v", b.transport, err) return "", fmt.Errorf("No working gateway for transport %s: %v", b.transport, err)
} }
func (b *Bitmask) listenShapeErr() {
ch := b.shapes.GetErrorChannel()
for {
err, more := <-ch
if !more {
return
}
log.Printf("Error from shappeshifter: %v", err)
}
}
func (b *Bitmask) startOpenVPN(proxy string) error { func (b *Bitmask) startOpenVPN(proxy string) error {
certPemPath, err := b.getCert() certPemPath, err := b.getCert()
if err != nil { if err != nil {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment