Virgin import of bsnmpd 1.8

5 files changed, 35 insertions, 31 deletions

diff --git a/contrib/bsnmp/lib/asn1.3 b/contrib/bsnmp/lib/asn1.3
index 0b7e768..017e61a 100644
--- a/contrib/bsnmp/lib/asn1.3
+++ b/contrib/bsnmp/lib/asn1.3
@@ -26,10 +26,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Begemot: bsnmp/lib/asn1.3,v 1.5 2004/08/06 08:46:48 brandt Exp $
+.\" $Begemot: bsnmp/lib/asn1.3,v 1.6 2005/02/25 11:55:57 brandt_h Exp $
 .\"
 .Dd August 15, 2002
-.Dt asn1 3
+.Dt ASN1 3
 .Os
 .Sh NAME
 .Nm asn_get_header ,
@@ -253,7 +253,7 @@ length, insert it into the right place and shift the value if the resulting
 length field is shorter than the estimated one.
 .Pp
 The function
-.Fn asn_get_integer_raw 
+.Fn asn_get_integer_raw
 is used to decode a signed integer value (32-bit). It assumes, that the
 header of the integer has been decoded already.
 .Fa len
@@ -443,7 +443,7 @@ makes a printable string from
 The buffer pointed to by
 .Fa str
 must be large enough to hold the result. The constant
-.Li ASN_OIDSTRLEN	
+.Li ASN_OIDSTRLEN
 is defined to be the length of the maximum string generated by this function
 (including the trailing NUL).
 The function
@@ -468,11 +468,11 @@ starting with
 .Sq ASN.1:
 followed by the error message and an optional dump of the buffer.
 .Sh SEE ALSO
-.Xr snmpd 1 ,
 .Xr gensnmptree 1 ,
-.Xr bsnmplib 3
+.Xr snmpd 1 ,
+.Xr bsnmpagent 3 ,
 .Xr bsnmpclient 3 ,
-.Xr bsnmpagent 3
+.Xr bsnmplib 3
 .Sh STANDARDS
 This implementation conforms to the applicable IETF RFCs and ITU-T
 recommendations.
diff --git a/contrib/bsnmp/lib/bsnmpagent.3 b/contrib/bsnmp/lib/bsnmpagent.3
index a679fe8..d563aa9 100644
--- a/contrib/bsnmp/lib/bsnmpagent.3
+++ b/contrib/bsnmp/lib/bsnmpagent.3
@@ -26,13 +26,13 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Begemot: bsnmp/lib/bsnmpagent.3,v 1.6 2004/08/06 08:46:51 brandt Exp $
+.\" $Begemot: bsnmp/lib/bsnmpagent.3,v 1.7 2005/02/25 11:55:58 brandt_h Exp $
 .\"
 .Dd August 16, 2002
-.Dt bsnmpagent 3
+.Dt BSNMPAGENT 3
 .Os
 .Sh NAME
-.Nm bsnmpagent
+.Nm bsnmpagent ,
 .Nm snmp_depop_t ,
 .Nm snmp_op_t ,
 .Nm tree ,
@@ -200,7 +200,7 @@ Note, that one must be careful when changing the tree while executing a SET
 operation. Consult the sources for
 .Xr snmpd 1 .
 .Pp
-The global variable 
+The global variable
 .Va snmp_trace
 together with the function pointed to by
 .Va snmp_debug
@@ -309,7 +309,7 @@ interdependend table columns dependencies may be necessary.
 If the previous step fails at any point, the node's operation callback
 functions are called for all bindings for which SNMP_OP_SET was executed
 with SNMP_OP_ROLLBACK, in the opposite order. This allows all variables to
-undo the effect of the SET operation. After this all the dependencies 
+undo the effect of the SET operation. After this all the dependencies
 are freed
 and the finalizers are executed with a fail flag of 1. Then the function
 returns to the caller with an appropriate error indication.
@@ -345,7 +345,7 @@ two OIDs. In the table case, the first oid is typically the table's base OID
 and the second one the index. Both of these can easily be generated from the
 variables OID with
 .Fn asn_slice_oid .
-The function 
+The function
 .Fn snmp_dep_lookup
 tries to find a dependency based on these two OIDs and, if it cannot find one
 creates a new one. This means for the table example, that the function
@@ -399,10 +399,10 @@ If an error occures in any of the function an error indication as described
 above is returned. Additionally the functions may call snmp_error on unexected
 errors.
 .Sh SEE ALSO
-.Xr snmpd 1 ,
 .Xr gensnmptree 1 ,
-.Xr bsnmplib 3
+.Xr snmpd 1 ,
 .Xr bsnmpclient 3 ,
+.Xr bsnmplib 3 ,
 .Xr snmpmod 3
 .Sh STANDARDS
 This implementation conforms to the applicable IETF RFCs and ITU-T
diff --git a/contrib/bsnmp/lib/bsnmpclient.3 b/contrib/bsnmp/lib/bsnmpclient.3
index d75232e..9775ef2 100644
--- a/contrib/bsnmp/lib/bsnmpclient.3
+++ b/contrib/bsnmp/lib/bsnmpclient.3
@@ -26,10 +26,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Begemot: bsnmp/lib/bsnmpclient.3,v 1.7 2004/08/06 08:46:52 brandt Exp $
+.\" $Begemot: bsnmp/lib/bsnmpclient.3,v 1.8 2005/02/25 11:55:58 brandt_h Exp $
 .\"
 .Dd August 15, 2002
-.Dt bsnmpclient 3
+.Dt BSNMPCLIENT 3
 .Os
 .Sh NAME
 .Nm snmp_client ,
@@ -145,12 +145,12 @@ for applicable values. The default version is
 .Li SNMP_V2c .
 .It Va trans
 If this is
-.Dv SNMP_TRANS_LOC_DGRAM 
+.Dv SNMP_TRANS_LOC_DGRAM
 a local datagram socket is used.
 If it is
-.Dv SNMP_TRANS_LOC_STREAM 
+.Dv SNMP_TRANS_LOC_STREAM
 a local stream socket is used.
-For 
+For
 .Dv SNMP_TRANS_UDP
 a UDP socket is created.
 It uses the
@@ -237,9 +237,8 @@ application.
 .El
 .Pp
 In the current implementation there is a global variable
-.Bd -unfilled -offset indent
-.Vt extern struct snmp_client snmp_client ;
-.Ed
+.Pp
+.D1 Vt extern struct snmp_client snmp_client ;
 .Pp
 that is used by all the library functions. The first call into the library must
 be a call to
@@ -580,10 +579,10 @@ in the
 filed of
 .Va snmp_client .
 .Sh SEE ALSO
-.Xr snmpd 1 ,
 .Xr gensnmptree 1 ,
+.Xr snmpd 1 ,
+.Xr bsnmpagent 3 ,
 .Xr bsnmplib 3
-.Xr bsnmpagent 3
 .Sh STANDARDS
 This implementation conforms to the applicable IETF RFCs and ITU-T
 recommendations.
diff --git a/contrib/bsnmp/lib/bsnmplib.3 b/contrib/bsnmp/lib/bsnmplib.3
index d4e0f13..a0da293 100644
--- a/contrib/bsnmp/lib/bsnmplib.3
+++ b/contrib/bsnmp/lib/bsnmplib.3
@@ -26,10 +26,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Begemot: bsnmp/lib/bsnmplib.3,v 1.5 2004/08/06 08:46:52 brandt Exp $
+.\" $Begemot: bsnmp/lib/bsnmplib.3,v 1.6 2005/02/25 11:55:59 brandt_h Exp $
 .\"
 .Dd August 15, 2002
-.Dt bsnmplib 3
+.Dt BSNMPLIB 3
 .Os
 .Sh NAME
 .Nm snmp_value_free ,
@@ -290,11 +290,11 @@ Success.
 Encoding failed.
 .El
 .Sh SEE ALSO
-.Xr snmpd 1 ,
 .Xr gensnmptree 1 ,
-.Xr bsnmplib 3
+.Xr snmpd 1 ,
+.Xr bsnmpagent 3 ,
 .Xr bsnmpclient 3 ,
-.Xr bsnmpagent 3
+.Xr bsnmplib 3
 .Sh STANDARDS
 This implementation conforms to the applicable IETF RFCs and ITU-T
 recommendations.
diff --git a/contrib/bsnmp/lib/snmpagent.c b/contrib/bsnmp/lib/snmpagent.c
index 5b42c83..38bc140 100644
--- a/contrib/bsnmp/lib/snmpagent.c
+++ b/contrib/bsnmp/lib/snmpagent.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Begemot: bsnmp/lib/snmpagent.c,v 1.18 2004/08/06 08:46:55 brandt Exp $
+ * $Begemot: bsnmp/lib/snmpagent.c,v 1.19 2004/08/19 17:09:09 brandt Exp $
  *
  * SNMP Agent functions
  */
@@ -339,6 +339,11 @@ do_getnext(struct context *context, const struct snmp_value *inb,
 		/* object has no data - try next */
 		if (++tp == tree + tree_size)
 			break;
+
+		if (TR(GETNEXT))
+			snmp_debug("getnext: no data - avancing to %s",
+			    asn_oid2str(&tp->oid));
+
 		outb->var = tp->oid;
 	}