Make initializing smux connection configurable - "smux peer OID" command
initializes connection, and "no smux peer" command terminates it. Fixes
bugzilla #47 and #112.
diff --git a/ripd/ChangeLog b/ripd/ChangeLog
index 8327abf..ee878ff 100644
--- a/ripd/ChangeLog
+++ b/ripd/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-13 Hasso Tepper <hasso at quagga.net>
+
+ * ripd_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>
* *.c: Make more strings const.
diff --git a/ripd/rip_snmp.c b/ripd/rip_snmp.c
index 72f0ff2..93773bc 100644
--- a/ripd/rip_snmp.c
+++ b/ripd/rip_snmp.c
@@ -41,10 +41,6 @@
/* RIPv2-MIB. */
#define RIPV2MIB 1,3,6,1,2,1,23
-/* Zebra enterprise RIP MIB. This variable is used for register
- RIPv2-MIB to SNMP agent under SMUX protocol. */
-#define RIPDOID 1,3,6,1,4,1,3317,1,2,3
-
/* RIPv2-MIB rip2Globals values. */
#define RIP2GLOBALROUTECHANGES 1
#define RIP2GLOBALQUERIES 2
@@ -90,7 +86,6 @@
/* RIP-MIB instances. */
oid rip_oid [] = { RIPV2MIB };
-oid ripd_oid [] = { RIPDOID };
/* Interface cache table sorted by interface's address. */
struct route_table *rip_ifaddr_table;
@@ -575,8 +570,7 @@
{
rip_ifaddr_table = route_table_init ();
- smux_init (master, ripd_oid, sizeof (ripd_oid) / sizeof (oid));
+ smux_init (master);
REGISTER_MIB("mibII/rip", rip_variables, variable, rip_oid);
- smux_start ();
}
#endif /* HAVE_SNMP */