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 /bgpd | |
| 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 'bgpd')
| -rw-r--r-- | bgpd/ChangeLog | 5 | ||||
| -rw-r--r-- | bgpd/bgp_snmp.c | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog index 93feb051..1d162287 100644 --- a/bgpd/ChangeLog +++ b/bgpd/ChangeLog @@ -1,3 +1,8 @@ +2004-10-13 Hasso Tepper <hasso at quagga.net> + + * bgp_snmp.c: Remove defaults used to initialize smux connection to + snmpd. Connection is initialized only if smux peer is configured. + 2004-10-13 Paul Jakma <paul@dishone.st> * (global) more const'ification and fixups of types to clean up code. diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c index e5bcd03b..6ffadf9c 100644 --- a/bgpd/bgp_snmp.c +++ b/bgpd/bgp_snmp.c @@ -49,10 +49,6 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #define BGPESTABLISHED 1 #define BGPBACKWARDTRANSITION 2 -/* Zebra enterprise BGP MIB. This variable is used for register - OSPF MIB to SNMP agent under SMUX protocol. */ -#define BGPDMIB 1,3,6,1,4,1,3317,1,2,2 - /* BGP MIB bgpVersion. */ #define BGPVERSION 0 @@ -125,7 +121,6 @@ SNMP_LOCAL_VARIABLES /* BGP-MIB instances. */ oid bgp_oid [] = { BGP4MIB }; -oid bgpd_oid [] = { BGPDMIB }; /* IP address 0.0.0.0. */ static struct in_addr bgp_empty_addr = {0}; @@ -880,8 +875,7 @@ bgp_snmp_init () if ( !(bm = bgp_get_master ()) ) return; - smux_init (bm->master, bgpd_oid, sizeof bgpd_oid / sizeof (oid)); + smux_init (bm->master); REGISTER_MIB("mibII/bgp", bgp_variables, variable, bgp_oid); - smux_start (); } #endif /* HAVE_SNMP */ |