mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-03 21:32:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

SNMP: Cleanups after my last changes

Browse Source
This commit is contained in:
Dirk Ziegelmeier 2016-03-23 22:32:06 +01:00
parent 63c2dc926e
commit 52a3bf5d43
8 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/apps/snmp/snmp_mib2.c
View File

@ -35,8 +35,7 @@
#include "lwip/apps/snmp_opts.h"
#if LWIP_SNMP /* don't build if not configured for use in lwipopts.h */
#if SNMP_LWIP_MIB2
#if LWIP_SNMP && SNMP_LWIP_MIB2 /* don't build if not configured for use in lwipopts.h */
#if !LWIP_STATS
#error LWIP_SNMP MIB2 needs LWIP_STATS (for MIB2)
@ -111,5 +110,4 @@ static const struct snmp_tree_node mib2_root = SNMP_CREATE_TREE_NODE(1, mib2_nod
static const u32_t mib2_base_oid_arr[] = { 1,3,6,1,2,1 };
const struct snmp_mib mib2 = SNMP_MIB_CREATE(mib2_base_oid_arr, &mib2_root.node);
#endif /* SNMP_LWIP_MIB2 */
#endif /* LWIP_SNMP */
#endif /* LWIP_SNMP && SNMP_LWIP_MIB2 */

6
src/apps/snmp/snmp_mib2_icmp.c
View File

@ -42,6 +42,8 @@
#include "lwip/icmp.h"
#include "lwip/stats.h"
#if LWIP_SNMP && SNMP_LWIP_MIB2 && LWIP_ICMP
#if SNMP_USE_NETCONN
#define SYNC_NODE_NAME(node_name) node_name ## _synced
#define CREATE_LWIP_SYNC_NODE(oid, node_name) \
@ -53,8 +55,6 @@
/* --- icmp .1.3.6.1.2.1.5 ----------------------------------------------------- */
#if LWIP_ICMP
static u16_t
icmp_get_value(const struct snmp_scalar_array_node_def *node, void *value)
{
@ -179,4 +179,4 @@ static const struct snmp_scalar_array_node_def icmp_nodes[] = {
const struct snmp_scalar_array_node snmp_mib2_icmp_root = SNMP_SCALAR_CREATE_ARRAY_NODE(5, icmp_nodes, icmp_get_value, NULL, NULL);
#endif /* LWIP_ICMP */
#endif /* LWIP_SNMP && SNMP_LWIP_MIB2 && LWIP_ICMP */

4
src/apps/snmp/snmp_mib2_interfaces.c
View File

@ -42,6 +42,8 @@
#include "lwip/netif.h"
#include "lwip/stats.h"
#if LWIP_SNMP && SNMP_LWIP_MIB2
#if SNMP_USE_NETCONN
#define SYNC_NODE_NAME(node_name) node_name ## _synced
#define CREATE_LWIP_SYNC_NODE(oid, node_name) \
@ -368,3 +370,5 @@ static const struct snmp_node* const interface_nodes[] = {
};
const struct snmp_tree_node snmp_mib2_interface_root = SNMP_CREATE_TREE_NODE(2, interface_nodes);
#endif /* LWIP_SNMP && SNMP_LWIP_MIB2 */

4
src/apps/snmp/snmp_mib2_ip.c
View File

@ -44,6 +44,8 @@
#include "lwip/ip.h"
#include "netif/etharp.h"
#if LWIP_SNMP && SNMP_LWIP_MIB2
#if SNMP_USE_NETCONN
#define SYNC_NODE_NAME(node_name) node_name ## _synced
#define CREATE_LWIP_SYNC_NODE(oid, node_name) \
@ -734,3 +736,5 @@ static const struct snmp_node* const at_nodes[] = {
const struct snmp_tree_node snmp_mib2_at_root = SNMP_CREATE_TREE_NODE(3, at_nodes);
#endif /* LWIP_ARP && LWIP_IPV4 */
#endif /* LWIP_SNMP && SNMP_LWIP_MIB2 */

4
src/apps/snmp/snmp_mib2_snmp.c
View File

@ -39,6 +39,8 @@
#include "lwip/apps/snmp_mib2.h"
#include "lwip/apps/snmp_scalar.h"
#if LWIP_SNMP && SNMP_LWIP_MIB2
#define MIB2_AUTH_TRAPS_ENABLED 1
#define MIB2_AUTH_TRAPS_DISABLED 2
@ -221,3 +223,5 @@ static const struct snmp_scalar_array_node_def snmp_nodes[] = {
};
const struct snmp_scalar_array_node snmp_mib2_snmp_root = SNMP_SCALAR_CREATE_ARRAY_NODE(11, snmp_nodes, snmp_get_value, snmp_set_test, snmp_set_value);
#endif /* LWIP_SNMP && SNMP_LWIP_MIB2 */

4
src/apps/snmp/snmp_mib2_system.c
View File

@ -40,6 +40,8 @@
#include "lwip/apps/snmp_table.h"
#include "lwip/apps/snmp_scalar.h"
#if LWIP_SNMP && SNMP_LWIP_MIB2
#if SNMP_USE_NETCONN
#define SYNC_NODE_NAME(node_name) node_name ## _synced
#define CREATE_LWIP_SYNC_NODE(oid, node_name) \
@ -355,3 +357,5 @@ static const struct snmp_scalar_array_node_def system_nodes[] = {
};
const struct snmp_scalar_array_node snmp_mib2_system_node = SNMP_SCALAR_CREATE_ARRAY_NODE(1, system_nodes, system_get_value, system_set_test, system_set_value);
#endif /* LWIP_SNMP && SNMP_LWIP_MIB2 */

6
src/apps/snmp/snmp_mib2_tcp.c
View File

@ -43,6 +43,8 @@
#include "lwip/priv/tcp_priv.h"
#include "lwip/stats.h"
#if LWIP_SNMP && SNMP_LWIP_MIB2 && LWIP_TCP
#if SNMP_USE_NETCONN
#define SYNC_NODE_NAME(node_name) node_name ## _synced
#define CREATE_LWIP_SYNC_NODE(oid, node_name) \
@ -54,8 +56,6 @@
/* --- tcp .1.3.6.1.2.1.6 ----------------------------------------------------- */
#if LWIP_TCP
static u16_t
tcp_get_value(struct snmp_node_instance* instance, void* value)
{
@ -589,4 +589,4 @@ static const struct snmp_node* const tcp_nodes[] = {
};
const struct snmp_tree_node snmp_mib2_tcp_root = SNMP_CREATE_TREE_NODE(6, tcp_nodes);
#endif /* LWIP_TCP */
#endif /* LWIP_SNMP && SNMP_LWIP_MIB2 && LWIP_TCP */

6
src/apps/snmp/snmp_mib2_udp.c
View File

@ -42,6 +42,8 @@
#include "lwip/udp.h"
#include "lwip/stats.h"
#if LWIP_SNMP && SNMP_LWIP_MIB2 && LWIP_UDP
#if SNMP_USE_NETCONN
#define SYNC_NODE_NAME(node_name) node_name ## _synced
#define CREATE_LWIP_SYNC_NODE(oid, node_name) \
@ -53,8 +55,6 @@
/* --- udp .1.3.6.1.2.1.7 ----------------------------------------------------- */
#if LWIP_UDP
static u16_t
udp_get_value(struct snmp_node_instance* instance, void* value)
{
@ -352,4 +352,4 @@ static const struct snmp_node* const udp_nodes[] = {
};
const struct snmp_tree_node snmp_mib2_udp_root = SNMP_CREATE_TREE_NODE(7, udp_nodes);
#endif /* LWIP_UDP */
#endif /* LWIP_SNMP && SNMP_LWIP_MIB2 && LWIP_UDP */