abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-06 22:44:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

snmp: fixed ugly inheritance implementation by aggregating the "base class" (struct mib_node) in all derived node classes to get more type-safe code

Browse Source
This commit is contained in:
Dirk Ziegelmeier 2015-09-30 17:54:25 +02:00 committed by goldsimon
parent 59002d5081
commit 7962b21c00
3 changed files with 447 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

424
src/core/snmp/mib2.c
View File

@ -144,28 +144,30 @@ static const s32_t snmp_ids[28] = {
17, 18, 19, 20, 21, 22, 24, 25, 26, 27, 28, 29, 30 17, 18, 19, 20, 21, 22, 24, 25, 26, 27, 28, 29, 30
}; };
static const struct mib_node* const snmp_nodes[28] = { static const struct mib_node* const snmp_nodes[28] = {
(const struct mib_node*)&snmp_scalar, (const struct mib_node*)&snmp_scalar, &snmp_scalar, &snmp_scalar,
(const struct mib_node*)&snmp_scalar, (const struct mib_node*)&snmp_scalar, &snmp_scalar, &snmp_scalar,
(const struct mib_node*)&snmp_scalar, (const struct mib_node*)&snmp_scalar, &snmp_scalar, &snmp_scalar,
(const struct mib_node*)&snmp_scalar, (const struct mib_node*)&snmp_scalar, &snmp_scalar, &snmp_scalar,
(const struct mib_node*)&snmp_scalar, (const struct mib_node*)&snmp_scalar, &snmp_scalar, &snmp_scalar,
(const struct mib_node*)&snmp_scalar, (const struct mib_node*)&snmp_scalar, &snmp_scalar, &snmp_scalar,
(const struct mib_node*)&snmp_scalar, (const struct mib_node*)&snmp_scalar, &snmp_scalar, &snmp_scalar,
(const struct mib_node*)&snmp_scalar, (const struct mib_node*)&snmp_scalar, &snmp_scalar, &snmp_scalar,
(const struct mib_node*)&snmp_scalar, (const struct mib_node*)&snmp_scalar, &snmp_scalar, &snmp_scalar,
(const struct mib_node*)&snmp_scalar, (const struct mib_node*)&snmp_scalar, &snmp_scalar, &snmp_scalar,
(const struct mib_node*)&snmp_scalar, (const struct mib_node*)&snmp_scalar, &snmp_scalar, &snmp_scalar,
(const struct mib_node*)&snmp_scalar, (const struct mib_node*)&snmp_scalar, &snmp_scalar, &snmp_scalar,
(const struct mib_node*)&snmp_scalar, (const struct mib_node*)&snmp_scalar, &snmp_scalar, &snmp_scalar,
(const struct mib_node*)&snmp_scalar, (const struct mib_node*)&snmp_scalar &snmp_scalar, &snmp_scalar
}; };
static const struct mib_array_node snmp = { static const struct mib_array_node snmp = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_AR, MIB_NODE_AR,
28, 28
},
snmp_ids, snmp_ids,
snmp_nodes snmp_nodes
}; };
@ -177,40 +179,46 @@ static const struct mib_array_node snmp = {
/* udp .1.3.6.1.2.1.7 */ /* udp .1.3.6.1.2.1.7 */
/** index root node for udpTable */ /** index root node for udpTable */
static struct mib_list_rootnode udp_root = { static struct mib_list_rootnode udp_root = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_LR, MIB_NODE_LR,
0, 0
},
NULL, NULL,
NULL, NULL,
0 0
}; };
static const s32_t udpentry_ids[2] = { 1, 2 }; static const s32_t udpentry_ids[2] = { 1, 2 };
static const struct mib_node* const udpentry_nodes[2] = { static const struct mib_node* const udpentry_nodes[2] = {
(const struct mib_node*)&udp_root, (const struct mib_node*)&udp_root, &udp_root.node, &udp_root.node
}; };
static struct mib_array_node udpentry = { static struct mib_array_node udpentry = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_AR, MIB_NODE_AR,
2, 2
},
udpentry_ids, udpentry_ids,
udpentry_nodes udpentry_nodes
}; };
static s32_t udptable_id = 1; static s32_t udptable_id = 1;
static struct mib_node* udptable_node = (struct mib_node*)&udpentry; static struct mib_node* udptable_node = &udpentry.node;
static struct mib_ram_array_node udptable = { static struct mib_ram_array_node udptable = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_RA, MIB_NODE_RA,
0, 0
},
&udptable_id, &udptable_id,
&udptable_node &udptable_node
}; };
@ -225,17 +233,19 @@ static const mib_scalar_node udp_scalar = {
}; };
static const s32_t udp_ids[5] = { 1, 2, 3, 4, 5 }; static const s32_t udp_ids[5] = { 1, 2, 3, 4, 5 };
static const struct mib_node* const udp_nodes[5] = { static const struct mib_node* const udp_nodes[5] = {
(const struct mib_node*)&udp_scalar, (const struct mib_node*)&udp_scalar, &udp_scalar, &udp_scalar,
(const struct mib_node*)&udp_scalar, (const struct mib_node*)&udp_scalar, &udp_scalar, &udp_scalar,
(const struct mib_node*)&udptable &udptable.node
}; };
static const struct mib_array_node udp = { static const struct mib_array_node udp = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_AR, MIB_NODE_AR,
5, 5
},
udp_ids, udp_ids,
udp_nodes udp_nodes
}; };
@ -245,36 +255,41 @@ static const struct mib_array_node udp = {
/* only if the TCP protocol is available may implement this group */ /* only if the TCP protocol is available may implement this group */
/** index root node for tcpConnTable */ /** index root node for tcpConnTable */
static struct mib_list_rootnode tcpconntree_root = { static struct mib_list_rootnode tcpconntree_root = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_LR, MIB_NODE_LR,
0, 0
},
NULL, NULL,
NULL, NULL,
0 0
}; };
static const s32_t tcpconnentry_ids[5] = { 1, 2, 3, 4, 5 }; static const s32_t tcpconnentry_ids[5] = { 1, 2, 3, 4, 5 };
static const struct mib_node* const tcpconnentry_nodes[5] = { static const struct mib_node* const tcpconnentry_nodes[5] = {
(struct mib_node*)&tcpconntree_root, (struct mib_node*)&tcpconntree_root, &tcpconntree_root.node, &tcpconntree_root.node,
(struct mib_node*)&tcpconntree_root, (struct mib_node*)&tcpconntree_root, &tcpconntree_root.node, &tcpconntree_root.node,
(struct mib_node*)&tcpconntree_root &tcpconntree_root.node
}; };
static struct mib_array_node tcpconnentry = { static struct mib_array_node tcpconnentry = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_AR, MIB_NODE_AR,
5, 5
},
tcpconnentry_ids, tcpconnentry_ids,
tcpconnentry_nodes tcpconnentry_nodes
}; };
static s32_t tcpconntable_id = 1; static s32_t tcpconntable_id = 1;
static struct mib_node* tcpconntable_node = (struct mib_node*)&tcpconnentry; static struct mib_node* tcpconntable_node = &tcpconnentry.node;
static struct mib_ram_array_node tcpconntable = { static struct mib_ram_array_node tcpconntable = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
@ -282,7 +297,8 @@ static struct mib_ram_array_node tcpconntable = {
MIB_NODE_RA, MIB_NODE_RA,
/** @todo update maxlength when inserting / deleting from table /** @todo update maxlength when inserting / deleting from table
0 when table is empty, 1 when more than one entry */ 0 when table is empty, 1 when more than one entry */
0, 0
},
&tcpconntable_id, &tcpconntable_id,
&tcpconntable_node &tcpconntable_node
}; };
@ -297,22 +313,24 @@ static const mib_scalar_node tcp_scalar = {
}; };
static const s32_t tcp_ids[15] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }; static const s32_t tcp_ids[15] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };
static const struct mib_node* const tcp_nodes[15] = { static const struct mib_node* const tcp_nodes[15] = {
(const struct mib_node*)&tcp_scalar, (const struct mib_node*)&tcp_scalar, &tcp_scalar, &tcp_scalar,
(const struct mib_node*)&tcp_scalar, (const struct mib_node*)&tcp_scalar, &tcp_scalar, &tcp_scalar,
(const struct mib_node*)&tcp_scalar, (const struct mib_node*)&tcp_scalar, &tcp_scalar, &tcp_scalar,
(const struct mib_node*)&tcp_scalar, (const struct mib_node*)&tcp_scalar, &tcp_scalar, &tcp_scalar,
(const struct mib_node*)&tcp_scalar, (const struct mib_node*)&tcp_scalar, &tcp_scalar, &tcp_scalar,
(const struct mib_node*)&tcp_scalar, (const struct mib_node*)&tcp_scalar, &tcp_scalar, &tcp_scalar,
(const struct mib_node*)&tcpconntable, (const struct mib_node*)&tcp_scalar, &tcpconntable.node, &tcp_scalar,
(const struct mib_node*)&tcp_scalar &tcp_scalar
}; };
static const struct mib_array_node tcp = { static const struct mib_array_node tcp = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_AR, MIB_NODE_AR,
15, 15
},
tcp_ids, tcp_ids,
tcp_nodes tcp_nodes
}; };
@ -329,158 +347,178 @@ static const mib_scalar_node icmp_scalar = {
}; };
static const s32_t icmp_ids[26] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }; static const s32_t icmp_ids[26] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 };
static const struct mib_node* const icmp_nodes[26] = { static const struct mib_node* const icmp_nodes[26] = {
(const struct mib_node*)&icmp_scalar, (const struct mib_node*)&icmp_scalar, &icmp_scalar, &icmp_scalar,
(const struct mib_node*)&icmp_scalar, (const struct mib_node*)&icmp_scalar, &icmp_scalar, &icmp_scalar,
(const struct mib_node*)&icmp_scalar, (const struct mib_node*)&icmp_scalar, &icmp_scalar, &icmp_scalar,
(const struct mib_node*)&icmp_scalar, (const struct mib_node*)&icmp_scalar, &icmp_scalar, &icmp_scalar,
(const struct mib_node*)&icmp_scalar, (const struct mib_node*)&icmp_scalar, &icmp_scalar, &icmp_scalar,
(const struct mib_node*)&icmp_scalar, (const struct mib_node*)&icmp_scalar, &icmp_scalar, &icmp_scalar,
(const struct mib_node*)&icmp_scalar, (const struct mib_node*)&icmp_scalar, &icmp_scalar, &icmp_scalar,
(const struct mib_node*)&icmp_scalar, (const struct mib_node*)&icmp_scalar, &icmp_scalar, &icmp_scalar,
(const struct mib_node*)&icmp_scalar, (const struct mib_node*)&icmp_scalar, &icmp_scalar, &icmp_scalar,
(const struct mib_node*)&icmp_scalar, (const struct mib_node*)&icmp_scalar, &icmp_scalar, &icmp_scalar,
(const struct mib_node*)&icmp_scalar, (const struct mib_node*)&icmp_scalar, &icmp_scalar, &icmp_scalar,
(const struct mib_node*)&icmp_scalar, (const struct mib_node*)&icmp_scalar, &icmp_scalar, &icmp_scalar,
(const struct mib_node*)&icmp_scalar, (const struct mib_node*)&icmp_scalar &icmp_scalar, &icmp_scalar
}; };
static const struct mib_array_node icmp = { static const struct mib_array_node icmp = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_AR, MIB_NODE_AR,
26, 26
},
icmp_ids, icmp_ids,
icmp_nodes icmp_nodes
}; };
/** index root node for ipNetToMediaTable */ /** index root node for ipNetToMediaTable */
static struct mib_list_rootnode ipntomtree_root = { static struct mib_list_rootnode ipntomtree_root = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_LR, MIB_NODE_LR,
0, 0
},
NULL, NULL,
NULL, NULL,
0 0
}; };
static const s32_t ipntomentry_ids[4] = { 1, 2, 3, 4 }; static const s32_t ipntomentry_ids[4] = { 1, 2, 3, 4 };
static const struct mib_node* const ipntomentry_nodes[4] = { static const struct mib_node* const ipntomentry_nodes[4] = {
(struct mib_node*)&ipntomtree_root, (struct mib_node*)&ipntomtree_root, &ipntomtree_root.node, &ipntomtree_root.node,
(struct mib_node*)&ipntomtree_root, (struct mib_node*)&ipntomtree_root &ipntomtree_root.node, &ipntomtree_root.node
}; };
static struct mib_array_node ipntomentry = { static struct mib_array_node ipntomentry = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_AR, MIB_NODE_AR,
4, 4
},
ipntomentry_ids, ipntomentry_ids,
ipntomentry_nodes ipntomentry_nodes
}; };
static s32_t ipntomtable_id = 1; static s32_t ipntomtable_id = 1;
static struct mib_node* ipntomtable_node = (struct mib_node*)&ipntomentry; static struct mib_node* ipntomtable_node = &ipntomentry.node;
static struct mib_ram_array_node ipntomtable = { static struct mib_ram_array_node ipntomtable = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_RA, MIB_NODE_RA,
0, 0
},
&ipntomtable_id, &ipntomtable_id,
&ipntomtable_node &ipntomtable_node
}; };
/** index root node for ipRouteTable */ /** index root node for ipRouteTable */
static struct mib_list_rootnode iprtetree_root = { static struct mib_list_rootnode iprtetree_root = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_LR, MIB_NODE_LR,
0, 0
},
NULL, NULL,
NULL, NULL,
0 0
}; };
static const s32_t iprteentry_ids[13] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }; static const s32_t iprteentry_ids[13] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 };
static const struct mib_node* const iprteentry_nodes[13] = { static const struct mib_node* const iprteentry_nodes[13] = {
(struct mib_node*)&iprtetree_root, (struct mib_node*)&iprtetree_root, &iprtetree_root.node, &iprtetree_root.node,
(struct mib_node*)&iprtetree_root, (struct mib_node*)&iprtetree_root, &iprtetree_root.node, &iprtetree_root.node,
(struct mib_node*)&iprtetree_root, (struct mib_node*)&iprtetree_root, &iprtetree_root.node, &iprtetree_root.node,
(struct mib_node*)&iprtetree_root, (struct mib_node*)&iprtetree_root, &iprtetree_root.node, &iprtetree_root.node,
(struct mib_node*)&iprtetree_root, (struct mib_node*)&iprtetree_root, &iprtetree_root.node, &iprtetree_root.node,
(struct mib_node*)&iprtetree_root, (struct mib_node*)&iprtetree_root, &iprtetree_root.node, &iprtetree_root.node,
(struct mib_node*)&iprtetree_root &iprtetree_root.node
}; };
static struct mib_array_node iprteentry = { static struct mib_array_node iprteentry = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_AR, MIB_NODE_AR,
13, 13
},
iprteentry_ids, iprteentry_ids,
iprteentry_nodes iprteentry_nodes
}; };
static s32_t iprtetable_id = 1; static s32_t iprtetable_id = 1;
static struct mib_node* iprtetable_node = (struct mib_node*)&iprteentry; static struct mib_node* iprtetable_node = &iprteentry.node;
static struct mib_ram_array_node iprtetable = { static struct mib_ram_array_node iprtetable = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_RA, MIB_NODE_RA,
0, 0
},
&iprtetable_id, &iprtetable_id,
&iprtetable_node &iprtetable_node
}; };
/** index root node for ipAddrTable */ /** index root node for ipAddrTable */
static struct mib_list_rootnode ipaddrtree_root = { static struct mib_list_rootnode ipaddrtree_root = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_LR, MIB_NODE_LR,
0, 0
},
NULL, NULL,
NULL, NULL,
0 0
}; };
static const s32_t ipaddrentry_ids[5] = { 1, 2, 3, 4, 5 }; static const s32_t ipaddrentry_ids[5] = { 1, 2, 3, 4, 5 };
static const struct mib_node* const ipaddrentry_nodes[5] = { static const struct mib_node* const ipaddrentry_nodes[5] = {
(const struct mib_node*)&ipaddrtree_root, &ipaddrtree_root.node,
(const struct mib_node*)&ipaddrtree_root, &ipaddrtree_root.node,
(const struct mib_node*)&ipaddrtree_root, &ipaddrtree_root.node,
(const struct mib_node*)&ipaddrtree_root, &ipaddrtree_root.node,
(const struct mib_node*)&ipaddrtree_root &ipaddrtree_root.node
}; };
static struct mib_array_node ipaddrentry = { static struct mib_array_node ipaddrentry = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_AR, MIB_NODE_AR,
5, 5
},
ipaddrentry_ids, ipaddrentry_ids,
ipaddrentry_nodes ipaddrentry_nodes
}; };
static s32_t ipaddrtable_id = 1; static s32_t ipaddrtable_id = 1;
static struct mib_node* ipaddrtable_node = (struct mib_node*)&ipaddrentry; static struct mib_node* ipaddrtable_node = &ipaddrentry.node;
static struct mib_ram_array_node ipaddrtable = { static struct mib_ram_array_node ipaddrtable = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_RA, MIB_NODE_RA,
0, 0
},
&ipaddrtable_id, &ipaddrtable_id,
&ipaddrtable_node &ipaddrtable_node
}; };
@ -496,88 +534,99 @@ static const mib_scalar_node ip_scalar = {
}; };
static const s32_t ip_ids[23] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 }; static const s32_t ip_ids[23] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 };
static const struct mib_node* const ip_nodes[23] = { static const struct mib_node* const ip_nodes[23] = {
(const struct mib_node*)&ip_scalar, (const struct mib_node*)&ip_scalar, &ip_scalar, &ip_scalar,
(const struct mib_node*)&ip_scalar, (const struct mib_node*)&ip_scalar, &ip_scalar, &ip_scalar,
(const struct mib_node*)&ip_scalar, (const struct mib_node*)&ip_scalar, &ip_scalar, &ip_scalar,
(const struct mib_node*)&ip_scalar, (const struct mib_node*)&ip_scalar, &ip_scalar, &ip_scalar,
(const struct mib_node*)&ip_scalar, (const struct mib_node*)&ip_scalar, &ip_scalar, &ip_scalar,
(const struct mib_node*)&ip_scalar, (const struct mib_node*)&ip_scalar, &ip_scalar, &ip_scalar,
(const struct mib_node*)&ip_scalar, (const struct mib_node*)&ip_scalar, &ip_scalar, &ip_scalar,
(const struct mib_node*)&ip_scalar, (const struct mib_node*)&ip_scalar, &ip_scalar, &ip_scalar,
(const struct mib_node*)&ip_scalar, (const struct mib_node*)&ip_scalar, &ip_scalar, &ip_scalar,
(const struct mib_node*)&ip_scalar, (const struct mib_node*)&ipaddrtable, &ip_scalar, &ipaddrtable.node,
(const struct mib_node*)&iprtetable, (const struct mib_node*)&ipntomtable, &iprtetable.node, &ipntomtable.node,
(const struct mib_node*)&ip_scalar &ip_scalar
}; };
static const struct mib_array_node mib2_ip = { static const struct mib_array_node mib2_ip = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_AR, MIB_NODE_AR,
23, 23
},
ip_ids, ip_ids,
ip_nodes ip_nodes
}; };
/** index root node for atTable */ /** index root node for atTable */
static struct mib_list_rootnode arptree_root = { static struct mib_list_rootnode arptree_root = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_LR, MIB_NODE_LR,
0, 0
},
NULL, NULL,
NULL, NULL,
0 0
}; };
static const s32_t atentry_ids[3] = { 1, 2, 3 }; static const s32_t atentry_ids[3] = { 1, 2, 3 };
static const struct mib_node* const atentry_nodes[3] = { static const struct mib_node* const atentry_nodes[3] = {
(const struct mib_node*)&arptree_root, &arptree_root.node,
(const struct mib_node*)&arptree_root, &arptree_root.node,
(const struct mib_node*)&arptree_root &arptree_root.node
}; };
static const struct mib_array_node atentry = { static const struct mib_array_node atentry = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_AR, MIB_NODE_AR,
3, 3
},
atentry_ids, atentry_ids,
atentry_nodes atentry_nodes
}; };
static const s32_t attable_id = 1; static const s32_t attable_id = 1;
static const struct mib_node* const attable_node = (const struct mib_node*)&atentry; static const struct mib_node* const attable_node = &atentry.node;
static struct mib_array_node attable = { static struct mib_array_node attable = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_AR, MIB_NODE_AR,
1, 1
},
&attable_id, &attable_id,
&attable_node &attable_node
}; };
/* at .1.3.6.1.2.1.3 */ /* at .1.3.6.1.2.1.3 */
static s32_t at_id = 1; static s32_t at_id = 1;
static struct mib_node* mib2_at_node = (struct mib_node*)&attable; static struct mib_node* mib2_at_node = &attable.node;
static struct mib_ram_array_node at = { static struct mib_ram_array_node at = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_RA, MIB_NODE_RA,
0, 0
},
&at_id, &at_id,
&mib2_at_node &mib2_at_node
}; };
/** index root node for ifTable */ /** index root node for ifTable */
static struct mib_list_rootnode iflist_root = { static struct mib_list_rootnode iflist_root = {
{
&ifentry_get_object_def, &ifentry_get_object_def,
&ifentry_get_value, &ifentry_get_value,
#if SNMP_SAFE_REQUESTS #if SNMP_SAFE_REQUESTS
@ -588,45 +637,50 @@ static struct mib_list_rootnode iflist_root = {
&ifentry_set_value, &ifentry_set_value,
#endif /* SNMP_SAFE_REQUESTS */ #endif /* SNMP_SAFE_REQUESTS */
MIB_NODE_LR, MIB_NODE_LR,
0, 0
},
NULL, NULL,
NULL, NULL,
0 0
}; };
static const s32_t ifentry_ids[22] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22 }; static const s32_t ifentry_ids[22] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22 };
static const struct mib_node* const ifentry_nodes[22] = { static const struct mib_node* const ifentry_nodes[22] = {
(const struct mib_node*)&iflist_root, (const struct mib_node*)&iflist_root, &iflist_root.node, &iflist_root.node,
(const struct mib_node*)&iflist_root, (const struct mib_node*)&iflist_root, &iflist_root.node, &iflist_root.node,
(const struct mib_node*)&iflist_root, (const struct mib_node*)&iflist_root, &iflist_root.node, &iflist_root.node,
(const struct mib_node*)&iflist_root, (const struct mib_node*)&iflist_root, &iflist_root.node, &iflist_root.node,
(const struct mib_node*)&iflist_root, (const struct mib_node*)&iflist_root, &iflist_root.node, &iflist_root.node,
(const struct mib_node*)&iflist_root, (const struct mib_node*)&iflist_root, &iflist_root.node, &iflist_root.node,
(const struct mib_node*)&iflist_root, (const struct mib_node*)&iflist_root, &iflist_root.node, &iflist_root.node,
(const struct mib_node*)&iflist_root, (const struct mib_node*)&iflist_root, &iflist_root.node, &iflist_root.node,
(const struct mib_node*)&iflist_root, (const struct mib_node*)&iflist_root, &iflist_root.node, &iflist_root.node,
(const struct mib_node*)&iflist_root, (const struct mib_node*)&iflist_root, &iflist_root.node, &iflist_root.node,
(const struct mib_node*)&iflist_root, (const struct mib_node*)&iflist_root &iflist_root.node, &iflist_root.node
}; };
static struct mib_array_node ifentry = { static struct mib_array_node ifentry = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_AR, MIB_NODE_AR,
22, 22
},
ifentry_ids, ifentry_ids,
ifentry_nodes ifentry_nodes
}; };
static s32_t iftable_id = 1; static s32_t iftable_id = 1;
static struct mib_node* iftable_node = (struct mib_node*)&ifentry; static struct mib_node* iftable_node = &ifentry.node;
static struct mib_ram_array_node iftable = { static struct mib_ram_array_node iftable = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_RA, MIB_NODE_RA,
0, 0
},
&iftable_id, &iftable_id,
&iftable_node &iftable_node
}; };
@ -642,15 +696,17 @@ static const mib_scalar_node interfaces_scalar = {
}; };
static const s32_t interfaces_ids[2] = { 1, 2 }; static const s32_t interfaces_ids[2] = { 1, 2 };
static const struct mib_node* const interfaces_nodes[2] = { static const struct mib_node* const interfaces_nodes[2] = {
(const struct mib_node*)&interfaces_scalar, (const struct mib_node*)&iftable &interfaces_scalar, &iftable.node
}; };
static const struct mib_array_node interfaces = { static const struct mib_array_node interfaces = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_AR, MIB_NODE_AR,
2, 2
},
interfaces_ids, interfaces_ids,
interfaces_nodes interfaces_nodes
}; };
@ -668,19 +724,21 @@ static const mib_scalar_node system_scalar = {
}; };
static const s32_t system_ids[7] = { 1, 2, 3, 4, 5, 6, 7 }; static const s32_t system_ids[7] = { 1, 2, 3, 4, 5, 6, 7 };
static const struct mib_node* const system_nodes[7] = { static const struct mib_node* const system_nodes[7] = {
(const struct mib_node*)&system_scalar, (const struct mib_node*)&system_scalar, &system_scalar, &system_scalar,
(const struct mib_node*)&system_scalar, (const struct mib_node*)&system_scalar, &system_scalar, &system_scalar,
(const struct mib_node*)&system_scalar, (const struct mib_node*)&system_scalar, &system_scalar, &system_scalar,
(const struct mib_node*)&system_scalar &system_scalar
}; };
/* work around name issue with 'sys_tem', some compiler(s?) seem to reserve 'system' */ /* work around name issue with 'sys_tem', some compiler(s?) seem to reserve 'system' */
static const struct mib_array_node sys_tem = { static const struct mib_array_node sys_tem = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_AR, MIB_NODE_AR,
7, 7
},
system_ids, system_ids,
system_nodes system_nodes
}; };
@ -691,7 +749,7 @@ static const struct mib_array_node sys_tem = {
#else #else
#define MIB2_GROUPS 7 #define MIB2_GROUPS 7
#endif #endif
static const s32_t mib2_ids[MIB2_GROUPS] = const s32_t mib2_ids[MIB2_GROUPS] =
{ {
1, 1,
2, 2,
@ -705,39 +763,43 @@ static const s32_t mib2_ids[MIB2_GROUPS] =
11 11
}; };
static const struct mib_node* const mib2_nodes[MIB2_GROUPS] = { static const struct mib_node* const mib2_nodes[MIB2_GROUPS] = {
(const struct mib_node*)&sys_tem, &sys_tem.node,
(const struct mib_node*)&interfaces, &interfaces.node,
(const struct mib_node*)&at, &at.node,
(const struct mib_node*)&mib2_ip, &mib2_ip.node,
(const struct mib_node*)&icmp, &icmp.node,
#if LWIP_TCP #if LWIP_TCP
(const struct mib_node*)&tcp, &tcp.node,
#endif #endif
(const struct mib_node*)&udp, &udp.node,
(const struct mib_node*)&snmp &snmp.node
}; };
static const struct mib_array_node mib2 = { const struct mib_array_node mib2 = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_AR, MIB_NODE_AR,
MIB2_GROUPS, MIB2_GROUPS
},
mib2_ids, mib2_ids,
mib2_nodes mib2_nodes
}; };
/* mgmt .1.3.6.1.2 */ /* mgmt .1.3.6.1.2 */
static const s32_t mgmt_ids[1] = { 1 }; const s32_t mgmt_ids[1] = { 1 };
static const struct mib_node* const mgmt_nodes[1] = { (const struct mib_node*)&mib2 }; const struct mib_node* const mgmt_nodes[1] = { (const struct mib_node*)&mib2 };
static const struct mib_array_node mgmt = { const struct mib_array_node mgmt = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_AR, MIB_NODE_AR,
1, 1
},
mgmt_ids, mgmt_ids,
mgmt_nodes mgmt_nodes
}; };
@ -746,28 +808,32 @@ static const struct mib_array_node mgmt = {
#if SNMP_PRIVATE_MIB #if SNMP_PRIVATE_MIB
/* When using a private MIB, you have to create a file 'private_mib.h' that contains /* When using a private MIB, you have to create a file 'private_mib.h' that contains
* a 'struct mib_array_node mib_private' which contains your MIB. */ * a 'struct mib_array_node mib_private' which contains your MIB. */
static s32_t internet_ids[2] = { 2, 4 }; s32_t internet_ids[2] = { 2, 4 };
static const struct mib_node* const internet_nodes[2] = { (const struct mib_node*)&mgmt, (const struct mib_node*)&mib_private }; const struct mib_node* const internet_nodes[2] = { (const struct mib_node*)&mgmt, (const struct mib_node*)&mib_private };
const struct mib_array_node internet = { const struct mib_array_node internet = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_AR, MIB_NODE_AR,
2, 2
},
internet_ids, internet_ids,
internet_nodes internet_nodes
}; };
#else #else
static const s32_t internet_ids[1] = { 2 }; const s32_t internet_ids[1] = { 2 };
static const struct mib_node* const internet_nodes[1] = { (const struct mib_node*)&mgmt }; const struct mib_node* const internet_nodes[1] = { (const struct mib_node*)&mgmt };
const struct mib_array_node internet = { const struct mib_array_node internet = {
{
&noleafs_get_object_def, &noleafs_get_object_def,
&noleafs_get_value, &noleafs_get_value,
&noleafs_set_test, &noleafs_set_test,
&noleafs_set_value, &noleafs_set_value,
MIB_NODE_AR, MIB_NODE_AR,
1, 1
},
internet_ids, internet_ids,
internet_nodes internet_nodes
}; };
@ -939,7 +1005,7 @@ void mib2_netif_added(struct netif *ni)
snmp_mib_node_insert(&iflist_root, iflist_root.count + 1, &if_node); snmp_mib_node_insert(&iflist_root, iflist_root.count + 1, &if_node);
/* enable getnext traversal on filled table */ /* enable getnext traversal on filled table */
iftable.maxlength = 1; iftable.node.maxlength = 1;
} }
void mib2_netif_removed(struct netif *ni) void mib2_netif_removed(struct netif *ni)
@ -948,7 +1014,7 @@ void mib2_netif_removed(struct netif *ni)
snmp_mib_node_delete(&iflist_root, iflist_root.tail); snmp_mib_node_delete(&iflist_root, iflist_root.tail);
/* disable getnext traversal on empty table */ /* disable getnext traversal on empty table */
if(iflist_root.count == 0) iftable.maxlength = 0; if(iflist_root.count == 0) iftable.node.maxlength = 0;
} }
/** /**
@ -985,23 +1051,23 @@ void mib2_add_arp_entry(struct netif *ni, ip4_addr_t *ip)
if (at_node->nptr == NULL) if (at_node->nptr == NULL)
{ {
at_rn = snmp_mib_lrn_alloc(); at_rn = snmp_mib_lrn_alloc();
at_node->nptr = (struct mib_node*)at_rn; at_node->nptr = &at_rn->node;
if (at_rn != NULL) if (at_rn != NULL)
{ {
if (level == 3) if (level == 3)
{ {
if (tree == 0) if (tree == 0)
{ {
at_rn->get_object_def = atentry_get_object_def; at_rn->node.get_object_def = atentry_get_object_def;
at_rn->get_value = atentry_get_value; at_rn->node.get_value = atentry_get_value;
} }
else else
{ {
at_rn->get_object_def = ip_ntomentry_get_object_def; at_rn->node.get_object_def = ip_ntomentry_get_object_def;
at_rn->get_value = ip_ntomentry_get_value; at_rn->node.get_value = ip_ntomentry_get_value;
} }
at_rn->set_test = noleafs_set_test; at_rn->node.set_test = noleafs_set_test;
at_rn->set_value = noleafs_set_value; at_rn->node.set_value = noleafs_set_value;
} }
} }
else else
@ -1019,8 +1085,8 @@ void mib2_add_arp_entry(struct netif *ni, ip4_addr_t *ip)
} }
} }
/* enable getnext traversal on filled tables */ /* enable getnext traversal on filled tables */
at.maxlength = 1; at.node.maxlength = 1;
ipntomtable.maxlength = 1; ipntomtable.node.maxlength = 1;
} }
/** /**
@ -1091,8 +1157,8 @@ void mib2_remove_arp_entry(struct netif *ni, ip4_addr_t *ip)
} }
} }
/* disable getnext traversal on empty tables */ /* disable getnext traversal on empty tables */
if(arptree_root.count == 0) at.maxlength = 0; if(arptree_root.count == 0) at.node.maxlength = 0;
if(ipntomtree_root.count == 0) ipntomtable.maxlength = 0; if(ipntomtree_root.count == 0) ipntomtable.node.maxlength = 0;
} }
/** /**
@ -1120,15 +1186,15 @@ void mib2_add_ip4(struct netif *ni)
if (ipa_node->nptr == NULL) if (ipa_node->nptr == NULL)
{ {
ipa_rn = snmp_mib_lrn_alloc(); ipa_rn = snmp_mib_lrn_alloc();
ipa_node->nptr = (struct mib_node*)ipa_rn; ipa_node->nptr = &ipa_rn->node;
if (ipa_rn != NULL) if (ipa_rn != NULL)
{ {
if (level == 2) if (level == 2)
{ {
ipa_rn->get_object_def = ip_addrentry_get_object_def; ipa_rn->node.get_object_def = ip_addrentry_get_object_def;
ipa_rn->get_value = ip_addrentry_get_value; ipa_rn->node.get_value = ip_addrentry_get_value;
ipa_rn->set_test = noleafs_set_test; ipa_rn->node.set_test = noleafs_set_test;
ipa_rn->set_value = noleafs_set_value; ipa_rn->node.set_value = noleafs_set_value;
} }
} }
else else
@ -1146,7 +1212,7 @@ void mib2_add_ip4(struct netif *ni)
level++; level++;
} }
/* enable getnext traversal on filled table */ /* enable getnext traversal on filled table */
ipaddrtable.maxlength = 1; ipaddrtable.node.maxlength = 1;
} }
/** /**
@ -1207,7 +1273,7 @@ void mib2_remove_ip4(struct netif *ni)
} }
} }
/* disable getnext traversal on empty table */ /* disable getnext traversal on empty table */
if (ipaddrtree_root.count == 0) ipaddrtable.maxlength = 0; if (ipaddrtree_root.count == 0) ipaddrtable.node.maxlength = 0;
} }
/** /**
@ -1259,15 +1325,15 @@ void mib2_add_route_ip4(u8_t dflt, struct netif *ni)
if (iprte_node->nptr == NULL) if (iprte_node->nptr == NULL)
{ {
iprte_rn = snmp_mib_lrn_alloc(); iprte_rn = snmp_mib_lrn_alloc();
iprte_node->nptr = (struct mib_node*)iprte_rn; iprte_node->nptr = &iprte_rn->node;
if (iprte_rn != NULL) if (iprte_rn != NULL)
{ {
if (level == 2) if (level == 2)
{ {
iprte_rn->get_object_def = ip_rteentry_get_object_def; iprte_rn->node.get_object_def = ip_rteentry_get_object_def;
iprte_rn->get_value = ip_rteentry_get_value; iprte_rn->node.get_value = ip_rteentry_get_value;
iprte_rn->set_test = noleafs_set_test; iprte_rn->node.set_test = noleafs_set_test;
iprte_rn->set_value = noleafs_set_value; iprte_rn->node.set_value = noleafs_set_value;
} }
} }
else else
@ -1286,7 +1352,7 @@ void mib2_add_route_ip4(u8_t dflt, struct netif *ni)
} }
} }
/* enable getnext traversal on filled table */ /* enable getnext traversal on filled table */
iprtetable.maxlength = 1; iprtetable.node.maxlength = 1;
} }
/** /**
@ -1370,7 +1436,7 @@ void mib2_remove_route_ip4(u8_t dflt, struct netif *ni)
} }
} }
/* disable getnext traversal on empty table */ /* disable getnext traversal on empty table */
if (iprtetree_root.count == 0) iprtetable.maxlength = 0; if (iprtetree_root.count == 0) iprtetable.node.maxlength = 0;
} }
@ -1403,15 +1469,15 @@ void mib2_udp_bind(struct udp_pcb *pcb)
if (udp_node->nptr == NULL) if (udp_node->nptr == NULL)
{ {
udp_rn = snmp_mib_lrn_alloc(); udp_rn = snmp_mib_lrn_alloc();
udp_node->nptr = (struct mib_node*)udp_rn; udp_node->nptr = &udp_rn->node;
if (udp_rn != NULL) if (udp_rn != NULL)
{ {
if (level == 3) if (level == 3)
{ {
udp_rn->get_object_def = udpentry_get_object_def; udp_rn->node.get_object_def = udpentry_get_object_def;
udp_rn->get_value = udpentry_get_value; udp_rn->node.get_value = udpentry_get_value;
udp_rn->set_test = noleafs_set_test; udp_rn->node.set_test = noleafs_set_test;
udp_rn->set_value = noleafs_set_value; udp_rn->node.set_value = noleafs_set_value;
} }
} }
else else
@ -1427,7 +1493,7 @@ void mib2_udp_bind(struct udp_pcb *pcb)
} }
} }
} }
udptable.maxlength = 1; udptable.node.maxlength = 1;
} }
/** /**
@ -1511,7 +1577,7 @@ void mib2_udp_unbind(struct udp_pcb *pcb)
} }
} }
/* disable getnext traversal on empty table */ /* disable getnext traversal on empty table */
if (udp_root.count == 0) udptable.maxlength = 0; if (udp_root.count == 0) udptable.node.maxlength = 0;
} }

67
src/core/snmp/mib_structs.c
View File

@ -183,12 +183,12 @@ snmp_mib_lrn_alloc(void)
lrn = (struct mib_list_rootnode*)memp_malloc(MEMP_SNMP_ROOTNODE); lrn = (struct mib_list_rootnode*)memp_malloc(MEMP_SNMP_ROOTNODE);
if (lrn != NULL) if (lrn != NULL)
{ {
lrn->get_object_def = noleafs_get_object_def; lrn->node.get_object_def = noleafs_get_object_def;
lrn->get_value = noleafs_get_value; lrn->node.get_value = noleafs_get_value;
lrn->set_test = noleafs_set_test; lrn->node.set_test = noleafs_set_test;
lrn->set_value = noleafs_set_value; lrn->node.set_value = noleafs_set_value;
lrn->node_type = MIB_NODE_LR; lrn->node.node_type = MIB_NODE_LR;
lrn->maxlength = 0; lrn->node.maxlength = 0;
lrn->head = NULL; lrn->head = NULL;
lrn->tail = NULL; lrn->tail = NULL;
lrn->count = 0; lrn->count = 0;
@ -469,11 +469,11 @@ snmp_search_tree(const struct mib_node *node, u8_t ident_len, s32_t *ident, stru
/* array node (internal ROM or RAM, fixed length) */ /* array node (internal ROM or RAM, fixed length) */
an = (const struct mib_array_node *)node; an = (const struct mib_array_node *)node;
i = 0; i = 0;
while ((i < an->maxlength) && (an->objid[i] != *ident)) while ((i < an->node.maxlength) && (an->objid[i] != *ident))
{ {
i++; i++;
} }
if (i < an->maxlength) if (i < an->node.maxlength)
{ {
/* found it, if available proceed to child, otherwise inspect leaf */ /* found it, if available proceed to child, otherwise inspect leaf */
LWIP_DEBUGF(SNMP_MIB_DEBUG,("an->objid[%"U16_F"]==%"S32_F" *ident==%"S32_F"\n",i,an->objid[i],*ident)); LWIP_DEBUGF(SNMP_MIB_DEBUG,("an->objid[%"U16_F"]==%"S32_F" *ident==%"S32_F"\n",i,an->objid[i],*ident));
@ -483,7 +483,7 @@ snmp_search_tree(const struct mib_node *node, u8_t ident_len, s32_t *ident, stru
inspect remaining instance number / table index */ inspect remaining instance number / table index */
np->ident_len = ident_len; np->ident_len = ident_len;
np->ident = ident; np->ident = ident;
return (const struct mib_node*)an; return &an->node;
} }
else else
{ {
@ -530,7 +530,7 @@ snmp_search_tree(const struct mib_node *node, u8_t ident_len, s32_t *ident, stru
{ {
np->ident_len = ident_len; np->ident_len = ident_len;
np->ident = ident; np->ident = ident;
return (const struct mib_node*)lrn; return &lrn->node;
} }
else else
{ {
@ -580,7 +580,7 @@ snmp_search_tree(const struct mib_node *node, u8_t ident_len, s32_t *ident, stru
{ {
np->ident_len = ident_len; np->ident_len = ident_len;
np->ident = ident; np->ident = ident;
return (const struct mib_node*)en; return &en->node;
} }
else else
{ {
@ -606,14 +606,12 @@ snmp_search_tree(const struct mib_node *node, u8_t ident_len, s32_t *ident, stru
} }
else if (node_type == MIB_NODE_SC) else if (node_type == MIB_NODE_SC)
{ {
const mib_scalar_node *sn; /* scalar node */
sn = (const mib_scalar_node *)node;
if ((ident_len == 1) && (*ident == 0)) if ((ident_len == 1) && (*ident == 0))
{ {
np->ident_len = ident_len; np->ident_len = ident_len;
np->ident = ident; np->ident = ident;
return (const struct mib_node*)sn; return node;
} }
else else
{ {
@ -659,7 +657,7 @@ empty_table(const struct mib_node *node)
{ {
const struct mib_array_node *an; const struct mib_array_node *an;
an = (const struct mib_array_node *)node; an = (const struct mib_array_node *)node;
if ((an->maxlength == 0) || (an->nptr == NULL)) if ((an->node.maxlength == 0) || (an->nptr == NULL))
{ {
empty = 1; empty = 1;
} }
@ -702,11 +700,11 @@ snmp_expand_tree(const struct mib_node *node, u8_t ident_len, s32_t *ident, stru
if (ident_len > 0) if (ident_len > 0)
{ {
i = 0; i = 0;
while ((i < an->maxlength) && (an->objid[i] < *ident)) while ((i < an->node.maxlength) && (an->objid[i] < *ident))
{ {
i++; i++;
} }
if (i < an->maxlength) if (i < an->node.maxlength)
{ {
LWIP_DEBUGF(SNMP_MIB_DEBUG,("an->objid[%"U16_F"]==%"S32_F" *ident==%"S32_F"\n",i,an->objid[i],*ident)); LWIP_DEBUGF(SNMP_MIB_DEBUG,("an->objid[%"U16_F"]==%"S32_F" *ident==%"S32_F"\n",i,an->objid[i],*ident));
/* add identifier to oidret */ /* add identifier to oidret */
@ -719,15 +717,15 @@ snmp_expand_tree(const struct mib_node *node, u8_t ident_len, s32_t *ident, stru
/* leaf node (e.g. in a fixed size table) */ /* leaf node (e.g. in a fixed size table) */
if (an->objid[i] > *ident) if (an->objid[i] > *ident)
{ {
return (const struct mib_node*)an; return &an->node;
} }
else if ((i + 1) < an->maxlength) else if ((i + 1) < an->node.maxlength)
{ {
/* an->objid[i] == *ident */ /* an->objid[i] == *ident */
(oidret->len)--; (oidret->len)--;
oidret->id[oidret->len] = an->objid[i + 1]; oidret->id[oidret->len] = an->objid[i + 1];
(oidret->len)++; (oidret->len)++;
return (const struct mib_node*)an; return &an->node;
} }
else else
{ {
@ -744,11 +742,11 @@ snmp_expand_tree(const struct mib_node *node, u8_t ident_len, s32_t *ident, stru
/* non-leaf, store right child ptr and id */ /* non-leaf, store right child ptr and id */
LWIP_ASSERT("i < 0xff", i < 0xff); LWIP_ASSERT("i < 0xff", i < 0xff);
j = i + 1; j = i + 1;
while ((j < an->maxlength) && (empty_table(an->nptr[j]))) while ((j < an->node.maxlength) && (empty_table(an->nptr[j])))
{ {
j++; j++;
} }
if (j < an->maxlength) if (j < an->node.maxlength)
{ {
struct nse cur_node; struct nse cur_node;
cur_node.r_ptr = an->nptr[j]; cur_node.r_ptr = an->nptr[j];
@ -785,11 +783,11 @@ snmp_expand_tree(const struct mib_node *node, u8_t ident_len, s32_t *ident, stru
u16_t j; u16_t j;
/* ident_len == 0, complete with leftmost '.thing' */ /* ident_len == 0, complete with leftmost '.thing' */
j = 0; j = 0;
while ((j < an->maxlength) && empty_table(an->nptr[j])) while ((j < an->node.maxlength) && empty_table(an->nptr[j]))
{ {
j++; j++;
} }
if (j < an->maxlength) if (j < an->node.maxlength)
{ {
LWIP_DEBUGF(SNMP_MIB_DEBUG,("left an->objid[j]==%"S32_F"\n",an->objid[j])); LWIP_DEBUGF(SNMP_MIB_DEBUG,("left an->objid[j]==%"S32_F"\n",an->objid[j]));
oidret->id[oidret->len] = an->objid[j]; oidret->id[oidret->len] = an->objid[j];
@ -797,7 +795,7 @@ snmp_expand_tree(const struct mib_node *node, u8_t ident_len, s32_t *ident, stru
if (an->nptr[j] == NULL) if (an->nptr[j] == NULL)
{ {
/* leaf node */ /* leaf node */
return (const struct mib_node*)an; return &an->node;
} }
else else
{ {
@ -837,7 +835,7 @@ snmp_expand_tree(const struct mib_node *node, u8_t ident_len, s32_t *ident, stru
/* leaf node */ /* leaf node */
if (ln->objid > *ident) if (ln->objid > *ident)
{ {
return (const struct mib_node*)lrn; return &lrn->node;
} }
else if (ln->next != NULL) else if (ln->next != NULL)
{ {
@ -845,7 +843,7 @@ snmp_expand_tree(const struct mib_node *node, u8_t ident_len, s32_t *ident, stru
(oidret->len)--; (oidret->len)--;
oidret->id[oidret->len] = ln->next->objid; oidret->id[oidret->len] = ln->next->objid;
(oidret->len)++; (oidret->len)++;
return (const struct mib_node*)lrn; return &lrn->node;
} }
else else
{ {
@ -915,7 +913,7 @@ snmp_expand_tree(const struct mib_node *node, u8_t ident_len, s32_t *ident, stru
{ {
/* leaf node */ /* leaf node */
LWIP_DEBUGF(SNMP_MIB_DEBUG,("jn->nptr == NULL\n")); LWIP_DEBUGF(SNMP_MIB_DEBUG,("jn->nptr == NULL\n"));
return (const struct mib_node*)lrn; return &lrn->node;
} }
else else
{ {
@ -961,7 +959,7 @@ snmp_expand_tree(const struct mib_node *node, u8_t ident_len, s32_t *ident, stru
/* leaf node */ /* leaf node */
if (ex_id > *ident) if (ex_id > *ident)
{ {
return (const struct mib_node*)en; return &en->node;
} }
else if ((i + 1) < len) else if ((i + 1) < len)
{ {
@ -970,7 +968,7 @@ snmp_expand_tree(const struct mib_node *node, u8_t ident_len, s32_t *ident, stru
(oidret->len)--; (oidret->len)--;
oidret->id[oidret->len] = ex_id; oidret->id[oidret->len] = ex_id;
(oidret->len)++; (oidret->len)++;
return (const struct mib_node*)en; return &en->node;
} }
else else
{ {
@ -1031,7 +1029,7 @@ snmp_expand_tree(const struct mib_node *node, u8_t ident_len, s32_t *ident, stru
{ {
/* leaf node */ /* leaf node */
LWIP_DEBUGF(SNMP_MIB_DEBUG,("(ext_level + 1) == en->tree_levels\n")); LWIP_DEBUGF(SNMP_MIB_DEBUG,("(ext_level + 1) == en->tree_levels\n"));
return (const struct mib_node*)en; return &en->node;
} }
else else
{ {
@ -1042,10 +1040,7 @@ snmp_expand_tree(const struct mib_node *node, u8_t ident_len, s32_t *ident, stru
} }
else if(node_type == MIB_NODE_SC) else if(node_type == MIB_NODE_SC)
{ {
const mib_scalar_node *sn;
/* scalar node */ /* scalar node */
sn = (const mib_scalar_node *)node;
if (ident_len > 0) if (ident_len > 0)
{ {
/* at .0 */ /* at .0 */
@ -1058,7 +1053,7 @@ snmp_expand_tree(const struct mib_node *node, u8_t ident_len, s32_t *ident, stru
(oidret->len)++; (oidret->len)++;
/* leaf node */ /* leaf node */
LWIP_DEBUGF(SNMP_MIB_DEBUG,("completed scalar leaf\n")); LWIP_DEBUGF(SNMP_MIB_DEBUG,("completed scalar leaf\n"));
return (const struct mib_node*)sn; return node;
} }
} }
else else

32
src/include/lwip/snmp_structs.h
View File

@ -128,13 +128,7 @@ typedef struct mib_node mib_scalar_node;
struct mib_array_node struct mib_array_node
{ {
/* inherited "base class" members */ /* inherited "base class" members */
void (*get_object_def)(u8_t ident_len, s32_t *ident, struct obj_def *od); struct mib_node node;
void (*get_value)(struct obj_def *od, u16_t len, void *value);
u8_t (*set_test)(struct obj_def *od, u16_t len, void *value);
void (*set_value)(struct obj_def *od, u16_t len, void *value);
u8_t node_type;
u16_t maxlength;
/* additional struct members */ /* additional struct members */
const s32_t *objid; const s32_t *objid;
@ -146,13 +140,7 @@ struct mib_array_node
struct mib_ram_array_node struct mib_ram_array_node
{ {
/* inherited "base class" members */ /* inherited "base class" members */
void (*get_object_def)(u8_t ident_len, s32_t *ident, struct obj_def *od); struct mib_node node;
void (*get_value)(struct obj_def *od, u16_t len, void *value);
u8_t (*set_test)(struct obj_def *od, u16_t len, void *value);
void (*set_value)(struct obj_def *od, u16_t len, void *value);
u8_t node_type;
u16_t maxlength;
/* aditional struct members */ /* aditional struct members */
s32_t *objid; s32_t *objid;
@ -172,13 +160,7 @@ struct mib_list_node
struct mib_list_rootnode struct mib_list_rootnode
{ {
/* inherited "base class" members */ /* inherited "base class" members */
void (*get_object_def)(u8_t ident_len, s32_t *ident, struct obj_def *od); struct mib_node node;
void (*get_value)(struct obj_def *od, u16_t len, void *value);
u8_t (*set_test)(struct obj_def *od, u16_t len, void *value);
void (*set_value)(struct obj_def *od, u16_t len, void *value);
u8_t node_type;
u16_t maxlength;
/* additional struct members */ /* additional struct members */
struct mib_list_node *head; struct mib_list_node *head;
@ -192,13 +174,7 @@ struct mib_list_rootnode
struct mib_external_node struct mib_external_node
{ {
/* inherited "base class" members */ /* inherited "base class" members */
void (*get_object_def)(u8_t ident_len, s32_t *ident, struct obj_def *od); struct mib_node node;
void (*get_value)(struct obj_def *od, u16_t len, void *value);
u8_t (*set_test)(struct obj_def *od, u16_t len, void *value);
void (*set_value)(struct obj_def *od, u16_t len, void *value);
u8_t node_type;
u16_t maxlength;
/* additional struct members */ /* additional struct members */
/** points to an external (in memory) record of some sort of addressing /** points to an external (in memory) record of some sort of addressing