Skip to content

correct handling result of CPTRetriveNode #3447

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

Open
wants to merge 1 commit into
base: v3/master
Choose a base branch
from
Open

correct handling result of CPTRetriveNode #3447

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
25 changes: 16 additions & 9 deletions src/utils/msc_tree.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,14 +668,21 @@ TreeNode *CPTFindElementIPNetblock(unsigned char *ipdata, unsigned char ip_bitma

node = CPTRetriveNode(ipdata, ip_bitmask, node);

if (node && node->bit != ip_bitmask) {
if(node == NULL) {
//if (msr && msr->txcfg->debuglog_level >= 9) {
// msr_log(msr, 9, "CPTFindElement: Node tree is NULL.");
//}
return node;
}

if (node->bit != ip_bitmask) {
//if (msr && msr->txcfg->debuglog_level >= 9) {
// msr_log(msr, 9, "CPTFindElementIPNetblock: Found a tree node but netmask is different.");
//}
return NULL;
}

if (node && node->prefix == NULL) {
if (node->prefix == NULL) {
//if (msr && msr->txcfg->debuglog_level >= 9) {
// msr_log(msr, 9, "CPTFindElementIPNetblock: Found a tree node but prefix is NULL.");
//}
Expand Down Expand Up @@ -745,18 +752,18 @@ TreeNode *CPTFindElement(unsigned char *ipdata, unsigned int ip_bitmask, CPTTree

node = CPTRetriveNode(temp_data, ip_bitmask, node);

if (node && (node->bit != ip_bitmask)) {
if(node == NULL) {
//if (msr && msr->txcfg->debuglog_level >= 9) {
// msr_log(msr, 9, "CPTFindElement: Found a tree node but netmask is different.");
// msr_log(msr, 9, "CPTFindElement: Node tree is NULL.");
//}
return NULL;
return node;
}

if(node == NULL) {
if (node->bit != ip_bitmask) {
//if (msr && msr->txcfg->debuglog_level >= 9) {
// msr_log(msr, 9, "CPTFindElement: Node tree is NULL.");
// msr_log(msr, 9, "CPTFindElement: Found a tree node but netmask is different.");
//}
return node;
return NULL;
}

if(node->prefix == NULL) {
Expand Down Expand Up @@ -967,7 +974,7 @@ int tree_contains_ip(TreeRoot *rtree,
}
}


return 0;
}

Expand Down