diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-09-21 22:11:53 +0000 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-09-21 22:11:53 +0000 |
| commit | 844ec28cee41395cdd1cc0cdf8cf0168f9dc1adf (patch) | |
| tree | f2fe0a9a71bb075a5f6f43cd992b89f46b95574f /zebra/zebra_snmp.c | |
| parent | d0bfb22c223d645e554290ca82581eb06f94ac3b (diff) | |
| parent | 039dc61292de5f3ed5f46316b1940ab6bb184c3f (diff) | |
Merge branch 'cmaster-next' into vtysh-grammar
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Conflicts:
lib/.gitignore
lib/command.c
lib/command.h
Diffstat (limited to 'zebra/zebra_snmp.c')
| -rw-r--r-- | zebra/zebra_snmp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/zebra/zebra_snmp.c b/zebra/zebra_snmp.c index 11fc0ef40d..3186ebf693 100644 --- a/zebra/zebra_snmp.c +++ b/zebra/zebra_snmp.c @@ -39,6 +39,7 @@ #include "zebra/rib.h" #include "zebra/zserv.h" +#include "zebra/zebra_vrf.h" #define IPFWMIB 1,3,6,1,2,1,4,24 @@ -84,7 +85,7 @@ #define IPADDRESS ASN_IPADDRESS #define OBJECTIDENTIFIER ASN_OBJECT_ID -oid ipfw_oid [] = { IPFWMIB }; +static oid ipfw_oid [] = { IPFWMIB }; /* Hook functions. */ static u_char * ipFwNumber (struct variable *, oid [], size_t *, @@ -96,7 +97,7 @@ static u_char * ipCidrNumber (struct variable *, oid [], size_t *, static u_char * ipCidrTable (struct variable *, oid [], size_t *, int, size_t *, WriteMethod **); -struct variable zebra_variables[] = +static struct variable zebra_variables[] = { {0, GAUGE32, RONLY, ipFwNumber, 1, {1}}, {IPFORWARDDEST, IPADDRESS, RONLY, ipFwTable, 3, {2, 1, 1}}, |