perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clarify names

Browse Source
This commit is contained in:
AudriusButkevicius 2015-09-02 22:00:51 +01:00
parent 61130ea191
commit 3d6ea23511
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/tlsutil/tlsutil.go
View File

@ -89,7 +89,7 @@ type DowngradingListener struct {
} }
func (l *DowngradingListener) Accept() (net.Conn, error) { func (l *DowngradingListener) Accept() (net.Conn, error) {
conn, isTLS, err := l.AcceptNoWrap() conn, isTLS, err := l.AcceptNoWrapTLS()
// We failed to identify the socket type, pretend that everything is fine, // We failed to identify the socket type, pretend that everything is fine,
// and pass it to the underlying handler, and let them deal with it. // and pass it to the underlying handler, and let them deal with it.
@ -107,7 +107,7 @@ func (l *DowngradingListener) Accept() (net.Conn, error) {
return conn, nil return conn, nil
} }
func (l *DowngradingListener) AcceptNoWrap() (net.Conn, bool, error) { func (l *DowngradingListener) AcceptNoWrapTLS() (net.Conn, bool, error) {
conn, err := l.Listener.Accept() conn, err := l.Listener.Accept()
if err != nil { if err != nil {
return nil, false, err return nil, false, err
@ -124,14 +124,14 @@ func (l *DowngradingListener) AcceptNoWrap() (net.Conn, bool, error) {
return conn, false, ErrIdentificationFailed return conn, false, ErrIdentificationFailed
} }
return &WrappedConnection{br, conn}, bs[0] == 0x16, nil return &UnionedConnection{br, conn}, bs[0] == 0x16, nil
} }
type WrappedConnection struct { type UnionedConnection struct {
io.Reader io.Reader
net.Conn net.Conn
} }
func (c *WrappedConnection) Read(b []byte) (n int, err error) { func (c *UnionedConnection) Read(b []byte) (n int, err error) {
return c.Reader.Read(b) return c.Reader.Read(b)
} }