diff options
| author | hasso <hasso> | 2004-10-13 12:33:26 +0200 |
|---|---|---|
| committer | hasso <hasso> | 2004-10-13 12:33:26 +0200 |
| commit | c75105ab6e6eeac0b013eab186c97641984f68cc (patch) | |
| tree | ea221df06e957de7e83f379c9b45f578762736e7 /ospf6d | |
| parent | Unbreak compilation with ospfapi disabled. We should seriously think about (diff) | |
| download | frr-c75105ab6e6eeac0b013eab186c97641984f68cc.tar.xz frr-c75105ab6e6eeac0b013eab186c97641984f68cc.zip | |
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 'ospf6d')
| -rw-r--r-- | ospf6d/ChangeLog | 5 | ||||
| -rw-r--r-- | ospf6d/ospf6_snmp.c | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ospf6d/ChangeLog b/ospf6d/ChangeLog index 17da81d8f..5e16c702c 100644 --- a/ospf6d/ChangeLog +++ b/ospf6d/ChangeLog @@ -1,3 +1,8 @@ +2004-10-12 Hasso Tepper <hasso at quagga.net> + + * ospf6_snmp.c: Remove defaults used to initialize smux connection to + snmpd. Connection is initialized only if smux peer is configured. + 2004-10-11 Hasso Tepper <hasso at quagga.net> * osp6_top.c, ospf6_top.h: Better handling for router-id. If we use diff --git a/ospf6d/ospf6_snmp.c b/ospf6d/ospf6_snmp.c index 98a7f5a97..edc8bc498 100644 --- a/ospf6d/ospf6_snmp.c +++ b/ospf6d/ospf6_snmp.c @@ -50,9 +50,6 @@ /* OSPFv3-MIB */ #define OSPFv3MIB 1,3,6,1,3,102 -/* Zebra enterprise ospf6d MIB */ -#define OSPF6DOID 1,3,6,1,4,1,3317,1,2,6 - /* OSPFv3 MIB General Group values. */ #define OSPFv3ROUTERID 1 #define OSPFv3ADMINSTAT 2 @@ -101,7 +98,6 @@ static struct in_addr tmp; /* OSPFv3-MIB instances. */ oid ospfv3_oid [] = { OSPFv3MIB }; -oid ospf6d_oid [] = { OSPF6DOID }; /* empty ID 0.0.0.0 e.g. empty router-id */ static struct in_addr ospf6_empty_id = {0}; @@ -295,9 +291,8 @@ ospfv3AreaEntry (struct variable *v, oid *name, size_t *length, void ospf6_snmp_init (struct thread_master *master) { - smux_init (master, ospf6d_oid, sizeof (ospf6d_oid) / sizeof (oid)); + smux_init (master); REGISTER_MIB ("OSPFv3MIB", ospfv3_variables, variable, ospfv3_oid); - smux_start (); } #endif /* HAVE_SNMP */ |