Skip to content

Commit

Permalink
chore: Optimize code
Browse files Browse the repository at this point in the history 
Change-Id: I180a7059e7ba58b777e948b835e0cd64e37d110a
  • Loading branch information
@andeya
andeya committed Oct 24, 2019
1 parent a0e0923 commit ae26fe0
Showing 1 changed file with 79 additions and 84 deletions.
163 changes: 79 additions & 84 deletions peer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,26 +205,57 @@ func (p *peer) CountSession() int {

// Dial connects with the peer of the destination address.
func (p *peer) Dial(addr string, protoFunc ...ProtoFunc) (Session, *Status) {
return p.newSessionForClient(func() (net.Conn, error) {
if p.network == "quic" {
ctx := context.Background()
if p.defaultDialTimeout > 0 {
ctx, _ = context.WithTimeout(ctx, p.defaultDialTimeout)
}
if p.tlsConfig == nil {
return quic.DialAddrContext(ctx, addr, GenerateTLSConfigForClient(), nil)
dialFunc := p.newDialFunc(addr)
conn, stat := dialFunc("")
if !stat.OK() {
return nil, stat
}
sess := newSession(p, conn, protoFunc)

// create redial func
if p.redialTimes != 0 {
sess.redialForClientLocked = func() bool {
oldID := sess.ID()
conn, stat := dialFunc(oldID)
if stat.OK() {
oldIP := sess.LocalAddr().String()
oldConn := sess.getConn()
if oldConn != nil {
oldConn.Close()
}
sess.socket.Reset(conn, protoFunc...)
if oldIP == oldID {
sess.socket.SetID(sess.LocalAddr().String())
} else {
sess.socket.SetID(oldID)
}
sess.changeStatus(statusPreparing)
stat = p.pluginContainer.postDial(sess, true)
if stat.OK() {
sess.changeStatus(statusOk)
AnywayGo(sess.startReadAndHandle)
p.sessHub.set(sess)
Infof("redial ok (network:%s, addr:%s, id:%s)", p.network, addr, sess.ID())
return true
}
sess.closeLocked()
}
return quic.DialAddrContext(ctx, addr, p.tlsConfig, nil)
}
d := &net.Dialer{
LocalAddr: p.localAddr,
Timeout: p.defaultDialTimeout,
}
if p.tlsConfig != nil {
return tls.DialWithDialer(d, p.network, addr, p.tlsConfig)
sess.tryChangeStatus(statusRedialFailed, statusRedialing)
Errorf("redial fail (network:%s, addr:%s, id:%s): %s", p.network, addr, oldID, stat.String())
return false
}
return d.Dial(p.network, addr)
}, addr, protoFunc)
}

sess.socket.SetID(sess.LocalAddr().String())
if stat := p.pluginContainer.postDial(sess, false); !stat.OK() {
sess.Close()
return nil, stat
}
Infof("dial ok (network:%s, addr:%s, id:%s)", p.network, addr, sess.ID())
sess.changeStatus(statusOk)
AnywayGo(sess.startReadAndHandle)
p.sessHub.set(sess)
return sess, nil
}

type redialTimes int32
Expand All @@ -245,84 +276,48 @@ func (r *redialTimes) next() bool {
return true
}

func (p *peer) newSessionForClient(dialFunc func() (net.Conn, error), addr string, protoFuncs []ProtoFunc) (*session, *Status) {
conn, dialErr := dialFunc()
if dialErr != nil {
func (p *peer) newDialFunc(addr string) func(string) (net.Conn, *Status) {
return func(sessID string) (net.Conn, *Status) {
conn, err := p.dialConn(addr)
if err == nil {
return conn, nil
}
redialTimes := p.newRedialTimes()
for redialTimes.next() {
time.Sleep(p.redialInterval)
Debugf("trying to redial... (network:%s, addr:%s)", p.network, addr)
conn, dialErr = dialFunc()
if dialErr == nil {
break
if sessID == "" {
Debugf("trying to redial... (network:%s, addr:%s)", p.network, addr)
} else {
Debugf("trying to redial... (network:%s, addr:%s, id:%s)", p.network, addr, sessID)
}
}
}
if dialErr != nil {
return nil, statDialFailed.Copy(dialErr)
}
var sess = newSession(p, conn, protoFuncs)

// create redial func
if p.redialTimes != 0 {
sess.redialForClientLocked = func() bool {
var stat *Status
redialTimes := p.newRedialTimes()
for redialTimes.next() {
time.Sleep(p.redialInterval)
Debugf("trying to redial... (network:%s, addr:%s, id:%s)", p.network, sess.RemoteAddr().String(), sess.ID())
stat = p.renewSessionForClientLocked(sess, dialFunc, addr, protoFuncs)
if stat.OK() {
Infof("redial ok (network:%s, addr:%s, id:%s)", p.network, sess.RemoteAddr().String(), sess.ID())
return true
}
}
sess.tryChangeStatus(statusRedialFailed, statusRedialing)
if !stat.OK() {
Errorf("redial fail (network:%s, addr:%s, id:%s): %s", p.network, sess.RemoteAddr().String(), sess.ID(), stat.String())
conn, err = p.dialConn(addr)
if err == nil {
return conn, nil
}
return false
}
return nil, statDialFailed.Copy(err)
}

sess.socket.SetID(sess.LocalAddr().String())
if stat := p.pluginContainer.postDial(sess, false); !stat.OK() {
sess.Close()
return nil, stat
}
Infof("dial ok (network:%s, addr:%s, id:%s)", p.network, sess.RemoteAddr().String(), sess.ID())
sess.changeStatus(statusOk)
AnywayGo(sess.startReadAndHandle)
p.sessHub.set(sess)
return sess, nil
}

func (p *peer) renewSessionForClientLocked(sess *session, dialFunc func() (net.Conn, error), addr string, protoFuncs []ProtoFunc) *Status {
var conn, dialErr = dialFunc()
if dialErr != nil {
return statDialFailed.Copy(dialErr)
}
oldIP := sess.LocalAddr().String()
oldID := sess.ID()
oldConn := sess.getConn()
if oldConn != nil {
oldConn.Close()
func (p *peer) dialConn(addr string) (net.Conn, error) {
if p.network == "quic" {
ctx := context.Background()
if p.defaultDialTimeout > 0 {
ctx, _ = context.WithTimeout(ctx, p.defaultDialTimeout)
}
if p.tlsConfig == nil {
return quic.DialAddrContext(ctx, addr, GenerateTLSConfigForClient(), nil)
}
return quic.DialAddrContext(ctx, addr, p.tlsConfig, nil)
}
sess.socket.Reset(conn, protoFuncs...)
if oldIP == oldID {
sess.socket.SetID(sess.LocalAddr().String())
} else {
sess.socket.SetID(oldID)
d := &net.Dialer{
LocalAddr: p.localAddr,
Timeout: p.defaultDialTimeout,
}
sess.changeStatus(statusPreparing)
if stat := p.pluginContainer.postDial(sess, true); !stat.OK() {
sess.closeLocked()
return stat
if p.tlsConfig != nil {
return tls.DialWithDialer(d, p.network, addr, p.tlsConfig)
}
sess.changeStatus(statusOk)
AnywayGo(sess.startReadAndHandle)
p.sessHub.set(sess)
return nil
return d.Dial(p.network, addr)
}

// ServeConn serves the connection and returns a session.
Expand Down

0 comments on commit ae26fe0

Please sign in to comment.