diff options
author | hasso <hasso> | 2004-10-13 10:33:26 +0000 |
---|---|---|
committer | hasso <hasso> | 2004-10-13 10:33:26 +0000 |
commit | c75105ab6e6eeac0b013eab186c97641984f68cc (patch) | |
tree | ea221df06e957de7e83f379c9b45f578762736e7 /zebra | |
parent | d68614db1dc36a6814fee33f584417b1441a83e4 (diff) |
Make initializing smux connection configurable - "smux peer OID" command
initializes connection, and "no smux peer" command terminates it. Fixes
bugzilla #47 and #112.
Diffstat (limited to 'zebra')
-rw-r--r-- | zebra/ChangeLog | 5 | ||||
-rw-r--r-- | zebra/zebra_snmp.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/zebra/ChangeLog b/zebra/ChangeLog index fad80a14..081cffe3 100644 --- a/zebra/ChangeLog +++ b/zebra/ChangeLog @@ -1,3 +1,8 @@ +2004-10-13 Hasso Tepper <hasso at quagga.net> + + * zebra_snmp.c: Remove defaults used to initialize smux connection to + snmpd. Connection is initialized only if smux peer is configured. + 2004-10-12 Hasso Tepper <hasso at quagga.net> * zebra_vty.c: Unbreak "show ip route" command help and make it work diff --git a/zebra/zebra_snmp.c b/zebra/zebra_snmp.c index dece89ea..4536026f 100644 --- a/zebra/zebra_snmp.c +++ b/zebra/zebra_snmp.c @@ -40,7 +40,6 @@ #include "zebra/zserv.h" #define IPFWMIB 1,3,6,1,2,1,4,24 -#define ZEBRAOID 1,3,6,1,4,1,3317,1,2,1 /* ipForwardTable */ #define IPFORWARDDEST 1 @@ -87,7 +86,6 @@ extern struct zebra_t zebrad; oid ipfw_oid [] = { IPFWMIB }; -oid zebra_oid [] = { ZEBRAOID }; /* Hook functions. */ u_char * ipFwNumber (); @@ -564,8 +562,7 @@ ipCidrTable (struct variable *v, oid objid[], size_t *objid_len, void zebra_snmp_init () { - smux_init (zebrad.master, zebra_oid, sizeof (zebra_oid) / sizeof (oid)); + smux_init (zebrad.master); REGISTER_MIB("mibII/ipforward", zebra_variables, variable, ipfw_oid); - smux_start (); } #endif /* HAVE_SNMP */ |