Skip to content

[#4140] PingChannel: release lock before invoking PingCheckMgr #152

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

Closed
wants to merge 1 commit into from
Closed

[#4140] PingChannel: release lock before invoking PingCheckMgr #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 18 additions & 9 deletions src/hooks/dhcp/ping_check/ping_channel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,10 +310,12 @@ PingChannel::startRead() {
void
PingChannel::sendNext() {
try {
MultiThreadingLock lock(*mutex_);
if (!canSend()) {
{
MultiThreadingLock lock(*mutex_);
if (!canSend()) {
// Can't send right now, get out.
return;
return;
}
}

// Fetch the next one to send.
Expand All @@ -324,14 +326,21 @@ PingChannel::sendNext() {
}

// Have an target IP, build an ECHO REQUEST for it.
sending_ = true;
ICMPMsgPtr next_echo(new ICMPMsg());
next_echo->setType(ICMPMsg::ECHO_REQUEST);
next_echo->setDestination(target);
{
MultiThreadingLock lock(*mutex_);
if (!canSend()) {
return;
}

uint32_t instance_num = nextEchoInstanceNum();
next_echo->setId(static_cast<uint16_t>(instance_num >> 16));
next_echo->setSequence(static_cast<uint16_t>(instance_num & 0x0000FFFF));
sending_ = true;
next_echo->setType(ICMPMsg::ECHO_REQUEST);
next_echo->setDestination(target);

uint32_t instance_num = nextEchoInstanceNum();
next_echo->setId(static_cast<uint16_t>(instance_num >> 16));
next_echo->setSequence(static_cast<uint16_t>(instance_num & 0x0000FFFF));
}

// Get packed wire-form.
ICMPPtr echo_icmp = next_echo->pack();
Expand Down