From e52258edac55d82ff153755493d770bfbbc9a346 Mon Sep 17 00:00:00 2001 From: Yawning Angel Date: Thu, 29 Oct 2015 14:09:34 +0000 Subject: Make establishing outgoing connections the transport's responsibility. ClientFactories now have a Dial() method instead of a WrapConn() method, so that it is possible to write something like meek-client using the obfs4proxy framework. This breaks the external interface if anyone is using obfs4proxy as a library, but the new way of doing things is a trivial modification, to a single routine that shouldn't have been very large to begin with. --- transports/obfs4/obfs4.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'transports/obfs4/obfs4.go') diff --git a/transports/obfs4/obfs4.go b/transports/obfs4/obfs4.go index 07af9ab..5701535 100644 --- a/transports/obfs4/obfs4.go +++ b/transports/obfs4/obfs4.go @@ -204,13 +204,21 @@ func (cf *obfs4ClientFactory) ParseArgs(args *pt.Args) (interface{}, error) { return &obfs4ClientArgs{nodeID, publicKey, sessionKey, iatMode}, nil } -func (cf *obfs4ClientFactory) WrapConn(conn net.Conn, args interface{}) (net.Conn, error) { +func (cf *obfs4ClientFactory) Dial(network, addr string, dialFn base.DialFunc, args interface{}) (net.Conn, error) { + // Validate args before bothering to open connection. ca, ok := args.(*obfs4ClientArgs) if !ok { return nil, fmt.Errorf("invalid argument type for args") } - - return newObfs4ClientConn(conn, ca) + conn, err := dialFn(network, addr) + if err != nil { + return nil, err + } + if conn, err = newObfs4ClientConn(conn, ca); err != nil { + conn.Close() + return nil, err + } + return conn, nil } type obfs4ServerFactory struct { -- cgit v1.2.3