Virgin import of NgATM user part 1.2

3 files changed, 13 insertions, 11 deletions

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 <sys/types.h>
@@ -36,8 +36,8 @@
 #include <net/if.h>
 #include <net/if_mib.h>
 
-#include <bsnmp/snmpmod.h>
-#include <bsnmp/snmp_mibII.h>
+#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);