diff --git a/contrib/ngatm/man/libngatm.3 b/contrib/ngatm/man/libngatm.3 index 9de36efc7c38..eba9972c0b08 100644 --- a/contrib/ngatm/man/libngatm.3 +++ b/contrib/ngatm/man/libngatm.3 @@ -29,10 +29,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Begemot: libunimsg/man/libngatm.3,v 1.4 2004/07/08 08:21:42 brandt Exp $ +.\" $Begemot: libunimsg/man/libngatm.3,v 1.5 2005/05/23 12:00:07 brandt_h Exp $ .\" -.Dd July 7, 2004 -.Dt libngatm 3 +.Dd May 23, 2005 +.Dt LIBNGATM 3 .Os .Sh NAME .Nm libngatm diff --git a/contrib/ngatm/man/uniaddr.3 b/contrib/ngatm/man/uniaddr.3 index 7a54fbbefe11..54fa9c94182d 100644 --- a/contrib/ngatm/man/uniaddr.3 +++ b/contrib/ngatm/man/uniaddr.3 @@ -26,10 +26,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Begemot: libunimsg/man/uniaddr.3,v 1.3 2004/07/08 08:21:42 brandt Exp $ +.\" $Begemot: libunimsg/man/uniaddr.3,v 1.5 2005/05/23 12:04:55 brandt_h Exp $ .\" -.Dd October 30, 2003 -.Dt uniaddr 3 +.Dd May 23, 2005 +.Dt UNIADDR 3 .Os .Sh NAME .Nm unimsg , @@ -120,6 +120,6 @@ is 2 the last 11 bytes must be zero. The function returns 0 on success and -1 when the NSAP address was not an embedded E.164 NSAP or one of the additional checks failed. .Sh SEE ALSO -.Xr libngatm 3 , +.Xr libngatm 3 .Sh AUTHORS .An Hartmut Brandt Aq harti@freebsd.org diff --git a/contrib/ngatm/man/unifunc.3 b/contrib/ngatm/man/unifunc.3 index 093d0c8979bc..ae5c2ac38f76 100644 --- a/contrib/ngatm/man/unifunc.3 +++ b/contrib/ngatm/man/unifunc.3 @@ -26,28 +26,28 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Begemot: libunimsg/man/unifunc.3,v 1.3 2004/07/08 08:21:43 brandt Exp $ +.\" $Begemot: libunimsg/man/unifunc.3,v 1.5 2005/05/23 12:04:55 brandt_h Exp $ .\" -.Dd October 30, 2003 -.Dt unifunc 3 +.Dd May 23, 2005 +.Dt UNIFUNC 3 .Os .Sh NAME -.Nm libngatm -.Nm uni_decode -.Nm uni_decode_head -.Nm uni_decode_body -.Nm uni_decode_ie_hdr -.Nm uni_decode_ie_body -.Nm uni_encode -.Nm uni_encode_msg_hdr -.Nm uni_encode_ie -.Nm uni_encode_ie_hdr -.Nm uni_check_ie -.Nm uni_print_cref -.Nm uni_print_msghdr -.Nm uni_print -.Nm uni_print_ie -.Nm uni_initcx +.Nm libngatm , +.Nm uni_decode , +.Nm uni_decode_head , +.Nm uni_decode_body , +.Nm uni_decode_ie_hdr , +.Nm uni_decode_ie_body , +.Nm uni_encode , +.Nm uni_encode_msg_hdr , +.Nm uni_encode_ie , +.Nm uni_encode_ie_hdr , +.Nm uni_check_ie , +.Nm uni_print_cref , +.Nm uni_print_msghdr , +.Nm uni_print , +.Nm uni_print_ie , +.Nm uni_initcx , .Nm uni_print_cx .Nd "ATM signalling library - message handling functions" .Sh LIBRARY @@ -94,7 +94,7 @@ The library handles UNI 4.0 messages. For each information element and message type the header files contain a structure definition. -Additionally there +Additionally there are a number of help structures and a global context structure for some of the library functions. This document describes the functions that are diff --git a/contrib/ngatm/man/unimsg.3 b/contrib/ngatm/man/unimsg.3 index eafa7b12f17b..27191229a380 100644 --- a/contrib/ngatm/man/unimsg.3 +++ b/contrib/ngatm/man/unimsg.3 @@ -26,10 +26,10 @@ .\" .\" Author: Hartmut Brandt .\" -.\" $Begemot: libunimsg/man/unimsg.3,v 1.2 2003/08/21 16:01:08 hbb Exp $ +.\" $Begemot: libunimsg/man/unimsg.3,v 1.3 2005/05/23 12:00:09 brandt_h Exp $ .\" -.Dd August 23, 2002 -.Dt unimsg 3 +.Dd May 23, 2005 +.Dt UNIMSG 3 .Os .Sh NAME .Nm uni_msg_len , @@ -192,8 +192,8 @@ The function .Fn uni_msg_append8 appends one byte to the message and the function .Fn uni_msg_append32 -appends a 32-bit value in network byte order to the message ( -.Fa b_wptr +appends a 32-bit value in network byte order to the message +.Fa ( b_wptr needs not to be aligned). All three functions call .Fn uni_msg_ensure to make sure, that the buffer contents fit into the message. They diff --git a/contrib/ngatm/man/unisap.3 b/contrib/ngatm/man/unisap.3 index ebec7edd7c19..eaaa5988f34b 100644 --- a/contrib/ngatm/man/unisap.3 +++ b/contrib/ngatm/man/unisap.3 @@ -26,10 +26,10 @@ .\" .\" Author: Hartmut Brandt .\" -.\" $Begemot: libunimsg/man/unisap.3,v 1.2 2003/08/21 16:01:08 hbb Exp $ +.\" $Begemot: libunimsg/man/unisap.3,v 1.4 2005/05/23 12:00:10 brandt_h Exp $ .\" -.Dd August 23, 2002 -.Dt unisap 3 +.Dd May 23, 2005 +.Dt UNISAP 3 .Os .Sh NAME .Nm unimsg , @@ -106,7 +106,7 @@ struct uni_sap { that consists of 5 elements matching different information elements in the SETUP message. Each of these elements has a tag that defines how the SVE is to be matched with the information element. The tag is one of -.Bl -tag -widht ".It Dv UNISVE_PRESENT" +.Bl -tag -width ".Dv UNISVE_PRESENT" .It Dv UNISVE_ABSENT The information element has to absent from the SETUP message. .It Dv UNISVE_PRESENT @@ -165,7 +165,7 @@ Where the .Fa user fields is matched only if the .Fa proto -field specifies +field specifies .Dv UNI_BLLI_L2_USER . The layer 3 SVE is: .Bd -literal -offset indent @@ -222,7 +222,7 @@ The function checks a complete SAP and returns one of the above codes. .Pp There is a definition -.Dv UNISVE_ERRSTR +.Dv UNISVE_ERRSTR that evaluates to a comma separated list of strings that can be used to initializes an array of char pointers to map the error codes into human readable strings. @@ -250,6 +250,6 @@ Finally the function is used to match a SAP against the information elements from a SETUP message. It returns 1 if they match and 0 otherwise. .Sh SEE ALSO -.Xr libunimsg 3 , +.Xr libunimsg 3 .Sh AUTHORS .An Hartmut Brandt Aq harti@freebsd.org diff --git a/contrib/ngatm/man/unistruct.3 b/contrib/ngatm/man/unistruct.3 index 6f7a651c9fd1..6f868be1e6c8 100644 --- a/contrib/ngatm/man/unistruct.3 +++ b/contrib/ngatm/man/unistruct.3 @@ -26,10 +26,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Begemot: libunimsg/man/unistruct.3,v 1.3 2004/07/08 08:21:43 brandt Exp $ +.\" $Begemot: libunimsg/man/unistruct.3,v 1.4 2005/05/23 12:00:10 brandt_h Exp $ .\" -.Dd October 30, 2003 -.Dt unistruct 3 +.Dd May 23, 2005 +.Dt UNISTRUCT 3 .Os .Sh NAME .Nm libngatm @@ -46,7 +46,7 @@ The library handles UNI 4.0 messages. For each information element and message type the header files contain a structure definition. -Additionally there +Additionally there are a number of help structures and a global context structure for some of the library functions. This document only describes the common structures. @@ -116,7 +116,7 @@ is used for error processing and is one of: .It Dv UNI_IEACT_CLEAR clear call .It Dv UNI_IEACT_IGNORE -ignore IE and proceed +ignore IE and proceed .It Dv UNI_IEACT_REPORT ignore IE, report and proceed .It Dv UNI_IEACT_MSG_IGNORE @@ -311,7 +311,7 @@ The size of tabulation to use in printing. 4 is a good value. .El .Sh SEE ALSO -.Xr libunimsg 3 , +.Xr libunimsg 3 .Sh STANDARDS This implementation conforms to the applicable ITU-T recommendations and ATM Forum standards with the exception of some limitations diff --git a/contrib/ngatm/snmp_atm/atm.h b/contrib/ngatm/snmp_atm/atm.h index 0df6f7e3eaec..c9d0bf49779b 100644 --- a/contrib/ngatm/snmp_atm/atm.h +++ b/contrib/ngatm/snmp_atm/atm.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: libunimsg/snmp_atm/atm.h,v 1.2 2004/08/11 07:55:22 brandt Exp $ + * $Begemot: libunimsg/snmp_atm/atm.h,v 1.3 2005/05/23 11:46:46 brandt_h Exp $ */ #include @@ -36,8 +36,8 @@ #include #include -#include -#include +#include "snmpmod.h" +#include "snmp_mibII.h" #include "snmp_atm.h" /* diff --git a/contrib/ngatm/snmp_atm/snmp_atm.3 b/contrib/ngatm/snmp_atm/snmp_atm.3 index 7fe2f4663975..86f9d3823e17 100644 --- a/contrib/ngatm/snmp_atm/snmp_atm.3 +++ b/contrib/ngatm/snmp_atm/snmp_atm.3 @@ -29,10 +29,10 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Begemot: libunimsg/snmp_atm/snmp_atm.3,v 1.1 2004/07/20 16:30:03 brandt Exp $ +.\" $Begemot: libunimsg/snmp_atm/snmp_atm.3,v 1.2 2005/05/23 12:00:29 brandt_h Exp $ .\" -.Dd July 20, 2004 -.Dt snmp_atm 3 +.Dd May 23, 2005 +.Dt SNMP_ATM 3 .Os .Sh NAME .Nm atmif_event_f , @@ -207,11 +207,12 @@ The description of the MIB tree implemented by .Nm . .It Pa @MIBSPATH@BEGEMOT-ATM.txt This is the MIB that is implemented by this module. +.El .Sh SEE ALSO .Xr bsnmpd 1 , -.Xr snmpmod 3 , +.Xr gensnmptree 1 , .Xr snmp_mibII 3 , -.Xr snmp_netgraph 3 , -.Xr gensnmptree 1 +.Xr snmpmod 3 , +.Xr snmp_netgraph 3 .Sh AUTHORS .An Hartmut Brandt Aq harti@freebsd.org diff --git a/contrib/ngatm/snmp_atm/snmp_atm.c b/contrib/ngatm/snmp_atm/snmp_atm.c index 1106e8a237be..c922c6f3dd7a 100644 --- a/contrib/ngatm/snmp_atm/snmp_atm.c +++ b/contrib/ngatm/snmp_atm/snmp_atm.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: libunimsg/snmp_atm/snmp_atm.c,v 1.2 2004/08/06 17:30:40 brandt Exp $ + * $Begemot: libunimsg/snmp_atm/snmp_atm.c,v 1.3 2005/05/23 11:46:46 brandt_h Exp $ * * SNMP module for ATM hardware interfaces. */ @@ -58,7 +58,7 @@ struct atmif_list atmif_list = TAILQ_HEAD_INITIALIZER(atmif_list); static int started; /* last time table was changed */ -static uint32_t last_change; +static uint64_t last_change; /* for the registration */ static const struct asn_oid oid_begemotAtm = OIDX_begemotAtm; @@ -271,6 +271,7 @@ attach_if(struct mibif *ifp) aif->pub.ifp = ifp; aif->index = ifp->index; + TAILQ_INIT(&aif->notify); if (atmif_sys_attach_if(aif)) { free(aif); diff --git a/contrib/ngatm/sscop/common.c b/contrib/ngatm/sscop/common.c index 779986da5514..e34181c36150 100644 --- a/contrib/ngatm/sscop/common.c +++ b/contrib/ngatm/sscop/common.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: libunimsg/sscop/common.c,v 1.4 2004/07/08 08:22:27 brandt Exp $ + * $Begemot: libunimsg/sscop/common.c,v 1.5 2005/05/23 11:46:16 brandt_h Exp $ */ #include diff --git a/contrib/ngatm/sscop/common.h b/contrib/ngatm/sscop/common.h index 35f54f951ed8..9ad6d4e95b6e 100644 --- a/contrib/ngatm/sscop/common.h +++ b/contrib/ngatm/sscop/common.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: libunimsg/sscop/common.h,v 1.4 2004/07/08 08:22:27 brandt Exp $ + * $Begemot: libunimsg/sscop/common.h,v 1.5 2005/05/23 11:46:16 brandt_h Exp $ * * Common declaration for the SAAL programs. */ diff --git a/contrib/ngatm/sscop/sscop_main.c b/contrib/ngatm/sscop/sscop_main.c index 59ef55876238..a35d7a6c2da5 100644 --- a/contrib/ngatm/sscop/sscop_main.c +++ b/contrib/ngatm/sscop/sscop_main.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Begemot: libunimsg/sscop/sscop_main.c,v 1.4 2004/07/08 08:22:28 brandt Exp $ + * $Begemot: libunimsg/sscop/sscop_main.c,v 1.5 2005/05/23 11:46:17 brandt_h Exp $ */ #include