|
|
@@ -198,11 +198,15 @@ func (server *Server) newRLPX(conn net.Conn, dialDest *ecdsa.PublicKey) transpor
|
|
|
return &rlpxTransport{conn: rlpx.NewConn(conn, dialDest)}
|
|
|
}
|
|
|
|
|
|
-func (server *Server) SetupConn(fd net.Conn, flags connFlag, dialDesk *enode.Node) error {
|
|
|
+func (server *Server) SetupConn(fd net.Conn, flags connFlag, dialDest *enode.Node) error {
|
|
|
c := &conn{fd: fd, flags: flags, cont: make(chan error)}
|
|
|
- c.transport = server.newRLPX(fd, nil)
|
|
|
+ if dialDest == nil {
|
|
|
+ c.transport = server.newRLPX(fd, nil)
|
|
|
+ } else {
|
|
|
+ c.transport = server.newRLPX(fd, dialDest.Pubkey())
|
|
|
+ }
|
|
|
|
|
|
- err := server.setupConn(c, nil)
|
|
|
+ err := server.setupConn(c, dialDest)
|
|
|
if err != nil {
|
|
|
c.close(err)
|
|
|
}
|
|
|
@@ -210,6 +214,12 @@ func (server *Server) SetupConn(fd net.Conn, flags connFlag, dialDesk *enode.Nod
|
|
|
}
|
|
|
|
|
|
func (server *Server) setupConn(c *conn, dialDest *enode.Node) error {
|
|
|
+ //
|
|
|
+ //remotePubkey, err := c.doEncHandshake(server.PrivateKey)
|
|
|
+ //if err != nil {
|
|
|
+ // return err
|
|
|
+ //}
|
|
|
+
|
|
|
return nil
|
|
|
}
|
|
|
|