[Midnightbsd-cvs] src [11017] sync
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Jun 15 18:37:48 EDT 2018
Revision: 11017
http://svnweb.midnightbsd.org/src/?rev=11017
Author: laffer1
Date: 2018-06-15 18:37:47 -0400 (Fri, 15 Jun 2018)
Log Message:
-----------
sync
Modified Paths:
--------------
trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt
trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile
trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def
trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c
Property Changed:
----------------
trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt
trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def
trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
Modified: trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt
===================================================================
--- trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt 2018-06-15 22:36:13 UTC (rev 11016)
+++ trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt 2018-06-15 22:37:47 UTC (rev 11017)
@@ -27,6 +27,7 @@
-- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-- EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--
+-- $FreeBSD: stable/10/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt 312257 2017-01-16 06:54:07Z ngie $
-- $MidnightBSD$
--
-- Private MIB for netgraph part of Begemot SNMP daemon.
@@ -59,6 +60,19 @@
E-mail: harti at freebsd.org"
DESCRIPTION
"The MIB for the NetGraph access module for SNMP."
+ REVISION "200311140000Z"
+ DESCRIPTION
+ "The maximum width of the following OCTET STRINGs was increased
+ from 15 to 31:
+
+ - NgTypeName
+ - NgNodeName
+ - NgNodeNameOrEmpty
+ - NgHookName
+ "
+ REVISION "200201310000Z"
+ DESCRIPTION
+ "Initial revision."
::= { begemot 2 }
begemotNgObjects OBJECT IDENTIFIER ::= { begemotNg 1 }
Property changes on: trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile
===================================================================
--- trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile 2018-06-15 22:36:13 UTC (rev 11016)
+++ trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile 2018-06-15 22:37:47 UTC (rev 11017)
@@ -1,4 +1,5 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile 152269 2005-11-10 10:14:57Z harti $
#
# Author: Harti Brandt <harti at freebsd.org>
Modified: trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def
===================================================================
--- trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def 2018-06-15 22:36:13 UTC (rev 11016)
+++ trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def 2018-06-15 22:37:47 UTC (rev 11017)
@@ -27,8 +27,8 @@
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
+# $FreeBSD: stable/10/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def 122405 2003-11-10 09:17:34Z harti $
# $MidnightBSD$
-#
# Definition of the tree implemented by snmp_netgraph.
#
(1 internet
Property changes on: trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/netgraph_tree.def
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
===================================================================
--- trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3 2018-06-15 22:36:13 UTC (rev 11016)
+++ trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3 2018-06-15 22:37:47 UTC (rev 11017)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\"
.\" Copyright (c) 2001-2003
.\" Fraunhofer Institute for Open Communication Systems (FhG Fokus).
@@ -27,7 +28,7 @@
.\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
.\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3 235286 2012-05-11 20:06:46Z gjb $
.\"
.Dd November 14, 2003
.Dt SNMP_NETGRAPH 3
@@ -65,7 +66,7 @@
.Nm ng_node_name ,
.Nm ng_node_type ,
.Nm ng_peer_hook_id
-.Nd "netgraph module for snmpd.
+.Nd "netgraph module for snmpd"
.Sh LIBRARY
.Pq begemotSnmpdModulePath."netgraph" = "/usr/lib/snmp_netgraph.so"
.Sh SYNOPSIS
@@ -78,7 +79,7 @@
.Ft typedef void
.Fn ng_hook_f "const char *hook" "const u_char *mesg" "size_t len" "void *uarg"
.Ft void *
-.Fn ng_register_cookie "const struct lmodule *mod" "u_int32_t cookie" "ng_ID_t id" "ng_cookie_f *func" "void *uarg"
+.Fn ng_register_cookie "const struct lmodule *mod" "uint32_t cookie" "ng_ID_t id" "ng_cookie_f *func" "void *uarg"
.Ft void
.Fn ng_unregister_cookie "void *reg"
.Ft void *
@@ -283,7 +284,6 @@
.Fn ng_unregister_module
removes all control and data registrations for that module.
.Ss FINDING NODES AND NODE CHARACTERISTICS
-.Pp
The function
.Fn ng_node_id
returns the id of the node addressed by
Property changes on: trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c
===================================================================
--- trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c 2018-06-15 22:36:13 UTC (rev 11016)
+++ trunk/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c 2018-06-15 22:37:47 UTC (rev 11017)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2001-2003
* Fraunhofer Institute for Open Communication Systems (FhG Fokus).
@@ -27,7 +28,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c 310903 2016-12-31 10:34:09Z ngie $
*
* Netgraph interface for SNMPd.
*/
@@ -173,7 +174,7 @@
* Register a function for hook data.
*/
void *
-ng_register_hook(const struct lmodule *mod, const char *hook,
+ng_register_hook(const struct lmodule *mod, const char *hook,
ng_hook_f *func, void *arg)
{
struct datareg *d;
@@ -893,7 +894,7 @@
else
strcpy(peerhook, hooklist->link[i].peerhook);
- } else
+ } else
strcpy(peerhook, hooklist->link[i].peerhook);
free(resp);
@@ -903,7 +904,7 @@
/*
- * Now the module is started. Select on the sockets, so that we can get
+ * Now the module is started. Select on the sockets, so that we can get
* unsolicited input.
*/
static void
@@ -926,7 +927,7 @@
return;
}
- reg_index = or_register(&oid_begemotNg,
+ reg_index = or_register(&oid_begemotNg,
"The MIB for the NetGraph access module for SNMP.", module);
}
More information about the Midnightbsd-cvs
mailing list