Skip to content

SNMP: Replace mib_tree_entry struct with MEMPROXY class #2284

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
yadij wants to merge 2 commits into
base: master
Choose a base branch
from
Open

SNMP: Replace mib_tree_entry struct with MEMPROXY class #2284

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
1990278
Replace mib_tree_entry struct with MEMPROXY class
yadij Oct 19, 2025
3f8bbcf
Apply suggestions from code review
yadij Oct 23, 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
9 changes: 2 additions & 7 deletions src/snmp_core.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -993,17 +993,12 @@ snmpAddNode(oid * name, int len, oid_ParseFn * parsefunction, instance_Fn * inst
MemBuf tmp;
debugs(49, 6, "snmpAddNode: Children : " << children << ", Oid : " << snmpDebugOid(name, len, tmp));

const auto entry = static_cast<mib_tree_entry *>(xmalloc(sizeof(mib_tree_entry)));
entry->name = name;
entry->len = len;
const auto entry = new mib_tree_entry(name, len, aggrType);
entry->parsefunction = parsefunction;
entry->instancefunction = instancefunction;
Copy link
Contributor

@kinkie kinkie Oct 24, 2025

Choose a reason for hiding this comment

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

Is there any specific reasons for not including parsefunction and instancefunction in the constructor?

Copy link
Contributor Author

@yadij yadij Oct 25, 2025

Choose a reason for hiding this comment

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

Simplicity for now. Later refactor steps will change them.

Copy link
Contributor

@kinkie kinkie Oct 25, 2025

Choose a reason for hiding this comment

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

What does done look like with the later refactor steps?

Copy link
Contributor

@rousskov rousskov Oct 27, 2025

Choose a reason for hiding this comment

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

What does done look like with the later refactor steps?

I suspect there will be two mib_tree_entry constructors, one setting (constant) parse/instance functions and one prohibiting them. Or two C++ class types to differentiate the two use cases. Or perhaps a lot more classes, with those functions converted to class methods. Delaying that non-trivial refactoring may be the right decision, but I have not studied all the necessary details to be sure.

entry->children = children;
entry->leaves = nullptr;
entry->parent = nullptr;
entry->aggrType = aggrType;

if (children > 0) {
entry->children = children;
entry->leaves = static_cast<mib_tree_entry **>(xmalloc(sizeof(mib_tree_entry *) * children));

va_list args;
Expand Down
28 changes: 17 additions & 11 deletions src/snmp_core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,27 @@ class MemBuf;
#define MAX_PROTOSTAT 5

typedef variable_list *(oid_ParseFn) (variable_list *, snint *);
typedef struct _mib_tree_entry mib_tree_entry;
class mib_tree_entry;
typedef oid *(instance_Fn) (oid * name, snint * len, mib_tree_entry * current, oid_ParseFn ** Fn);
typedef enum {atNone = 0, atSum, atAverage, atMax, atMin} AggrType;

struct _mib_tree_entry {
oid *name;
int len;
oid_ParseFn *parsefunction;
instance_Fn *instancefunction;
int children;

struct _mib_tree_entry **leaves;
class mib_tree_entry
{
MEMPROXY_CLASS(mib_tree_entry);
public:
mib_tree_entry(oid *aName, int aLen, AggrType type) : name(aName), len(aLen), aggrType(type) {}
~mib_tree_entry() = delete;

struct _mib_tree_entry *parent;
AggrType aggrType;
public:
oid * const name;
const int len;
oid_ParseFn *parsefunction = nullptr;
instance_Fn *instancefunction = nullptr;
int children = 0;

mib_tree_entry **leaves = nullptr;
mib_tree_entry *parent = nullptr;
const AggrType aggrType;
};

struct snmp_pdu* snmpAgentResponse(struct snmp_pdu* PDU);
Expand Down