Merge pull request #8787 from swift-mx/mx_get_hello_message
feat: lotus-shed get remote peer hello message
This commit is contained in:
commit
73ee5957e7
@ -153,7 +153,7 @@ var NetPing = &cli.Command{
|
|||||||
|
|
||||||
ctx := ReqContext(cctx)
|
ctx := ReqContext(cctx)
|
||||||
|
|
||||||
pis, err := addrInfoFromArg(ctx, cctx)
|
pis, err := AddrInfoFromArg(ctx, cctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -274,7 +274,7 @@ var NetConnect = &cli.Command{
|
|||||||
defer closer()
|
defer closer()
|
||||||
ctx := ReqContext(cctx)
|
ctx := ReqContext(cctx)
|
||||||
|
|
||||||
pis, err := addrInfoFromArg(ctx, cctx)
|
pis, err := AddrInfoFromArg(ctx, cctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -293,7 +293,7 @@ var NetConnect = &cli.Command{
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
func addrInfoFromArg(ctx context.Context, cctx *cli.Context) ([]peer.AddrInfo, error) {
|
func AddrInfoFromArg(ctx context.Context, cctx *cli.Context) ([]peer.AddrInfo, error) {
|
||||||
pis, err := addrutil.ParseAddresses(ctx, cctx.Args().Slice())
|
pis, err := addrutil.ParseAddresses(ctx, cctx.Args().Slice())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
a, perr := address.NewFromString(cctx.Args().First())
|
a, perr := address.NewFromString(cctx.Args().First())
|
||||||
|
63
cmd/lotus-shed/hello.go
Normal file
63
cmd/lotus-shed/hello.go
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
cborutil "github.com/filecoin-project/go-cbor-util"
|
||||||
|
lcli "github.com/filecoin-project/lotus/cli"
|
||||||
|
"github.com/filecoin-project/lotus/node/hello"
|
||||||
|
"github.com/libp2p/go-libp2p"
|
||||||
|
inet "github.com/libp2p/go-libp2p-core/network"
|
||||||
|
"github.com/urfave/cli/v2"
|
||||||
|
)
|
||||||
|
|
||||||
|
var resultCh chan bool
|
||||||
|
|
||||||
|
var helloCmd = &cli.Command{
|
||||||
|
Name: "hello",
|
||||||
|
Description: "Get remote peer hello message by multiaddr",
|
||||||
|
ArgsUsage: "[peerMultiaddr|minerActorAddress]",
|
||||||
|
Action: func(cctx *cli.Context) error {
|
||||||
|
ctx := lcli.ReqContext(cctx)
|
||||||
|
resultCh = make(chan bool, 1)
|
||||||
|
pis, err := lcli.AddrInfoFromArg(ctx, cctx)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
h, err := libp2p.New()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
h.SetStreamHandler(hello.ProtocolID, HandleStream)
|
||||||
|
err = h.Connect(ctx, pis[0])
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
ctx, done := context.WithTimeout(ctx, 5*time.Second)
|
||||||
|
defer done()
|
||||||
|
select {
|
||||||
|
case <-resultCh:
|
||||||
|
case <-ctx.Done():
|
||||||
|
fmt.Println("can't get hello message, please try again")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
func HandleStream(s inet.Stream) {
|
||||||
|
var hmsg hello.HelloMessage
|
||||||
|
if err := cborutil.ReadCborRPC(s, &hmsg); err != nil {
|
||||||
|
log.Infow("failed to read hello message, disconnecting", "error", err)
|
||||||
|
_ = s.Conn().Close()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
data, err := json.Marshal(hmsg)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
fmt.Println(string(data))
|
||||||
|
resultCh <- true
|
||||||
|
}
|
@ -39,6 +39,7 @@ func main() {
|
|||||||
marketCmd,
|
marketCmd,
|
||||||
miscCmd,
|
miscCmd,
|
||||||
mpoolCmd,
|
mpoolCmd,
|
||||||
|
helloCmd,
|
||||||
genesisVerifyCmd,
|
genesisVerifyCmd,
|
||||||
mathCmd,
|
mathCmd,
|
||||||
minerCmd,
|
minerCmd,
|
||||||
|
Loading…
Reference in New Issue
Block a user