Virgin import of bsnmpd 1.8

4 files changed, 14 insertions, 8 deletions

diff --git a/contrib/bsnmp/snmp_mibII/mibII.c b/contrib/bsnmp/snmp_mibII/mibII.c
index 851f17e..f6760dc 100644
--- a/contrib/bsnmp/snmp_mibII/mibII.c
+++ b/contrib/bsnmp/snmp_mibII/mibII.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmp_mibII/mibII.c,v 1.20 2004/08/06 08:46:59 brandt Exp $
+ * $Begemot: bsnmp/snmp_mibII/mibII.c,v 1.21 2005/02/25 16:04:41 brandt_h Exp $
  *
  * Implementation of the standard interfaces and ip MIB.
  */
@@ -590,6 +590,7 @@ mibif_create(u_int sysindex, const char *name)
 	ifp->sysindex = sysindex;
 	strcpy(ifp->name, name);
 	strcpy(ifp->descr, name);
+	ifp->spec_oid = oid_zeroDotZero;
 
 	map = NULL;
 	if (!mib_if_is_dyn(ifp->name)) {
diff --git a/contrib/bsnmp/snmp_mibII/mibII_interfaces.c b/contrib/bsnmp/snmp_mibII/mibII_interfaces.c
index a6ac11c..ffe94fd 100644
--- a/contrib/bsnmp/snmp_mibII/mibII_interfaces.c
+++ b/contrib/bsnmp/snmp_mibII/mibII_interfaces.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmp_mibII/mibII_interfaces.c,v 1.13 2004/08/06 08:47:01 brandt Exp $
+ * $Begemot: bsnmp/snmp_mibII/mibII_interfaces.c,v 1.14 2005/02/25 16:04:42 brandt_h Exp $
  *
  * Interfaces group.
  */
@@ -336,7 +336,7 @@ op_ifentry(struct snmp_context *ctx, struct snmp_value *value,
 		break;
 
 	  case LEAF_ifSpecific:
-		value->v.oid = oid_zeroDotZero;
+		value->v.oid = ifp->spec_oid;
 		break;
 	}
 	return (SNMP_ERR_NOERROR);
diff --git a/contrib/bsnmp/snmp_mibII/snmp_mibII.3 b/contrib/bsnmp/snmp_mibII/snmp_mibII.3
index 94b2590..b87a69c 100644
--- a/contrib/bsnmp/snmp_mibII/snmp_mibII.3
+++ b/contrib/bsnmp/snmp_mibII/snmp_mibII.3
@@ -26,10 +26,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Begemot: bsnmp/snmp_mibII/snmp_mibII.3,v 1.4 2004/08/06 08:47:06 brandt Exp $
+.\" $Begemot: bsnmp/snmp_mibII/snmp_mibII.3,v 1.6 2005/02/28 16:00:11 brandt_h Exp $
 .\"
 .Dd August 19, 2002
-.Dt snmp_mibII 3
+.Dt SNMP_MIBII 3
 .Os
 .Sh NAME
 .Nm mibII ,
@@ -151,6 +151,7 @@ struct mibif {
 	mibif_notify_f	xnotify;
 	void		*xnotify_data;
 	const struct lmodule *xnotify_mod;
+	struct asn_oid	spec_oid;
 };
 .Ed
 .Pp
@@ -337,9 +338,10 @@ The description of the MIB tree implemented by
 .It Pa /usr/local/share/snmp/mibs
 .It Pa @MIBSPATH@
 The various internet MIBs.
+.El
 .Sh SEE ALSO
-.Xr snmpmod 3 ,
-.Xr gensnmptree 1
+.Xr gensnmptree 1 ,
+.Xr snmpmod 3
 .Sh STANDARDS
 This implementation conforms to the applicable IETF RFCs.
 .Sh AUTHORS
diff --git a/contrib/bsnmp/snmp_mibII/snmp_mibII.h b/contrib/bsnmp/snmp_mibII/snmp_mibII.h
index 506fde5..569c115 100644
--- a/contrib/bsnmp/snmp_mibII/snmp_mibII.h
+++ b/contrib/bsnmp/snmp_mibII/snmp_mibII.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/snmp_mibII/snmp_mibII.h,v 1.15 2004/08/06 08:47:06 brandt Exp $
+ * $Begemot: bsnmp/snmp_mibII/snmp_mibII.h,v 1.16 2005/02/25 16:04:43 brandt_h Exp $
  *
  * Implementation of the interfaces and IP groups of MIB-II.
  */
@@ -76,6 +76,9 @@ struct mibif {
 	mibif_notify_f	xnotify;
 	void		*xnotify_data;
 	const struct lmodule *xnotify_mod;
+
+	/* to be set by ifType specific modules. This is ifSpecific. */
+	struct asn_oid	spec_oid;
 };
 
 /*