Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stream Removal if its Sanity Check Fails #4839

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Stream Removal if its Sanity Check Fails #4839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9893cdd
improve ListPeer to return only existed joined peers
GheisMohammadi Jan 30, 2025
5dd1523
close stream if its sanity check fails
GheisMohammadi Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion p2p/host.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,10 @@ func (host *HostV2) ListTopic() []string {
func (host *HostV2) ListPeer(topic string) []libp2p_peer.ID {
host.lock.Lock()
defer host.lock.Unlock()
return host.joined[topic].ListPeers()
if t, ok := host.joined[topic]; ok {
return t.ListPeers()
}
return nil
}

// ListBlockedPeer returns list of blocked peer
Expand Down Expand Up @@ -693,6 +696,22 @@ func (host *HostV2) Connected(net libp2p_network.Network, conn libp2p_network.Co
}
}

// getPeerTopics returns the list of topics a peer is subscribed to
func (host *HostV2) getPeerTopics(peerID libp2p_peer.ID) map[string]bool {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that function is currently not used anywhere. Is this required in this PR ? also please write the unit test for this function

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function has been added for potential future use. If we later need to retrieve peer topics, we can use it. I included it preemptively because I believe it might be useful.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noted please the add unit test

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GheisMohammadi can you add unit test for getPeerTopics or maybe create a seperate PR for that function with its test ? what do you think ?

topics := make(map[string]bool)
host.lock.Lock()
defer host.lock.Unlock()
for topic, t := range host.joined {
for _, p := range t.ListPeers() {
if p == peerID {
topics[topic] = true
break
}
}
}
return topics
}

// called when a connection closed
func (host *HostV2) Disconnected(net libp2p_network.Network, conn libp2p_network.Conn) {
host.logger.Debug().Interface("node", conn.RemotePeer()).Msg("peer disconnected")
Expand Down
1 change: 1 addition & 0 deletions p2p/stream/common/streammanager/streammanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ func (sm *streamManager) loop() {
// NewStream handles a new stream from stream handler protocol
func (sm *streamManager) NewStream(stream sttypes.Stream) error {
if err := sm.sanityCheckStream(stream); err != nil {
stream.Close()
return errors.Wrap(err, "stream sanity check failed")
}
task := addStreamTask{
Expand Down