diff options
Diffstat (limited to 'vendor/0xacab.org/leap/obfsvpn/client/client.go')
| -rw-r--r-- | vendor/0xacab.org/leap/obfsvpn/client/client.go | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/vendor/0xacab.org/leap/obfsvpn/client/client.go b/vendor/0xacab.org/leap/obfsvpn/client/client.go index 4b10ab2..005d68b 100644 --- a/vendor/0xacab.org/leap/obfsvpn/client/client.go +++ b/vendor/0xacab.org/leap/obfsvpn/client/client.go @@ -21,7 +21,7 @@ var ( type Client struct { kcp bool - socksAddr string + SocksAddr string obfs4Cert string server *socks5.Server EventLogger EventLogger @@ -35,14 +35,14 @@ type EventLogger interface { func NewClient(kcp bool, socksAddr, obfs4Cert string) *Client { return &Client{ kcp: kcp, - socksAddr: socksAddr, + SocksAddr: socksAddr, obfs4Cert: obfs4Cert, } } func (c *Client) Start() (bool, error) { defer func() { - c.log("STOPPED", "", nil) + c.log("STOPPED", "") }() if c.IsStarted() { @@ -51,7 +51,7 @@ func (c *Client) Start() (bool, error) { } c.server = &socks5.Server{ - Addr: c.socksAddr, + Addr: c.SocksAddr, BindIP: "127.0.0.1", } @@ -70,7 +70,7 @@ func (c *Client) Start() (bool, error) { c.server.Dial = dialer.Dial - c.log("RUNNING", "[+] Starting socks5 proxy at %s\n", c.socksAddr) + c.log("RUNNING", "[+] Starting socks5 proxy at %s\n", c.SocksAddr) if err := c.server.ListenAndServe(); err != nil { c.error("error while listening: %v\n", err) c.server = nil @@ -98,8 +98,11 @@ func (c *Client) log(state string, format string, a ...interface{}) { c.EventLogger.Log(state, fmt.Sprintf(format, a...)) return } + if format == "" { + log.Print(a...) + return + } log.Printf(format, a...) - } func (c *Client) error(format string, a ...interface{}) { @@ -107,6 +110,10 @@ func (c *Client) error(format string, a ...interface{}) { c.EventLogger.Error(fmt.Sprintf(format, a...)) return } + if format == "" { + log.Print(a...) + return + } log.Printf(format, a...) } |